From 9bce5830638e9e8d2380941cab071473a03cc869 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 14 Jan 2009 10:15:01 +0100
Subject: [PATCH 01/32] SortableList, sortedOrder - micro-optimization

---
 .../Lists/ListOps/ListOpsTemplates.C          |  9 ++++++-
 .../Lists/SortableList/SortableList.C         | 16 ++++++-----
 .../Lists/SortableList/SortableList.H         |  4 +--
 .../meshReader/starcd/STARCDMeshReader.C      | 11 ++++----
 .../meshWriter/starcd/STARCDMeshWriter.C      |  1 +
 .../fvMesh/extendedStencil/extendedStencil.C  |  2 +-
 .../searchableSurfacesQueries.C               | 27 ++++++++-----------
 7 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 1b17991ed5..f12b5efd55 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -173,7 +173,14 @@ void Foam::sortedOrder
     labelList& order
 )
 {
-    order.setSize(lst.size());
+    // list lengths must be identical
+    if (order.size() != lst.size())
+    {
+        // avoid copying any elements, they are overwritten anyhow
+        order.clear();
+        order.setSize(lst.size());
+    }
+
     forAll(order, elemI)
     {
         order[elemI] = elemI;
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
index cc0c52776d..221df85229 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
@@ -27,17 +27,21 @@ License
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 template<class T>
-void Foam::SortableList<T>::sortIndices(List<label>& ind) const
+void Foam::SortableList<T>::sortIndices(List<label>& order) const
 {
     // list lengths must be identical
-    ind.setSize(this->size());
-
-    forAll(ind, i)
+    if (order.size() != this->size())
     {
-        ind[i] = i;
+        // avoid copying any elements, they are overwritten anyhow
+        order.clear();
+        order.setSize(this->size());
     }
 
-    Foam::stableSort(ind, typename UList<T>::less(*this));
+    forAll(order, elemI)
+    {
+        order[elemI] = elemI;
+    }
+    Foam::stableSort(order, typename UList<T>::less(*this));
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 0496f6f8a8..e3d49266b5 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -47,7 +47,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class SortableList Declaration
+                        Class SortableList Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class T>
@@ -60,7 +60,7 @@ class SortableList
         //- Original indices
         labelList indices_;
 
-        //- Resize and sort the parameter according to the list values
+        //- Resize, fill and sort the parameter according to the list values
         void sortIndices(List<label>&) const;
 
 public:
diff --git a/src/conversion/meshReader/starcd/STARCDMeshReader.C b/src/conversion/meshReader/starcd/STARCDMeshReader.C
index 0a70812f45..d1892f9c57 100644
--- a/src/conversion/meshReader/starcd/STARCDMeshReader.C
+++ b/src/conversion/meshReader/starcd/STARCDMeshReader.C
@@ -30,7 +30,7 @@ License
 #include "wallPolyPatch.H"
 #include "symmetryPolyPatch.H"
 #include "cellModeller.H"
-#include "SortableList.H"
+#include "ListOps.H"
 #include "IFstream.H"
 #include "IOMap.H"
 
@@ -797,14 +797,15 @@ void Foam::meshReaders::STARCD::readBoundary(const fileName& inputName)
     patchNames_[nPatches-1] = defaultBoundaryName;
 
     // sort according to ascending region numbers, but leave
-    // Default_Boundary_Region as the last patch
+    // Default_Boundary_Region as the final patch
     {
-        SortableList<label> sortedOrder(SubList<label>(origRegion, nPatches-1));
+        labelList sortedIndices;
+        sortedOrder(SubList<label>(origRegion, nPatches-1), sortedIndices);
 
         labelList oldToNew = identity(nPatches);
-        forAll(sortedOrder, i)
+        forAll(sortedIndices, i)
         {
-            oldToNew[sortedOrder.indices()[i]] = i;
+            oldToNew[sortedIndices[i]] = i;
         }
 
         inplaceReorder(oldToNew, origRegion);
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 5d4bc79205..e07f1a2d50 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -705,6 +705,7 @@ bool Foam::meshWriters::STARCD::writeSurface
         }
     }
     toc.sort();
+    toc.shrink();
     pointHash.clear();
 
     // write points in sorted order
diff --git a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C
index c2273d4a52..79e1de2ea1 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/extendedStencil.C
@@ -254,7 +254,7 @@ Foam::autoPtr<Foam::mapDistribute> Foam::extendedStencil::calcDistributeMap
             {
                 Map<label>& globalMap = globalToProc[procI];
 
-                SortableList<label> sorted(globalMap.toc());
+                SortableList<label> sorted(globalMap.toc().xfer());
 
                 forAll(sorted, i)
                 {
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 7b8ef5c685..b0d6322a74 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -25,19 +25,13 @@ License
 \*----------------------------------------------------------------------------*/
 
 #include "searchableSurfacesQueries.H"
-#include "SortableList.H"
+#include "ListOps.H"
 #include "OFstream.H"
 #include "meshTools.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(searchableSurfacesQueries, 0);
-
-}
-
+defineTypeNameAndDebug(Foam::searchableSurfacesQueries, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -146,13 +140,14 @@ bool Foam::searchableSurfacesQueries::morphTet
 
     for (label iter = 0; iter < maxIter; iter++)
     {
-        // Get the indices of highest, second-highest and lowest values.
-        label ihi, inhi, ilo;
+        // Get the indices of lowest, highest and second-highest values.
+        label ilo, ihi, inhi;
         {
-            SortableList<scalar> sortedY(y);
-            ilo = sortedY.indices()[0];
-            ihi = sortedY.indices()[sortedY.size()-1];
-            inhi = sortedY.indices()[sortedY.size()-2];
+            labelList sortedIndices;
+            sortedOrder(y, sortedIndices);
+            ilo  = sortedIndices[0];
+            ihi  = sortedIndices[sortedIndices.size()-1];
+            inhi = sortedIndices[sortedIndices.size()-2];
         }
 
         if (debug)
@@ -669,7 +664,7 @@ void Foam::searchableSurfacesQueries::findNearest
     forAll(surfacesToTest, testI)
     {
         allSurfaces[surfacesToTest[testI]].findNearest
-        (   
+        (
             samples,
             minDistSqr,
             hitInfo
@@ -681,7 +676,7 @@ void Foam::searchableSurfacesQueries::findNearest
             if (hitInfo[pointI].hit())
             {
                 minDistSqr[pointI] = magSqr
-                (   
+                (
                     hitInfo[pointI].hitPoint()
                   - samples[pointI]
                 );

From 81184573c87955a2bd4f1b6e8bfa0ad93ca7139f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 14 Jan 2009 14:45:25 +0100
Subject: [PATCH 02/32] added regExp::empty() method

---
 src/OSspecific/Unix/regExp.H | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/OSspecific/Unix/regExp.H b/src/OSspecific/Unix/regExp.H
index 3688c45bf8..59804082e6 100644
--- a/src/OSspecific/Unix/regExp.H
+++ b/src/OSspecific/Unix/regExp.H
@@ -112,6 +112,12 @@ public:
 
     //- Access
 
+        //- Return true if a precompiled expression does not exist
+        inline bool empty() const
+        {
+            return !preg_;
+        }
+
         //- Does a precompiled expression exist?
         inline bool exists() const
         {

From a2b24d07a8591a8146e8d9ff3fb6c603eccf9441 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 15 Jan 2009 10:03:23 +0100
Subject: [PATCH 03/32] draft for having a resizing granularity in DynamicList

- nice idea, but need to convince compiler that division by zero doesn't occur
---
 .../HashTables/HashPtrTable/HashPtrTable.C    | 35 ++++++-------
 .../HashTables/HashPtrTable/HashPtrTable.H    |  2 +-
 .../HashTables/HashPtrTable/HashPtrTableIO.C  | 23 ++++----
 .../containers/HashTables/HashSet/HashSet.H   |  2 +-
 src/OpenFOAM/containers/HashTables/Map/Map.H  |  2 +-
 .../containers/HashTables/PtrMap/PtrMap.H     |  2 +-
 .../Lists/DynamicList/DynamicListI.H          | 52 +++++++++++++++----
 7 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
index 3ec5999d60..99e73ad22f 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
@@ -25,19 +25,13 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
-
 #include "HashPtrTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct given initial table size
 template<class T, class Key, class Hash>
-HashPtrTable<T, Key, Hash>::HashPtrTable(label size)
+Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const label size)
 :
     HashTable<T*, Key, Hash>(size)
 {}
@@ -45,7 +39,10 @@ HashPtrTable<T, Key, Hash>::HashPtrTable(label size)
 
 // Construct as copy
 template<class T, class Key, class Hash>
-HashPtrTable<T, Key, Hash>::HashPtrTable(const HashPtrTable<T, Key, Hash>& ht)
+Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
+(
+    const HashPtrTable<T, Key, Hash>& ht
+)
 :
     HashTable<T*, Key, Hash>()
 {
@@ -59,7 +56,7 @@ HashPtrTable<T, Key, Hash>::HashPtrTable(const HashPtrTable<T, Key, Hash>& ht)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-HashPtrTable<T, Key, Hash>::~HashPtrTable()
+Foam::HashPtrTable<T, Key, Hash>::~HashPtrTable()
 {
     clear();
 }
@@ -68,7 +65,7 @@ HashPtrTable<T, Key, Hash>::~HashPtrTable()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-T* HashPtrTable<T, Key, Hash>::remove(iterator& it)
+T* Foam::HashPtrTable<T, Key, Hash>::remove(iterator& it)
 {
     T* elemPtr = *it;
     HashTable<T*, Key, Hash>::erase(it);
@@ -77,7 +74,7 @@ T* HashPtrTable<T, Key, Hash>::remove(iterator& it)
 
 
 template<class T, class Key, class Hash>
-bool HashPtrTable<T, Key, Hash>::erase(iterator& it)
+bool Foam::HashPtrTable<T, Key, Hash>::erase(iterator& it)
 {
     T* elemPtr = *it;
 
@@ -98,7 +95,7 @@ bool HashPtrTable<T, Key, Hash>::erase(iterator& it)
 
 
 template<class T, class Key, class Hash>
-void HashPtrTable<T, Key, Hash>::clear()
+void Foam::HashPtrTable<T, Key, Hash>::clear()
 {
     for
     (
@@ -117,10 +114,13 @@ void HashPtrTable<T, Key, Hash>::clear()
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-void HashPtrTable<T, Key, Hash>::operator=(const HashPtrTable<T, Key, Hash>& ht)
+void Foam::HashPtrTable<T, Key, Hash>::operator=
+(
+    const HashPtrTable<T, Key, Hash>& rhs
+)
 {
     // Check for assignment to self
-    if (this == &ht)
+    if (this == &rhs)
     {
         FatalErrorIn
         (
@@ -132,17 +132,12 @@ void HashPtrTable<T, Key, Hash>::operator=(const HashPtrTable<T, Key, Hash>& ht)
 
     clear();
 
-    for(const_iterator iter = ht.begin(); iter != ht.end(); ++iter)
+    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
     {
         insert(iter.key(), new T(**iter));
     }
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 #include "HashPtrTableIO.C"
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index af3ea9c423..ee1c7ba7cc 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -83,7 +83,7 @@ public:
     // Constructors
 
         //- Construct given initial table size
-        HashPtrTable(label size = 100);
+        HashPtrTable(const label size = 100);
 
         //- Construct from Istream using given Istream constructor class
         template<class INew>
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
index d4f73125fe..d113a99ee1 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
@@ -29,16 +29,11 @@ License
 #include "Ostream.H"
 #include "INew.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
 template<class INew>
-void HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
+void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
 {
     is.fatalCheck("HashPtrTable<T, Key, Hash>::read(Istream&, const INew&)");
 
@@ -147,14 +142,14 @@ void HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
 
 template<class T, class Key, class Hash>
 template<class INew>
-HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is, const INew& inewt)
+Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is, const INew& inewt)
 {
     read(is, inewt);
 }
 
 
 template<class T, class Key, class Hash>
-HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is)
+Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is)
 {
     read(is, INew<T>());
 }
@@ -163,7 +158,7 @@ HashPtrTable<T, Key, Hash>::HashPtrTable(Istream& is)
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-Istream& operator>>(Istream& is, HashPtrTable<T, Key, Hash>& L)
+Foam::Istream& Foam::operator>>(Istream& is, HashPtrTable<T, Key, Hash>& L)
 {
     L.clear();
     L.read(is, INew<T>());
@@ -173,7 +168,11 @@ Istream& operator>>(Istream& is, HashPtrTable<T, Key, Hash>& L)
 
 
 template<class T, class Key, class Hash>
-Ostream& operator<<(Ostream& os, const HashPtrTable<T, Key, Hash>& L)
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const HashPtrTable<T, Key, Hash>& L
+)
 {
     // Write size and start delimiter
     os << nl << L.size() << nl << token::BEGIN_LIST << nl;
@@ -199,8 +198,4 @@ Ostream& operator<<(Ostream& os, const HashPtrTable<T, Key, Hash>& L)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index ad45dc9540..fbe0baf785 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -72,7 +72,7 @@ public:
     // Constructors
 
         //- Construct given initial size
-        HashSet(label size = 100)
+        HashSet(const label size = 100)
         :
             HashTable<nil, Key, Hash>(size)
         {}
diff --git a/src/OpenFOAM/containers/HashTables/Map/Map.H b/src/OpenFOAM/containers/HashTables/Map/Map.H
index 0119593ff1..c87bd3e2e2 100644
--- a/src/OpenFOAM/containers/HashTables/Map/Map.H
+++ b/src/OpenFOAM/containers/HashTables/Map/Map.H
@@ -63,7 +63,7 @@ public:
     // Constructors
 
         //- Construct given initial size
-        Map(label size = 100)
+        Map(const label size = 100)
         :
             HashTable<T, label, Hash<label> >(size)
         {}
diff --git a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
index 22a0edb013..cab0cf17ff 100644
--- a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
+++ b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
@@ -58,7 +58,7 @@ public:
     // Constructors
 
         //- Construct given initial map size
-        PtrMap(label size = 100)
+        PtrMap(const label size = 100)
         :
             HashPtrTable<T, label, Hash<label> >(size)
         {}
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 62301bb123..8357ee5889 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -45,6 +45,7 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
     List<T>(nElem),
     capacity_(nElem)
 {
+    // we could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
     List<T>::size(0);
 }
 
@@ -96,6 +97,8 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setCapacity
         // truncate addressed sizes too
         nextFree = capacity_;
     }
+    // we could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
+
 
     List<T>::setSize(capacity_);
     List<T>::size(nextFree);
@@ -111,11 +114,25 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::reserve
     // allocate more capacity?
     if (nElem > capacity_)
     {
-        capacity_ = max
-        (
-            nElem,
-            label(SizeInc + capacity_ * SizeMult / SizeDiv)
-        );
+// TODO: convince the compiler that division by zero does not occur
+//        if (SizeInc && (!SizeMult || !SizeDiv))
+//        {
+//            // resize with SizeInc as the granularity
+//            capacity_ = nElem;
+//            unsigned pad = SizeInc - (capacity_ % SizeInc);
+//            if (pad != SizeInc)
+//            {
+//                capacity_ += pad;
+//            }
+//        }
+//        else
+        {
+            capacity_ = max
+            (
+                nElem,
+                label(SizeInc + capacity_ * SizeMult / SizeDiv)
+            );
+        }
 
         // adjust allocated size, leave addressed size untouched
         label nextFree = List<T>::size();
@@ -134,11 +151,25 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
     // allocate more capacity?
     if (nElem > capacity_)
     {
-        capacity_ = max
-        (
-            nElem,
-            label(SizeInc + capacity_ * SizeMult / SizeDiv)
-        );
+// TODO: convince the compiler that division by zero does not occur
+//        if (SizeInc && (!SizeMult || !SizeDiv))
+//        {
+//            // resize with SizeInc as the granularity
+//            capacity_ = nElem;
+//            unsigned pad = SizeInc - (capacity_ % SizeInc);
+//            if (pad != SizeInc)
+//            {
+//                capacity_ += pad;
+//            }
+//        }
+//        else
+        {
+            capacity_ = max
+            (
+                nElem,
+                label(SizeInc + capacity_ * SizeMult / SizeDiv)
+            );
+        }
 
         List<T>::setSize(capacity_);
     }
@@ -190,6 +221,7 @@ Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::shrink()
     {
         // use the full list when resizing
         List<T>::size(capacity_);
+
         // the new size
         capacity_ = nextFree;
         List<T>::setSize(capacity_);

From 246d569c4d5514e3ea2a7115b595d584810d2d25 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Jan 2009 10:15:49 +0100
Subject: [PATCH 04/32] consistency update for null pointers

- uniform use of reinterpret_cast<foo*>(0) instead of
  reinterpret_cast<foo*>(NULL)

- make all static null() members inline since they are really only a cast:
      "*reinterpret_cast<foo*>(0)"
---
 .../fluentMeshToFoam/create3DCellShape.C          |  2 +-
 .../mesh/conversion/sammToFoam/sammMesh.C         |  4 ++--
 .../mesh/conversion/starToFoam/readCells.C        |  4 ++--
 .../decomposePar/domainDecomposition.C            |  2 +-
 .../foamToFieldview9/createFields.H               | 15 +++++++--------
 .../foamToFieldview9/createSprayFields.H          |  4 ++--
 .../dataConversion/smapToFoam/smapToFoam.C        |  8 ++++----
 src/OpenFOAM/containers/HashTables/Map/Map.H      |  8 --------
 .../LinkedLists/linkTypes/DLListBase/DLListBase.C |  2 +-
 .../LinkedLists/linkTypes/SLListBase/SLListBase.C |  2 +-
 .../Lists/CompactListList/CompactListList.C       |  8 --------
 .../Lists/CompactListList/CompactListList.H       | 10 ++++++----
 .../Lists/CompactListList/CompactListListI.H      |  7 +++++++
 .../containers/Lists/FixedList/FixedList.C        |  8 --------
 .../containers/Lists/FixedList/FixedList.H        | 11 ++++++-----
 .../containers/Lists/FixedList/FixedListI.H       |  7 +++++++
 src/OpenFOAM/containers/Lists/List/List.C         |  8 --------
 src/OpenFOAM/containers/Lists/List/List.H         | 10 ++++++----
 src/OpenFOAM/containers/Lists/List/ListI.H        |  7 +++++++
 src/OpenFOAM/containers/Lists/PtrList/PtrList.C   |  4 ++--
 src/OpenFOAM/containers/Lists/SubList/SubList.H   | 12 ++++++------
 src/OpenFOAM/containers/Lists/SubList/SubListI.H  |  3 +--
 src/OpenFOAM/containers/Lists/UList/UList.C       |  8 --------
 src/OpenFOAM/containers/Lists/UList/UList.H       | 10 ++++++----
 src/OpenFOAM/containers/Lists/UList/UListI.H      |  7 +++++++
 src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C |  4 ++--
 .../DimensionedField/DimensionedField.C           | 10 ----------
 .../DimensionedField/DimensionedField.H           |  8 +++++---
 .../DimensionedField/DimensionedFieldI.H          |  8 ++++++++
 .../DimensionedField/SubDimensionedFieldI.H       |  4 +---
 src/OpenFOAM/fields/Fields/Field/Field.C          |  8 --------
 src/OpenFOAM/fields/Fields/Field/Field.H          | 15 ++++++++++-----
 src/OpenFOAM/fields/Fields/Field/SubFieldI.H      |  3 +--
 .../GeometricField/GeometricField.C               | 10 ----------
 .../GeometricField/GeometricField.H               | 10 ++++++----
 .../GeometricField/GeometricFieldI.H              | 13 +++++++++++--
 src/OpenFOAM/matrices/Matrix/Matrix.C             | 12 ++----------
 src/OpenFOAM/matrices/Matrix/Matrix.H             | 12 +++++++-----
 src/OpenFOAM/matrices/Matrix/MatrixI.H            |  7 +++++++
 src/OpenFOAM/memory/Xfer/XferI.H                  |  3 +--
 .../meshes/primitiveMesh/primitiveMeshEdges.C     |  2 +-
 .../fvMeshDistribute/fvMeshDistribute.C           |  2 +-
 .../derived/advective/advectiveFvPatchField.C     |  8 ++++----
 .../derived/inletOutlet/inletOutletFvPatchField.C |  4 ++--
 .../derived/outletInlet/outletInletFvPatchField.C |  4 ++--
 .../waveTransmissiveFvPatchField.C                | 14 +++++++-------
 .../potential/potential/potential.H               |  2 +-
 .../edgeFaceCirculator/edgeFaceCirculator.C       |  2 +-
 .../liquidMixture/liquidMixture/liquidMixture.C   |  2 +-
 src/triSurface/triSurface/triSurface.C            |  4 +---
 50 files changed, 164 insertions(+), 178 deletions(-)

diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
index 86b835f5ad..2645fe7509 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
@@ -51,7 +51,7 @@ cellShape create3DCellShape
     static List<const cellModel*> fluentCellModelLookup
     (
         7,
-        reinterpret_cast<const cellModel*>(NULL)
+        reinterpret_cast<const cellModel*>(0)
     );
 
     fluentCellModelLookup[2] = cellModeller::lookup("tet");
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C
index ad55aed74a..a5bfd9791c 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C
@@ -90,13 +90,13 @@ const label sammMesh::shapeFaceLookup[19][9] =
 List<const cellModel*> sammMesh::sammShapeLookup
 (
     256,
-    reinterpret_cast<cellModel*>(NULL)
+    reinterpret_cast<cellModel*>(0)
 );
 
 List<const label*> sammMesh::sammAddressingTable
 (
     256,
-    reinterpret_cast<label*>(NULL)
+    reinterpret_cast<label*>(0)
 );
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/conversion/starToFoam/readCells.C b/applications/utilities/mesh/conversion/starToFoam/readCells.C
index 80be74f9ca..9e2d5efd6a 100644
--- a/applications/utilities/mesh/conversion/starToFoam/readCells.C
+++ b/applications/utilities/mesh/conversion/starToFoam/readCells.C
@@ -48,7 +48,7 @@ void starMesh::addRegularCell
     label regularTypeFlag = -1;
 
     // grab the shape from the table
-    const cellModel* curModelPtr = reinterpret_cast<cellModel*>(NULL);
+    const cellModel* curModelPtr = reinterpret_cast<cellModel*>(0);
 
     if      // Tetrahedron
     (
@@ -130,7 +130,7 @@ void starMesh::addSAMMcell
 
     // grab the shape from the table
     label sammTypeFlag = -1;
-    const cellModel* curModelPtr = reinterpret_cast<cellModel*>(NULL);
+    const cellModel* curModelPtr = reinterpret_cast<cellModel*>(0);
 
     switch (typeFlag)
     {
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 3c9cfc2ad2..989d384e40 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -299,7 +299,7 @@ bool domainDecomposition::writeDecomposition()
         (
             curPatchSizes.size()
           + curProcessorPatchSizes.size(),
-            reinterpret_cast<polyPatch*>(NULL)
+            reinterpret_cast<polyPatch*>(0)
         );
 
         label nPatches = 0;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createFields.H b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createFields.H
index 042e0e2992..77f5f0ebc9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createFields.H
@@ -3,7 +3,7 @@ int nFields = volScalarNames.size() + 3*volVectorNames.size();
 List<volScalarField*> volFieldPtrs
 (
     nFields,
-    reinterpret_cast<volScalarField*>(NULL)
+    reinterpret_cast<volScalarField*>(0)
 );
 
 stringList volFieldNames(nFields);
@@ -27,12 +27,11 @@ nFields = 0;
 
         if (ioHeader.headerOk())
         {
-           volFieldPtrs[nFields] =
-                new volScalarField
-                (
-                    ioHeader,
-                    mesh
-                );
+           volFieldPtrs[nFields] = new volScalarField
+            (
+                ioHeader,
+                mesh
+            );
         }
 
         fieldName = getFieldViewName(fieldName);
@@ -106,7 +105,7 @@ int nSurfFields = surfScalarNames.size() + 3*surfVectorNames.size();
 List<surfaceScalarField*> surfFieldPtrs
 (
     nSurfFields,
-    reinterpret_cast<surfaceScalarField*>(NULL)
+    reinterpret_cast<surfaceScalarField*>(0)
 );
 
 stringList surfFieldNames(nSurfFields);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createSprayFields.H b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createSprayFields.H
index 1afb3be7c4..e28a04b58c 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createSprayFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/createSprayFields.H
@@ -2,13 +2,13 @@
 List<IOField<scalar>* > sprayScalarFieldPtrs
 (
     sprayScalarNames.size(),
-    reinterpret_cast<IOField<scalar>*>(NULL)
+    reinterpret_cast<IOField<scalar>*>(0)
 );
 
 List<IOField<vector>* > sprayVectorFieldPtrs
 (
     sprayVectorNames.size(),
-    reinterpret_cast<IOField<vector>*>(NULL)
+    reinterpret_cast<IOField<vector>*>(0)
 );
 
 {
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
index 35b8604f2c..748ce3f599 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
@@ -24,7 +24,7 @@ License
 
 Description
     Translates a STAR-CD SMAP data file into FOAM field format.
- 
+
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
@@ -108,15 +108,15 @@ int main(int argc, char *argv[])
         List<volScalarField*> sFields
         (
             nCols,
-            reinterpret_cast<volScalarField*>(NULL)
+            reinterpret_cast<volScalarField*>(0)
         );
 
         List<volVectorField*> vFields
         (
             nCols,
-            reinterpret_cast<volVectorField*>(NULL)
+            reinterpret_cast<volVectorField*>(0)
         );
-        
+
         label i=0;
         while (i < nCols)
         {
diff --git a/src/OpenFOAM/containers/HashTables/Map/Map.H b/src/OpenFOAM/containers/HashTables/Map/Map.H
index c87bd3e2e2..e43283412d 100644
--- a/src/OpenFOAM/containers/HashTables/Map/Map.H
+++ b/src/OpenFOAM/containers/HashTables/Map/Map.H
@@ -92,14 +92,6 @@ public:
             HashTable<T, label, Hash<label> >(map)
         {}
 
-
-    //- Return a null Map
-    static const Map<T>& null()
-    {
-        Map<T>* nullPtr = reinterpret_cast<Map<T>*>(0);
-        return *nullPtr;
-    }
-
 };
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
index 2738454ec3..5c21dfe58e 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
@@ -40,7 +40,7 @@ Foam::DLListBase::iterator Foam::DLListBase::endIter
 Foam::DLListBase::const_iterator Foam::DLListBase::endConstIter
 (
     static_cast<const DLListBase&>(DLListBase()),
-    reinterpret_cast<const link*>(NULL)
+    reinterpret_cast<const link*>(0)
 );
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
index 4328b20e40..75dca644d9 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
@@ -37,7 +37,7 @@ Foam::SLListBase::iterator Foam::SLListBase::endIter
 Foam::SLListBase::const_iterator Foam::SLListBase::endConstIter
 (
     static_cast<const SLListBase&>(SLListBase()),
-    reinterpret_cast<const link*>(NULL)
+    reinterpret_cast<const link*>(0)
 );
 
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 88a908c74f..2602eea95a 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -118,14 +118,6 @@ Foam::CompactListList<T>::CompactListList
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T>
-const Foam::CompactListList<T>& Foam::CompactListList<T>::null()
-{
-    CompactListList<T>* nullPtr = reinterpret_cast<CompactListList<T>*>(NULL);
-    return *nullPtr;
-}
-
-
 template<class T>
 void Foam::CompactListList<T>::setSize(const label nRows)
 {
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 7cf9e31669..18943d268f 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -81,6 +81,11 @@ class CompactListList
 
 public:
 
+    // Static Member Functions
+
+        //- Return a null CompactListList
+        inline static const CompactListList<T>& null();
+
     // Constructors
 
         //- Null constructor.
@@ -116,10 +121,7 @@ public:
         inline autoPtr<CompactListList<T> > clone() const;
 
 
-    // Member functions
-
-        //- Return a null CompactListList
-        static const CompactListList<T>& null();
+    // Member Functions
 
         // Access
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index e2e794356e..58e9590199 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -67,6 +67,13 @@ Foam::CompactListList<T>::clone() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+inline const Foam::CompactListList<T>& Foam::CompactListList<T>::null()
+{
+    return *reinterpret_cast< CompactListList<T>* >(0);
+}
+
+
 template<class T>
 inline Foam::label Foam::CompactListList<T>::size() const
 {
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
index 229f4612fe..eec73d4143 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
@@ -29,14 +29,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
-const Foam::FixedList<T, Size>& Foam::FixedList<T, Size>::null()
-{
-    FixedList<T, Size>* nullPtr = reinterpret_cast<FixedList<T, Size>*>(NULL);
-    return *nullPtr;
-}
-
-
 // * * * * * * * * * * * * * * STL Member Functions  * * * * * * * * * * * * //
 
 template<class T, Foam::label Size>
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 9171c6253d..40f0bb24f0 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -93,6 +93,11 @@ public:
         ) const;
     };
 
+    // Static Member Functions
+
+        //- Return a null FixedList
+        inline static const FixedList<T, Size>& null();
+
 
     // Constructors
 
@@ -121,11 +126,7 @@ public:
         inline autoPtr<FixedList<T, Size> > clone() const;
 
 
-    // Member functions
-
-        //- Return a null FixedList
-        static const FixedList<T, Size>& null();
-
+    // Member Functions
 
         // Access
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index a1116f53ab..e58d500ffd 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -104,6 +104,13 @@ Foam::FixedList<T, Size>::clone() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T, Foam::label Size>
+inline const Foam::FixedList<T, Size>& Foam::FixedList<T, Size>::null()
+{
+    return *reinterpret_cast< FixedList<T, Size>* >(0);
+}
+
+
 template<class T, Foam::label Size>
 inline Foam::label Foam::FixedList<T, Size>::fcIndex(const label i) const
 {
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 601d41e440..137f17e8ea 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -332,14 +332,6 @@ Foam::List<T>::~List()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T>
-const Foam::List<T>& Foam::List<T>::null()
-{
-    List<T>* nullPtr = reinterpret_cast<List<T>*>(NULL);
-    return *nullPtr;
-}
-
-
 template<class T>
 void Foam::List<T>::setSize(const label newSize)
 {
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index f7df85a658..11431b4daf 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -87,6 +87,11 @@ protected:
 
 public:
 
+    // Static Member Functions
+
+        //- Return a null List
+        inline static const List<T>& null();
+
     // Constructors
 
         //- Null constructor.
@@ -145,10 +150,7 @@ public:
         typedef SubList<T> subList;
 
 
-    // Member functions
-
-        //- Return a null List
-        static const List<T>& null();
+    // Member Functions
 
         //- Return the number of elements in the UList.
         inline label size() const;
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index 5a9287cf66..a0b7286708 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -40,6 +40,13 @@ inline Foam::autoPtr<Foam::List<T> > Foam::List<T>::clone() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+inline const Foam::List<T>& Foam::List<T>::null()
+{
+    return *reinterpret_cast< List<T>* >(0);
+}
+
+
 template<class T>
 inline T& Foam::List<T>::newElmt(const label i)
 {
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index ac251dc4ce..6418537b02 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -42,7 +42,7 @@ Foam::PtrList<T>::PtrList()
 template<class T>
 Foam::PtrList<T>::PtrList(const label s)
 :
-    ptrs_(s, reinterpret_cast<T*>(NULL))
+    ptrs_(s, reinterpret_cast<T*>(0))
 {}
 
 
@@ -216,7 +216,7 @@ void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
             << ")." << abort(FatalError);
     }
 
-    List<T*> newPtrs_(ptrs_.size(), reinterpret_cast<T*>(NULL));
+    List<T*> newPtrs_(ptrs_.size(), reinterpret_cast<T*>(0));
 
     forAll(*this, i)
     {
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H
index c7ea84a26c..5c41b2e7b0 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubList.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H
@@ -59,6 +59,12 @@ class SubList
 
 public:
 
+    // Static Member Functions
+
+        //- Return a null SubList
+        inline static const SubList<T>& null();
+
+
     // Constructors
 
         //- Construct from UList and sub-list size
@@ -77,12 +83,6 @@ public:
         );
 
 
-    // Member functions
-
-        //- Return a null SubList
-        static inline const SubList<T>& null();
-
-
     // Member operators
 
         //- Allow cast to a const List<T>&
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index 8803eda548..0eb7a33c8f 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -75,8 +75,7 @@ inline Foam::SubList<T>::SubList
 template<class T>
 inline const Foam::SubList<T>& Foam::SubList<T>::null()
 {
-    SubList<T>* nullPtr = reinterpret_cast<SubList<T>*>(NULL);
-    return *nullPtr;
+    return *reinterpret_cast< SubList<T>* >(0);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C
index 1a65cc850e..255a91ecfe 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.C
+++ b/src/OpenFOAM/containers/Lists/UList/UList.C
@@ -32,14 +32,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T>
-const Foam::UList<T>& Foam::UList<T>::null()
-{
-    UList<T>* nullPtr = reinterpret_cast<UList<T>*>(NULL);
-    return *nullPtr;
-}
-
-
 template<class T>
 void Foam::UList<T>::assign(const UList<T>& a)
 {
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 688fba7dac..bf3dc84802 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -86,6 +86,11 @@ public:
         //- Declare friendship with the SubList class
         friend class SubList<T>;
 
+    // Static Member Functions
+
+        //- Return a null UList
+        inline static const UList<T>& null();
+
     // Public classes
 
         //- Less function class that can be used for sorting
@@ -116,10 +121,7 @@ public:
         inline UList(T* __restrict__ v, label size);
 
 
-    // Member functions
-
-        //- Return a null UList
-        static const UList<T>& null();
+    // Member Functions
 
 
         // Access
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index 59ac4df2b8..e6fbb5230b 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -47,6 +47,13 @@ inline Foam::UList<T>::UList(T* __restrict__ v, label size)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class T>
+inline const Foam::UList<T>& Foam::UList<T>::null()
+{
+    return *reinterpret_cast< UList<T>* >(0);
+}
+
+
 template<class T>
 inline Foam::label Foam::UList<T>::fcIndex(const label i) const
 {
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 8209f53c64..02015efb9b 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -41,7 +41,7 @@ Foam::UPtrList<T>::UPtrList()
 template<class T>
 Foam::UPtrList<T>::UPtrList(const label s)
 :
-    ptrs_(s, reinterpret_cast<T*>(NULL))
+    ptrs_(s, reinterpret_cast<T*>(0))
 {}
 
 
@@ -114,7 +114,7 @@ void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
             << ")." << abort(FatalError);
     }
 
-    List<T*> newPtrs_(ptrs_.size(), reinterpret_cast<T*>(NULL));
+    List<T*> newPtrs_(ptrs_.size(), reinterpret_cast<T*>(0));
 
     forAll(*this, i)
     {
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 5f2889ad06..372a4b00b8 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -271,16 +271,6 @@ DimensionedField<Type, GeoMesh>::~DimensionedField()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Return a null Field
-template<class Type, class GeoMesh>
-const DimensionedField<Type, GeoMesh>& DimensionedField<Type, GeoMesh>::null()
-{
-    DimensionedField<Type, GeoMesh>* nullPtr =
-        reinterpret_cast<DimensionedField<Type, GeoMesh>*>(NULL);
-    return *nullPtr;
-}
-
-
 template<class Type, class GeoMesh>
 tmp
 <
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 8e5daadeff..f9744fc4fd 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -100,6 +100,11 @@ public:
     //- Runtime type information
     TypeName("DimensionedField");
 
+    // Static Member Functions
+
+        //- Return a null DimensionedField
+        inline static const DimensionedField<Type, GeoMesh>& null();
+
 
     // Constructors
 
@@ -232,9 +237,6 @@ public:
 
         inline Field<Type>& field();
 
-        //- Return a null DimensionedField
-        static const DimensionedField<Type, GeoMesh>& null();
-
         //- Return a component field of the field
         tmp<DimensionedField<cmptType, GeoMesh> > component
         (
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
index 6421e7ec21..d107435420 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldI.H
@@ -31,6 +31,14 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Type, class GeoMesh>
+inline const DimensionedField<Type, GeoMesh>&
+DimensionedField<Type, GeoMesh>::null()
+{
+    return *reinterpret_cast< DimensionedField<Type, GeoMesh>* >(0);
+}
+
+
 template<class Type, class GeoMesh>
 inline const typename GeoMesh::Mesh&
 DimensionedField<Type, GeoMesh>::mesh() const
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
index 5f314b3c6a..833781b2d7 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedFieldI.H
@@ -81,9 +81,7 @@ template<class Type, class GeoMesh>
 inline const SubDimensionedField<Type, GeoMesh>&
 SubDimensionedField<Type, GeoMesh>::null()
 {
-    SubDimensionedField<Type, GeoMesh>* nullPtr
-        = reinterpret_cast<SubDimensionedField<Type, GeoMesh>*>(NULL);
-    return *nullPtr;
+    return *reinterpret_cast< SubDimensionedField<Type, GeoMesh>* >(0);
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 9e9cef28c9..59d8f1a516 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -298,14 +298,6 @@ tmp<Field<Type> > Field<Type>::clone() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-const Field<Type>& Field<Type>::null()
-{
-    Field<Type>* nullPtr = reinterpret_cast<Field<Type>*>(NULL);
-    return *nullPtr;
-}
-
-
 template<class Type>
 void Field<Type>::map
 (
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index a66af31c5d..78078a01c8 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -98,6 +98,15 @@ public:
         static const char* const typeName;
 
 
+    // Static Member Functions
+
+        //- Return a null field
+        inline static const Field<Type>& null()
+        {
+            return *reinterpret_cast< Field<Type>* >(0);
+        }
+
+
     // Constructors
 
         //- Construct null
@@ -198,11 +207,7 @@ public:
         #endif
 
 
-    // Member functions
-
-        //- Return a null Field
-        static const Field<Type>& null();
-
+    // Member Functions
 
         //- 1 to 1 map from the given field
         void map
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index aed15b5a00..53de564475 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -74,8 +74,7 @@ inline Foam::SubField<Type>::SubField
 template<class Type>
 inline const Foam::SubField<Type>& Foam::SubField<Type>::null()
 {
-    SubField<Type>* nullPtr = reinterpret_cast<SubField<Type>*>(NULL);
-    return *nullPtr;
+    return *reinterpret_cast< SubField<Type>* >(0);
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index 2f31bd3f4a..794143d76b 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -887,16 +887,6 @@ writeData(Ostream& os) const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type, template<class> class PatchField, class GeoMesh>
-const Foam::GeometricField<Type, PatchField, GeoMesh>&
-Foam::GeometricField<Type, PatchField, GeoMesh>::null()
-{
-    GeometricField<Type, PatchField, GeoMesh>* nullPtr =
-        reinterpret_cast<GeometricField<Type, PatchField, GeoMesh>*>(NULL);
-    return *nullPtr;
-}
-
-
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::tmp<Foam::GeometricField<Type, PatchField, GeoMesh> >
 Foam::GeometricField<Type, PatchField, GeoMesh>::T() const
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index b5e73e8bac..71e2bbf34c 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -254,6 +254,11 @@ public:
 
         typedef typename Field<Type>::cmptType cmptType;
 
+    // Static Member Functions
+
+        //- Return a null geometric field
+        inline static const GeometricField<Type, PatchField, GeoMesh>& null();
+
 
     // Constructors
 
@@ -381,7 +386,7 @@ public:
         virtual ~GeometricField();
 
 
-    // Member functions
+    // Member Functions
 
         //- Return dimensioned internal field
         DimensionedInternalField& dimensionedInternalField();
@@ -435,9 +440,6 @@ public:
         //- Does the field need a reference level for solution
         bool needReference() const;
 
-        //- Return a null geometric field
-        static const GeometricField<Type, PatchField, GeoMesh>& null();
-
         //- Return a component of the field
         tmp<GeometricField<cmptType, PatchField, GeoMesh> > component
         (
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
index 0d8315fbab..b8da7c9dd8 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H
@@ -27,8 +27,16 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type, template<class> class PatchField, class GeoMesh>
-inline 
-const typename 
+inline const Foam::GeometricField<Type, PatchField, GeoMesh>&
+Foam::GeometricField<Type, PatchField, GeoMesh>::null()
+{
+    return *reinterpret_cast< GeometricField<Type, PatchField, GeoMesh>* >(0);
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+inline
+const typename
 Foam::GeometricField<Type, PatchField, GeoMesh>::DimensionedInternalField&
 Foam::GeometricField<Type, PatchField, GeoMesh>::
 dimensionedInternalField() const
@@ -36,6 +44,7 @@ dimensionedInternalField() const
     return *this;
 }
 
+
 template<class Type, template<class> class PatchField, class GeoMesh>
 inline
 const typename
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.C b/src/OpenFOAM/matrices/Matrix/Matrix.C
index e34cccebb7..7f91a5f36c 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.C
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.C
@@ -59,14 +59,6 @@ Foam::Matrix<Form, Type>::~Matrix()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Form, class Type>
-const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
-{
-    Matrix<Form, Type>* nullPtr = reinterpret_cast<Matrix<Form, Type>*>(NULL);
-    return *nullPtr;
-}
-
-
 template<class Form, class Type>
 Foam::Matrix<Form, Type>::Matrix(const label n, const label m)
 :
@@ -356,7 +348,7 @@ Form Foam::operator+(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
     const Type* av = a.v_[0];
     const Type* bv = b.v_[0];
 
-    label nm = a.n_*a.m_;;
+    label nm = a.n_*a.m_;
     for (register label i=0; i<nm; i++)
     {
         abv[i] = av[i] + bv[i];
@@ -395,7 +387,7 @@ Form Foam::operator-(const Matrix<Form, Type>& a, const Matrix<Form, Type>& b)
     const Type* av = a.v_[0];
     const Type* bv = b.v_[0];
 
-    label nm = a.n_*a.m_;;
+    label nm = a.n_*a.m_;
     for (register label i=0; i<nm; i++)
     {
         abv[i] = av[i] - bv[i];
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index c8a0dc3844..b96e886c4b 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -88,6 +88,12 @@ class Matrix
 
 public:
 
+    // Static Member Functions
+
+        //- Return a null Matrix
+        inline static const Matrix<Form, Type>& null();
+
+
     // Constructors
 
         //- Null constructor.
@@ -115,11 +121,7 @@ public:
         ~Matrix();
 
 
-    // Member functions
-
-        //- Return a null Matrix
-        static const Matrix<Form, Type>& null();
-
+    // Member Functions
 
         // Access
 
diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H
index b37e4408fd..348bfda51b 100644
--- a/src/OpenFOAM/matrices/Matrix/MatrixI.H
+++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H
@@ -44,6 +44,13 @@ inline Foam::autoPtr<Foam::Matrix<Form, Type> > Foam::Matrix<Form, Type>::clone(
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class Form, class Type>
+inline const Foam::Matrix<Form, Type>& Foam::Matrix<Form, Type>::null()
+{
+    return *reinterpret_cast< Matrix<Form, Type>* >(0);
+}
+
+
 //- Return the number of rows
 template<class Form, class Type>
 inline Foam::label Foam::Matrix<Form, Type>::n() const
diff --git a/src/OpenFOAM/memory/Xfer/XferI.H b/src/OpenFOAM/memory/Xfer/XferI.H
index e255e28e7e..42c1603591 100644
--- a/src/OpenFOAM/memory/Xfer/XferI.H
+++ b/src/OpenFOAM/memory/Xfer/XferI.H
@@ -29,8 +29,7 @@ License
 template<class T>
 inline const Foam::Xfer<T>& Foam::Xfer<T>::null()
 {
-    Xfer<T>* nullPtr = reinterpret_cast<Xfer<T>*>(0);
-    return *nullPtr;
+    return *reinterpret_cast< Xfer<T>* >(0);
 }
 
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index 785a1c76df..b7278ecf49 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -670,7 +670,7 @@ const Foam::labelList& Foam::primitiveMesh::cellEdges
 
 const Foam::labelList& Foam::primitiveMesh::cellEdges(const label cellI) const
 {
-    return cellEdges(cellI, labels_);;
+    return cellEdges(cellI, labels_);
 }
 
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 38e040506f..87bf249ad4 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -1185,7 +1185,7 @@ void Foam::fvMeshDistribute::sendMesh
     //labelList cellZoneID;
     //if (hasCellZones)
     //{
-    //    cellZoneID.setSize(mesh.nCells());;
+    //    cellZoneID.setSize(mesh.nCells());
     //    cellZoneID = -1;
     //
     //    const cellZoneMesh& cellZones = mesh.cellZones();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 8567419ceb..9b67c39b78 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -167,8 +167,8 @@ tmp<scalarField> advectiveFvPatchField<Type>::advectionSpeed() const
     fvsPatchField<scalar> phip = this->patch().lookupPatchField
     (
         phiName_,
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
@@ -176,8 +176,8 @@ tmp<scalarField> advectiveFvPatchField<Type>::advectionSpeed() const
         const fvPatchScalarField& rhop = this->patch().lookupPatchField
         (
             rhoName_,
-            reinterpret_cast<const volScalarField*>(NULL),
-            reinterpret_cast<const scalar*>(NULL)
+            reinterpret_cast<const volScalarField*>(0),
+            reinterpret_cast<const scalar*>(0)
         );
 
         return phip/(rhop*this->patch().magSf());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 26ded999c2..0cc5d07bcd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -129,8 +129,8 @@ void inletOutletFvPatchField<Type>::updateCoeffs()
     const Field<scalar>& phip = this->patch().lookupPatchField
     (
         phiName_,
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     this->valueFraction() = 1.0 - pos(phip);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index 3cb212b825..f235dafd46 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -124,8 +124,8 @@ void outletInletFvPatchField<Type>::updateCoeffs()
     const fvsPatchField<scalar>& phip = this->patch().lookupPatchField
     (
         "phi",
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     this->valueFraction() = pos(phip);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index 015302fe9a..d59ade959f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -115,8 +115,8 @@ tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
     const fvPatchField<scalar>& psip = this->patch().lookupPatchField
     (
         psiName_,
-        reinterpret_cast<const volScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const volScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     const surfaceScalarField& phi =
@@ -126,8 +126,8 @@ tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
     fvsPatchField<scalar> phip = this->patch().lookupPatchField
     (
         this->phiName_,
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
@@ -135,8 +135,8 @@ tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
         const fvPatchScalarField& rhop = this->patch().lookupPatchField
         (
             this->rhoName_,
-            reinterpret_cast<const volScalarField*>(NULL),
-            reinterpret_cast<const scalar*>(NULL)
+            reinterpret_cast<const volScalarField*>(0),
+            reinterpret_cast<const scalar*>(0)
         );
 
         phip /= rhop;
@@ -172,7 +172,7 @@ void waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
     {
         os.writeKeyword("fieldInf") << this->fieldInf_
             << token::END_STATEMENT << nl;
-        os.writeKeyword("lInf") << this->lInf_ 
+        os.writeKeyword("lInf") << this->lInf_
             << token::END_STATEMENT << nl;
     }
 
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H
index 6f6d47d9ee..7accf239cd 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.H
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H
@@ -125,7 +125,7 @@ public:
 
             inline const List<word>& siteIdList() const;
 
-            inline scalar potentialEnergyLimit() const;;
+            inline scalar potentialEnergyLimit() const;
 
             inline label nPairPotentials() const;
 
diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C
index 376a22d401..867a8a62c7 100644
--- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C
+++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C
@@ -31,7 +31,7 @@ License
 
 const Foam::edgeFaceCirculator Foam::edgeFaceCirculator::endConstIter
 (
-    *reinterpret_cast<primitiveMesh*>(NULL),    // primitiveMesh
+    *reinterpret_cast<primitiveMesh*>(0),       // primitiveMesh
     -1,                                         // faceLabel
     false,                                      // ownerSide
     -1,                                         // index
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
index 8d2f60bbf5..72852bdb80 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
@@ -306,7 +306,7 @@ Foam::scalar Foam::liquidMixture::cp
         if (x[i] > SMALL)
         {
             scalar Ti = min(TrMax*properties_[i].Tc(), T);
-            cp += x[i]*properties_[i].cp(p, Ti)*properties_[i].W();;
+            cp += x[i]*properties_[i].cp(p, Ti)*properties_[i].W();
         }
     }
 
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index 9ec6de95f5..c7a49263d7 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -1043,9 +1043,7 @@ Foam::label Foam::triSurface::markZones
 
     label zoneI = 0;
 
-    label startFaceI = 0;
-
-    for(;;zoneI++)
+    for (label startFaceI = 0;; zoneI++)
     {
         // Find first non-coloured face
         for (; startFaceI < size(); startFaceI++)

From b6b5eb17d73dc0ce235da2bf01631251407d36e6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Jan 2009 12:17:02 +0100
Subject: [PATCH 05/32] dimensionedType gets plain lookupOrDefault() static
 method

---
 .../dimensionedType/dimensionedType.C            | 14 ++++++++++++++
 .../dimensionedType/dimensionedType.H            | 16 ++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index ff51e2c613..9c1200e30b 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -35,6 +35,20 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+template <class Type>
+dimensioned<Type> dimensioned<Type>::lookupOrDefault
+(
+    const word& name,
+    const dictionary& dict,
+    const Type& defaultValue,
+    const dimensionSet& dims
+)
+{
+    Type value = dict.lookupOrDefault<Type>(name, defaultValue);
+    return dimensioned<Type>(name, dims, value);
+}
+
+
 template <class Type>
 dimensioned<Type> dimensioned<Type>::lookupOrAddToDict
 (
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index a4fbaf2c17..1ad252955a 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -108,8 +108,17 @@ public:
         //- Construct from an Istream with a given name and dimensions
         dimensioned(const word&, const dimensionSet&, Istream&);
 
-        //- Construct from dictionary, supplying default value so that if the
-        //  value is not found, it is added into the dictionary.
+        //- Construct from dictionary, with default value.
+        static dimensioned<Type> lookupOrDefault
+        (
+            const word&,
+            const dictionary&,
+            const Type& defaultValue = pTraits<Type>::zero,
+            const dimensionSet& dims = dimless
+        );
+
+        //- Construct from dictionary, with default value.
+        //  If the value is not found, it is added into the dictionary.
         static dimensioned<Type> lookupOrAddToDict
         (
             const word&,
@@ -148,8 +157,7 @@ public:
         //- Return transpose.
         dimensioned<Type> T() const;
 
-        //- Update the value of the dimensioned<Type> if it is found in the
-        //  dictionary
+        //- Update the value of dimensioned<Type> if found in the dictionary.
         bool readIfPresent(const dictionary&);
 
 

From 3adf0f5c8e3eebe5798d30e7b45ef29908eb6e6f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Jan 2009 12:27:03 +0100
Subject: [PATCH 06/32] minor cleanup for reverted string changes (commit
 4f5f66e7594d)

- put back debug switch (even although it is never used)
- remove stringsGlobals.C, since it is now never used
---
 etc/controlDict                               |  1 +
 .../primitives/strings/stringsGlobals.C       | 41 -------------------
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 src/OpenFOAM/primitives/strings/stringsGlobals.C

diff --git a/etc/controlDict b/etc/controlDict
index d1a95604ef..b58b605b3c 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -687,6 +687,7 @@ DebugSwitches
     staticFvMesh        0;
     steadyState         0;
     stl                 0;
+    string              0;
     stochasticDispersionRAS 0;
     supersonicFreestream 0;
     surfaceFeatures     0;
diff --git a/src/OpenFOAM/primitives/strings/stringsGlobals.C b/src/OpenFOAM/primitives/strings/stringsGlobals.C
deleted file mode 100644
index 7f4431da7c..0000000000
--- a/src/OpenFOAM/primitives/strings/stringsGlobals.C
+++ /dev/null
@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    Static initializers for
-        Foam::string::null
-        Foam::word::null
-        Foam::fileName::null.
-    This file is included in global.Cver since these members are required by
-    debug.C.
-
-\*---------------------------------------------------------------------------*/
-
-#include "string.H"
-#include "word.H"
-#include "fileName.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-// ************************************************************************* //

From 7aee58e5fa4916436bd97ebaeaf4ee9def262370 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Jan 2009 14:06:36 +0100
Subject: [PATCH 07/32] Switch : drop word data member in favour of enum

---
 src/OpenFOAM/primitives/bools/Switch/Switch.C | 138 ++++++++++++------
 src/OpenFOAM/primitives/bools/Switch/Switch.H |  60 ++++++--
 .../primitives/bools/Switch/SwitchIO.C        |  10 +-
 3 files changed, 147 insertions(+), 61 deletions(-)

diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.C b/src/OpenFOAM/primitives/bools/Switch/Switch.C
index 40900c3110..3a5a3554e6 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.C
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.C
@@ -30,6 +30,101 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+// NB: values chosen such that bitwise '&' 0x1 yields the bool value
+
+const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
+{
+    "false", "true",
+    "off",   "on",
+    "no",    "yes",
+    "n",     "y",
+    "invalid"
+};
+
+
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+
+
+Foam::Switch::switchType Foam::Switch::asEnum
+(
+    const word& val,
+    const bool ignoreError
+)
+{
+    for (int sw = 0; sw < INVALID; sw++)
+    {
+        if (val == names[sw])
+        {
+            if (sw == NO_1)
+            {
+                return NO;
+            }
+            else if (sw == YES_1)
+            {
+                return YES;
+            }
+            else
+            {
+                return switchType(sw);
+            }
+        }
+    }
+
+    if (!ignoreError)
+    {
+        FatalErrorIn("Switch::asEnum(const word&)")
+            << "unknown switch word " << val
+            << abort(FatalError);
+    }
+
+    return INVALID;
+}
+
+
+Foam::Switch::switchType Foam::Switch::asEnum(const bool val)
+{
+    return val ? ON : OFF;
+}
+
+
+bool Foam::Switch::asBool
+(
+    const word& val,
+    const bool ignoreError
+)
+{
+    switchType sw = asEnum(val, true);
+
+    // catch error here
+    if (sw == INVALID && !ignoreError)
+    {
+        FatalErrorIn("Switch::asBool(const word&)")
+            << "unknown switch word " << val
+            << abort(FatalError);
+    }
+
+    return asBool(sw);
+}
+
+
+bool Foam::Switch::asBool(const switchType& val)
+{
+    return (val & 0x1);
+}
+
+
+Foam::word Foam::Switch::asWord(const bool val)
+{
+    return word((val ? names[ON] : names[OFF]), false);
+}
+
+
+Foam::word Foam::Switch::asWord(const switchType& val)
+{
+    return word(names[val], false);
+}
+
+
 Foam::Switch Foam::Switch::lookupOrAddToDict
 (
     const word& name,
@@ -40,49 +135,6 @@ Foam::Switch Foam::Switch::lookupOrAddToDict
     return dict.lookupOrAddDefault<Switch>(name, defaultValue);
 }
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-// NOTE: possible alternative implementation
-// make a direct bool, handle assignments and use switchTypes instead of word
-// for the word representation ...
-//
-//   //- Possible word representions
-//   enum switchTypes
-//   {
-//       OFF = 0, ON = 1,
-//       FALSE = 2, TRUE = 3,
-//       NO = 4, YES = 5
-//   };
-
-
-// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
-
-bool Foam::Switch::asBool(const word& val)
-{
-    if (val == "on" || val == "true" || val == "yes" || val == "y")
-    {
-        return true;
-    }
-    else if (val == "off" || val == "false" || val == "no" || val == "n")
-    {
-        return false;
-    }
-    else
-    {
-        FatalErrorIn("Switch::asBool(const word&)")
-            << "unknown switch word " << val
-            << abort(FatalError);
-    }
-
-    return false;
-}
-
-
-Foam::word Foam::Switch::asWord(const bool val)
-{
-    return word((val ? "on" : "off"), false);
-}
-
 
 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.H b/src/OpenFOAM/primitives/bools/Switch/Switch.H
index 1eca32502a..ff46b8feee 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.H
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.H
@@ -61,35 +61,69 @@ class dictionary;
 
 class Switch
 {
+public:
+
+    //- The various text representations for a switch value.
+    enum switchType
+    {
+        FALSE = 0,  TRUE  = 1,
+        OFF   = 2,  ON    = 3,
+        NO    = 4,  YES   = 5,
+        NO_1  = 6,  YES_1 = 7,
+        INVALID
+    };
+
+private:
+
+    // Static data members
+
+        //- The set of names corresponding to the switchType enumeration
+        //  Includes an extra entry for "invalid".
+        static const char* names[INVALID+1];
+
     // Private data
 
-        bool bool_;
+        //- Enumerated string representation
+        switchType switch_;
 
-        word word_;
+        //- The boolean value
+        bool bool_;
 
 public:
     // Private member functions
 
+        //- Return a switchType representation of a bool
+        static switchType asEnum(const bool);
+
+        //- Return a switchType representation of a word
+        static switchType asEnum(const word&, const bool ignoreError=false);
+
         //- Return a bool representation of a word
-        static bool asBool(const word&);
+        static bool asBool(const word&, const bool ignoreError=false);
+
+        //- Return a bool representation of a switchType
+        static bool asBool(const switchType&);
 
         //- Return a word representation of a bool value
         static word asWord(const bool);
 
+        //- Return a word representation of a switchType
+        static word asWord(const switchType&);
+
     // Constructors
 
         //- Construct from bool
         Switch(const bool value)
         :
-            bool_(value),
-            word_(asWord(value))
+            switch_(asEnum(value)),
+            bool_(value)
         {}
 
         //- Construct from word
         Switch(const word& value)
         :
-            bool_(asBool(value)),
-            word_(value)
+            switch_(asEnum(value)),
+            bool_(asBool(switch_))
         {}
 
         //- Construct from Istream
@@ -109,8 +143,8 @@ public:
 
         Switch& operator=(const Switch& rhs)
         {
-            bool_ = rhs.bool_;
-            word_ = rhs.word_;
+            switch_ = rhs.switch_;
+            bool_   = rhs.bool_;
 
             return *this;
         }
@@ -120,10 +154,10 @@ public:
             return bool_;
         }
 
-        operator const word&() const
-        {
-            return word_;
-        }
+//         operator const word&() const
+//         {
+//             return asWord(switch_);
+//         }
 
 
     // Member fuctions
diff --git a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
index 3962935a3a..5894c8c5c7 100644
--- a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
+++ b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
@@ -39,8 +39,10 @@ Foam::Switch::Switch(Istream& is)
 
 Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
 {
-    is >> s.word_;
-    s.bool_ = Switch::asBool(s.word_);
+    word w(is);
+
+    s.switch_ = Switch::asEnum(w);
+    s.bool_   = Switch::asBool(s.switch_);
 
     is.check("Istream& operator>>(Istream&, Switch&)");
 
@@ -50,10 +52,8 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const Switch& s)
 {
-    os << s.word_;
-
+    os  << Switch::names[s.switch_];
     os.check("Ostream& operator<<(Ostream&, const Switch&)");
-
     return os;
 }
 

From d5cbc3bf0840cadc9fbe036352203a9a7c01c3ea Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Jan 2009 19:07:14 +0100
Subject: [PATCH 08/32] cosmetic cleanups

- grammar in comments, namespace qualifiers, etc.
---
 src/OpenFOAM/meshes/boundBox/boundBox.H       |  2 +-
 src/OpenFOAM/primitives/Hash/Hash.H           |  6 +--
 src/OpenFOAM/primitives/Pair/Pair.H           | 10 ++---
 src/OpenFOAM/primitives/Scalar/Scalar.C       | 40 +++++++------------
 src/OpenFOAM/primitives/Scalar/Scalar.H       | 11 ++---
 src/OpenFOAM/primitives/Tuple2/Tuple2.H       | 16 ++++----
 .../primitives/VectorSpace/VectorSpace.C      | 32 ++++++---------
 src/OpenFOAM/primitives/char/charIO.C         | 17 ++------
 src/OpenFOAM/primitives/complex/complex.C     | 31 +++++---------
 src/OpenFOAM/primitives/complex/complex.H     |  6 +--
 .../primitives/contiguous/contiguous.H        | 17 ++++----
 .../primitives/diagTensor/diagTensor.H        |  2 +-
 src/OpenFOAM/primitives/int/int.H             |  4 +-
 src/OpenFOAM/primitives/int/intIO.C           | 31 +++++---------
 src/OpenFOAM/primitives/label/label.C         |  5 +--
 src/OpenFOAM/primitives/label/label.H         |  4 +-
 .../labelSphericalTensor.H                    |  4 +-
 .../labelSymmTensor/labelSymmTensor.H         |  2 +-
 .../primitives/labelTensor/labelTensor.C      | 18 ++-------
 .../primitives/labelTensor/labelTensor.H      |  2 +-
 .../primitives/labelVector/labelVector.C      | 15 ++-----
 .../primitives/labelVector/labelVector.H      |  2 +-
 src/OpenFOAM/primitives/long/long.H           |  4 +-
 src/OpenFOAM/primitives/long/longIO.C         | 30 +++++---------
 src/OpenFOAM/primitives/longLong/longLong.H   |  4 +-
 src/OpenFOAM/primitives/longLong/longLongIO.C | 26 ++++--------
 src/OpenFOAM/primitives/pTraits/pTraits.H     | 15 +++----
 .../primitives/quaternion/quaternion.C        |  8 ++--
 .../primitives/quaternion/quaternion.H        |  2 +-
 .../primitives/septernion/septernion.C        |  8 ++--
 .../primitives/septernion/septernion.H        |  2 +-
 .../sphericalTensor/sphericalTensor.H         |  2 +-
 .../sphericalTensor2D/sphericalTensor2D.H     |  4 +-
 .../primitives/symmTensor/symmTensor.H        |  2 +-
 src/OpenFOAM/primitives/tensor/tensor.H       |  2 +-
 src/OpenFOAM/primitives/tensor2D/tensor2D.H   |  2 +-
 src/OpenFOAM/primitives/uLabel/uLabel.C       | 21 +++-------
 src/OpenFOAM/primitives/uLabel/uLabel.H       |  3 +-
 src/OpenFOAM/primitives/uint/uint.H           |  4 +-
 src/OpenFOAM/primitives/uint/uintIO.C         | 29 +++++---------
 src/OpenFOAM/primitives/ulong/ulong.H         |  4 +-
 src/OpenFOAM/primitives/ulong/ulongIO.C       | 29 +++++---------
 src/OpenFOAM/primitives/vector/vector.H       |  2 +-
 src/OpenFOAM/primitives/vector2D/vector2D.H   |  2 +-
 src/meshTools/octree/pointIndexHit.H          |  2 +-
 src/meshTools/octree/treeBoundBox.H           |  2 +-
 46 files changed, 187 insertions(+), 299 deletions(-)

diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.H b/src/OpenFOAM/meshes/boundBox/boundBox.H
index 927ff3dc5b..e41b6efa46 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.H
@@ -228,7 +228,7 @@ public:
 };
 
 
-//- Specify data associated with boundBox type are contiguous
+//- Data associated with boundBox type are contiguous
 template<>
 inline bool contiguous<boundBox>() {return contiguous<point>();}
 
diff --git a/src/OpenFOAM/primitives/Hash/Hash.H b/src/OpenFOAM/primitives/Hash/Hash.H
index e722dda6c2..ab8aa07a3b 100644
--- a/src/OpenFOAM/primitives/Hash/Hash.H
+++ b/src/OpenFOAM/primitives/Hash/Hash.H
@@ -45,7 +45,7 @@ namespace Foam
                            Class Hash Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class primitive>
+template<class PrimitiveType>
 class Hash
 {
 
@@ -54,12 +54,12 @@ public:
     Hash()
     {}
 
-    label operator()(const primitive& p) const
+    label operator()(const PrimitiveType& p) const
     {
         return label(p);
     }
 
-    label operator()(const primitive& p, const label tableSize) const
+    label operator()(const PrimitiveType& p, const label tableSize) const
     {
         return mag(operator()(p)) % tableSize;
     }
diff --git a/src/OpenFOAM/primitives/Pair/Pair.H b/src/OpenFOAM/primitives/Pair/Pair.H
index 497e4972b9..fe92c64c7a 100644
--- a/src/OpenFOAM/primitives/Pair/Pair.H
+++ b/src/OpenFOAM/primitives/Pair/Pair.H
@@ -29,6 +29,9 @@ Description
     An ordered pair of two objects of type \<T\> with first() and second()
     elements.
 
+SeeAlso
+    Foam::Tuple2 for storing two objects of dissimilar types.
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef Pair_H
@@ -136,15 +139,12 @@ public:
 
         friend bool operator==(const Pair<Type>& a, const Pair<Type>& b)
         {
-            return
-            (
-                (a.first() == b.first()) && (a.second() == b.second())
-            );
+            return (a.first() == b.first() && a.second() == b.second());
         }
 
         friend bool operator!=(const Pair<Type>& a, const Pair<Type>& b)
         {
-            return (!(a == b));
+            return !(a == b);
         }
 };
 
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index 4593405cd5..be85011331 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -26,18 +26,13 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
+const char* const Foam::pTraits<Foam::Scalar>::typeName = "scalar";
+const Foam::Scalar Foam::pTraits<Foam::Scalar>::zero(0.0);
+const Foam::Scalar Foam::pTraits<Foam::Scalar>::one(1.0);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+const char* Foam::pTraits<Foam::Scalar>::componentNames[] = { "x" };
 
-const char* const pTraits<Scalar>::typeName = "scalar";
-const Scalar pTraits<Scalar>::zero = 0.0;
-const Scalar pTraits<Scalar>::one = 1.0;
-
-const char* pTraits<Scalar>::componentNames[] = { "x" };
-
-pTraits<Scalar>::pTraits(Istream& is)
+Foam::pTraits<Foam::Scalar>::pTraits(Istream& is)
 {
     is >> p_;
 }
@@ -45,27 +40,26 @@ pTraits<Scalar>::pTraits(Istream& is)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- return a string representation of a Scalar
-word name(const Scalar s)
+Foam::word Foam::name(const Scalar s)
 {
-    std::ostringstream osBuffer;
-    osBuffer << s;
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << s;
+    return buf.str();
 }
 
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Scalar readScalar(Istream& is)
+Foam::Scalar Foam::readScalar(Istream& is)
 {
-    Scalar rs;
-    is >> rs;
+    Scalar val;
+    is >> val;
 
-    return rs;
+    return val;
 }
 
 
-Istream& operator>>(Istream& is, Scalar& s)
+Foam::Istream& Foam::operator>>(Istream& is, Scalar& s)
 {
     token t(is);
 
@@ -96,7 +90,7 @@ Istream& operator>>(Istream& is, Scalar& s)
 }
 
 
-Ostream& operator<<(Ostream& os, const Scalar s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const Scalar s)
 {
     os.write(s);
     os.check("Ostream& operator<<(Ostream&, const Scalar&)");
@@ -104,8 +98,4 @@ Ostream& operator<<(Ostream& os, const Scalar s)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 5e2fbc0a26..2eacda679b 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -51,7 +51,7 @@ public:
         enum
         {
             dim = 3,         // Dimensionality of space
-            rank = 0,        // Rank od Scalar is 0
+            rank = 0,        // Rank of Scalar is 0
             nComponents = 1  // Number of components in Scalar is 1
         };
 
@@ -65,7 +65,8 @@ public:
     // Constructors
 
         //- Construct from Istream
-        pTraits(Istream& is);
+        pTraits(Istream&);
+
 
     // Member Functions
 
@@ -78,8 +79,8 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Return a string representation of a Scalar
-word name(const Scalar s);
+//- Return a string representation of a Scalar
+word name(const Scalar);
 
 
 inline Scalar& setComponent(Scalar& s, const direction)
@@ -261,7 +262,7 @@ inline Scalar stabilise(const Scalar s, const Scalar small)
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Scalar readScalar(Istream& is);
+Scalar readScalar(Istream&);
 Istream& operator>>(Istream&, Scalar&);
 Ostream& operator<<(Ostream&, const Scalar);
 
diff --git a/src/OpenFOAM/primitives/Tuple2/Tuple2.H b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
index 3d7ee8c4aa..9a850e6236 100644
--- a/src/OpenFOAM/primitives/Tuple2/Tuple2.H
+++ b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
@@ -28,6 +28,9 @@ Class
 Description
     A 2-tuple.
 
+SeeAlso
+    Foam::Pair for storing two objects of identical types.
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef Tuple2_H
@@ -67,7 +70,7 @@ inline Ostream& operator<<(Ostream&, const Tuple2<Type1, Type2>&);
 
 
 /*---------------------------------------------------------------------------*\
-                            class Tuple2 Declaration
+                           class Tuple2 Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type1, class Type2>
@@ -97,7 +100,7 @@ public:
         //- Construct from Istream
         inline Tuple2(Istream& is)
         {
-            operator>>(is, *this);
+            is >> *this;
         }
 
 
@@ -186,10 +189,7 @@ inline bool operator==
     const Tuple2<Type1, Type2>& b
 )
 {
-    return
-    (
-        (a.first() == b.first()) && (a.second() == b.second())
-    );
+    return (a.first() == b.first() && a.second() == b.second());
 }
 
 
@@ -200,7 +200,7 @@ inline bool operator!=
     const Tuple2<Type1, Type2>& b
 )
 {
-    return (!(a == b));
+    return !(a == b);
 }
 
 
@@ -224,7 +224,7 @@ inline Ostream& operator<<(Ostream& os, const Tuple2<Type1, Type2>& t2)
     os  << token::BEGIN_LIST
         << t2.f_ << token::SPACE << t2.s_
         << token::END_LIST;
-    
+
     return os;
 }
 
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
index 73a981f7a2..59828e6469 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.C
@@ -29,16 +29,11 @@ License
 
 #include <sstream>
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from Istream
 template<class Form, class Cmpt, int nCmpt>
-VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
+Foam::VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
 (
     Istream& is
 )
@@ -55,36 +50,37 @@ VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
     is.readEnd("VectorSpace<Form, Cmpt, nCmpt>");
 
     // Check state of Istream
-    is.check("VectorSpace<Form, Cmpt, nCmpt>::VectorSpace(Istream& is)");
+    is.check("VectorSpace<Form, Cmpt, nCmpt>::VectorSpace(Istream&)");
 }
 
 
-//- Return a string representation
+// Return a string representation
 template<class Form, class Cmpt, int nCmpt>
-word name
+Foam::word
+Foam::name
 (
     const VectorSpace<Form, Cmpt, nCmpt>& vs
 )
 {
-    std::ostringstream osBuffer;
+    std::ostringstream buf;
 
-    osBuffer << '(';
+    buf << '(';
 
     for (int i=0; i<nCmpt-1; i++)
     {
-        osBuffer << vs.v_[i] << ',';
+        buf << vs.v_[i] << ',';
     }
 
-    osBuffer << vs.v_[nCmpt-1] << ')';
+    buf << vs.v_[nCmpt-1] << ')';
 
-    return osBuffer.str();
+    return buf.str();
 }
 
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class Form, class Cmpt, int nCmpt>
-Istream& operator>>
+Foam::Istream& Foam::operator>>
 (
     Istream& is,
     VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -109,7 +105,7 @@ Istream& operator>>
 
 
 template<class Form, class Cmpt, int nCmpt>
-Ostream& operator<<
+Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
     const VectorSpace<Form, Cmpt, nCmpt>& vs
@@ -131,8 +127,4 @@ Ostream& operator<<
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/char/charIO.C b/src/OpenFOAM/primitives/char/charIO.C
index e5806063ca..28d3ab12d3 100644
--- a/src/OpenFOAM/primitives/char/charIO.C
+++ b/src/OpenFOAM/primitives/char/charIO.C
@@ -36,12 +36,7 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Istream& operator>>(Istream& is, char& c)
+Foam::Istream& Foam::operator>>(Istream& is, char& c)
 {
     is.read(c);
     is.check("Istream& operator>>(Istream& is, char& c)");
@@ -49,7 +44,7 @@ Istream& operator>>(Istream& is, char& c)
 }
 
 
-Ostream& operator<<(Ostream& os, const char c)
+Foam::Ostream& Foam::operator<<(Ostream& os, const char c)
 {
     os.write(c);
     os.check("Ostream& operator<<(Ostream&, const char)");
@@ -57,7 +52,7 @@ Ostream& operator<<(Ostream& os, const char c)
 }
 
 
-char readChar(Istream& is)
+char Foam::readChar(Istream& is)
 {
    char c;
    is.read(c);
@@ -65,7 +60,7 @@ char readChar(Istream& is)
 }
 
 
-Ostream& operator<<(Ostream& os, const char* s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const char* s)
 {
     os.write(s);
     os.check("Ostream& operator<<(Ostream&, const char*)");
@@ -73,8 +68,4 @@ Ostream& operator<<(Ostream& os, const char* s)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/complex/complex.C b/src/OpenFOAM/primitives/complex/complex.C
index 0053cc6e57..bec6fefb0e 100644
--- a/src/OpenFOAM/primitives/complex/complex.C
+++ b/src/OpenFOAM/primitives/complex/complex.C
@@ -29,38 +29,33 @@ License
 
 #include <sstream>
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-const char* const complex::typeName = "complex";
-const complex complex::zero(0, 0);
-const complex complex::one(1, 1);
+const char* const Foam::complex::typeName = "complex";
+const Foam::complex Foam::complex::zero(0, 0);
+const Foam::complex Foam::complex::one(1, 1);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-complex::complex(Istream& is)
+Foam::complex::complex(Istream& is)
 {
-    operator>>(is, *this);
+    is >> *this;
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-word name(const complex& c)
+Foam::word Foam::name(const complex& c)
 {
-    std::ostringstream osBuffer;
-    osBuffer << '(' << c.Re() << ',' << c.Im() << ')';
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << '(' << c.Re() << ',' << c.Im() << ')';
+    return buf.str();
 }
 
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Istream& operator>>(Istream& is, complex& c)
+Foam::Istream& Foam::operator>>(Istream& is, complex& c)
 {
     // Read beginning of complex
     is.readBegin("complex");
@@ -77,7 +72,7 @@ Istream& operator>>(Istream& is, complex& c)
 }
 
 
-Ostream& operator<<(Ostream& os, const complex& c)
+Foam::Ostream& Foam::operator<<(Ostream& os, const complex& c)
 {
     os  << token::BEGIN_LIST
         << c.re << token::SPACE << c.im
@@ -87,8 +82,4 @@ Ostream& operator<<(Ostream& os, const complex& c)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/complex/complex.H b/src/OpenFOAM/primitives/complex/complex.H
index fe82ecfee2..1def519a99 100644
--- a/src/OpenFOAM/primitives/complex/complex.H
+++ b/src/OpenFOAM/primitives/complex/complex.H
@@ -174,8 +174,8 @@ public:
 
     // IOstream operators
 
-        friend Istream& operator>>(Istream& is, complex&);
-        friend Ostream& operator<<(Ostream& os, const complex& C);
+        friend Istream& operator>>(Istream&, complex&);
+        friend Ostream& operator<<(Ostream&, const complex&);
 
 };
 
@@ -186,7 +186,7 @@ public:
 word name(const complex&);
 
 
-//- Specify data associated with complex type is contiguous
+//- Data associated with complex type are contiguous
 template<>
 inline bool contiguous<complex>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/contiguous/contiguous.H b/src/OpenFOAM/primitives/contiguous/contiguous.H
index ba5afbed15..3c272839a0 100644
--- a/src/OpenFOAM/primitives/contiguous/contiguous.H
+++ b/src/OpenFOAM/primitives/contiguous/contiguous.H
@@ -26,12 +26,10 @@ InClass
     Foam::contiguous
 
 Description
-    Template function which specifies if the data of the type is contiguous
-    or not.
+    Template function to specify if the data of a type are contiguous.
 
     The default function specifies that data are not contiguous.
-    This is specialised for the types (e.g. primitives) for which their
-    data are contiguous.
+    This is specialised for the types (e.g. primitives) with contiguous data.
 
 \*---------------------------------------------------------------------------*/
 
@@ -52,14 +50,13 @@ template<class T, label Size> class FixedList;
 template<class T> class Pair;
 
 
-// Assume the data associated with type T is not contiguous
+//- Assume the data associated with type T are not contiguous
 template<class T>
-inline bool contiguous()                        {return false;}
+inline bool contiguous()                                   {return false;}
 
 
-
-// Specify data associated with primitive types (and simple fixed size
-// containers - only size 2 defined here) is contiguous
+// Data associated with primitive types (and simple fixed size containers
+//  - only size 2 defined here) are contiguous
 
 template<>
 inline bool contiguous<bool>()                              {return true;}
@@ -143,7 +140,7 @@ inline bool contiguous<float>()                             {return true;}
 template<>
 inline bool contiguous<FixedList<float, 2> >()              {return true;}
 template<>
-inline bool contiguous<Pair<float> >()                       {return true;}
+inline bool contiguous<Pair<float> >()                      {return true;}
 
 template<>
 inline bool contiguous<double>()                            {return true;}
diff --git a/src/OpenFOAM/primitives/diagTensor/diagTensor.H b/src/OpenFOAM/primitives/diagTensor/diagTensor.H
index 31c8970b45..0a23ab1bf6 100644
--- a/src/OpenFOAM/primitives/diagTensor/diagTensor.H
+++ b/src/OpenFOAM/primitives/diagTensor/diagTensor.H
@@ -49,7 +49,7 @@ namespace Foam
 typedef DiagTensor<scalar> diagTensor;
 
 
-//- Specify data associated with diagTensor type is contiguous
+//- Data associated with diagTensor type are contiguous
 template<>
 inline bool contiguous<diagTensor>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/int/int.H b/src/OpenFOAM/primitives/int/int.H
index e53a63ae11..e8abfacd47 100644
--- a/src/OpenFOAM/primitives/int/int.H
+++ b/src/OpenFOAM/primitives/int/int.H
@@ -50,11 +50,11 @@ class Ostream;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Return a word representation of an int
-word name(const int i);
+word name(const int);
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-int readInt(Istream& is);
+int readInt(Istream&);
 Istream& operator>>(Istream&, int&);
 Ostream& operator<<(Ostream&, const int);
 
diff --git a/src/OpenFOAM/primitives/int/intIO.C b/src/OpenFOAM/primitives/int/intIO.C
index e8812cc58a..b7a70228c0 100644
--- a/src/OpenFOAM/primitives/int/intIO.C
+++ b/src/OpenFOAM/primitives/int/intIO.C
@@ -39,22 +39,17 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+Foam::word Foam::name(const int val)
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Return a string representation of an int
-word name(const int i)
-{
-    std::ostringstream osBuffer;
-    osBuffer << i;
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
 }
 
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Istream& operator>>(Istream& is, int& i)
+Foam::Istream& Foam::operator>>(Istream& is, int& i)
 {
     token t(is);
 
@@ -85,16 +80,16 @@ Istream& operator>>(Istream& is, int& i)
 }
 
 
-int readInt(Istream& is)
+int Foam::readInt(Istream& is)
 {
-    int ri;
-    is >> ri;
+    int val;
+    is >> val;
 
-    return ri;
+    return val;
 }
 
 
-Ostream& operator<<(Ostream& os, const int i)
+Foam::Ostream& Foam::operator<<(Ostream& os, const int i)
 {
     os.write(label(i));
     os.check("Ostream& operator<<(Ostream&, const int)");
@@ -102,8 +97,4 @@ Ostream& operator<<(Ostream& os, const int i)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/label/label.C b/src/OpenFOAM/primitives/label/label.C
index 5d4d7dd2bb..5487b39761 100644
--- a/src/OpenFOAM/primitives/label/label.C
+++ b/src/OpenFOAM/primitives/label/label.C
@@ -38,8 +38,8 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 const char* const pTraits<label>::typeName = "label";
-const label pTraits<label>::zero = 0;
-const label pTraits<label>::one = 1;
+const label pTraits<label>::zero(0);
+const label pTraits<label>::one(1);
 
 const char* pTraits<label>::componentNames[] = { "x" };
 
@@ -48,7 +48,6 @@ pTraits<label>::pTraits(Istream& is)
     is >> p_;
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Raise one label to the power of another (overloaded function call)
diff --git a/src/OpenFOAM/primitives/label/label.H b/src/OpenFOAM/primitives/label/label.H
index d83cd7b08e..3145efb6de 100644
--- a/src/OpenFOAM/primitives/label/label.H
+++ b/src/OpenFOAM/primitives/label/label.H
@@ -140,7 +140,7 @@ public:
         enum
         {
             dim = 3,         // Dimensionality of space
-            rank = 0,        // Rank od label is 0
+            rank = 0,        // Rank of label is 0
             nComponents = 1  // Number of components in label is 1
         };
 
@@ -154,7 +154,7 @@ public:
     // Constructors
 
         //- Construct from Istream
-        pTraits(Istream& is);
+        pTraits(Istream&);
 
     // Member Functions
 
diff --git a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H b/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H
index 5f277dca49..5c4efc19a2 100644
--- a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H
+++ b/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H
@@ -48,10 +48,10 @@ namespace Foam
 
 typedef SphericalTensor<label> labelSphericalTensor;
 
-// Identity labelTensor
+//- Identity labelTensor
 static const labelSphericalTensor labelI(1);
 
-//- Specify data associated with labelSphericalTensor type is contiguous
+//- Data associated with labelSphericalTensor type are contiguous
 template<>
 inline bool contiguous<labelSphericalTensor>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H b/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
index 26f7f4fef1..771c7b16bd 100644
--- a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
+++ b/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
@@ -48,7 +48,7 @@ namespace Foam
 
 typedef SymmTensor<label> labelSymmTensor;
 
-//- Specify data associated with labelSymmTensor type is contiguous
+//- Data associated with labelSymmTensor type are contiguous
 template<>
 inline bool contiguous<labelSymmTensor>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/labelTensor/labelTensor.C b/src/OpenFOAM/primitives/labelTensor/labelTensor.C
index f78ec03d4e..febf9cb8ad 100644
--- a/src/OpenFOAM/primitives/labelTensor/labelTensor.C
+++ b/src/OpenFOAM/primitives/labelTensor/labelTensor.C
@@ -25,20 +25,15 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "labelTensor.H"
-#include "mathematicalConstants.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const labelTensor::typeName = "labelTensor";
+const char* const Foam::labelTensor::typeName = "labelTensor";
 
 template<>
-const char* labelTensor::componentNames[] =
+const char* Foam::labelTensor::componentNames[] =
 {
     "xx", "xy", "xz",
     "yx", "yy", "yz",
@@ -46,7 +41,7 @@ const char* labelTensor::componentNames[] =
 };
 
 template<>
-const labelTensor labelTensor::zero
+const Foam::labelTensor Foam::labelTensor::zero
 (
     0, 0, 0,
     0, 0, 0,
@@ -54,7 +49,7 @@ const labelTensor labelTensor::zero
 );
 
 template<>
-const labelTensor labelTensor::one
+const Foam::labelTensor Foam::labelTensor::one
 (
     1, 1, 1,
     1, 1, 1,
@@ -62,9 +57,4 @@ const labelTensor labelTensor::one
 );
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
-
diff --git a/src/OpenFOAM/primitives/labelTensor/labelTensor.H b/src/OpenFOAM/primitives/labelTensor/labelTensor.H
index 9aa1d8cd2d..f6d69ae2ef 100644
--- a/src/OpenFOAM/primitives/labelTensor/labelTensor.H
+++ b/src/OpenFOAM/primitives/labelTensor/labelTensor.H
@@ -48,7 +48,7 @@ namespace Foam
 
 typedef Tensor<label> labelTensor;
 
-//- Specify data associated with labelTensor type is contiguous
+//- Specify data associated with labelTensor type are contiguous
 template<>
 inline bool contiguous<labelTensor>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/labelVector/labelVector.C b/src/OpenFOAM/primitives/labelVector/labelVector.C
index 327b3fd6af..4849dc4f3d 100644
--- a/src/OpenFOAM/primitives/labelVector/labelVector.C
+++ b/src/OpenFOAM/primitives/labelVector/labelVector.C
@@ -29,27 +29,20 @@ Description
 
 #include "labelVector.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
-const char* const labelVector::typeName = "labelVector";
+const char* const Foam::labelVector::typeName = "labelVector";
 
 template<>
-const char* labelVector::componentNames[] = {"x", "y", "z"};
+const char* Foam::labelVector::componentNames[] = {"x", "y", "z"};
 
 template<>
-const labelVector labelVector::zero(0, 0, 0);
+const Foam::labelVector Foam::labelVector::zero(0, 0, 0);
 
 template<>
-const labelVector labelVector::one(1, 1, 1);
+const Foam::labelVector Foam::labelVector::one(1, 1, 1);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/labelVector/labelVector.H b/src/OpenFOAM/primitives/labelVector/labelVector.H
index 96341722c3..d8a7c7c0d5 100644
--- a/src/OpenFOAM/primitives/labelVector/labelVector.H
+++ b/src/OpenFOAM/primitives/labelVector/labelVector.H
@@ -50,7 +50,7 @@ namespace Foam
 typedef Vector<label> labelVector;
 
 
-//- Specify data associated with labelVector type is contiguous
+//- Data associated with labelVector type are contiguous
 template<>
 inline bool contiguous<labelVector>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/long/long.H b/src/OpenFOAM/primitives/long/long.H
index fe01d5bfeb..fbcbfc93f6 100644
--- a/src/OpenFOAM/primitives/long/long.H
+++ b/src/OpenFOAM/primitives/long/long.H
@@ -49,11 +49,11 @@ class Ostream;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Return a string representation of a long
-word name(long l);
+word name(long);
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-long readLong(Istream& is);
+long readLong(Istream&);
 Istream& operator>>(Istream&, long&);
 Ostream& operator<<(Ostream&, const long);
 
diff --git a/src/OpenFOAM/primitives/long/longIO.C b/src/OpenFOAM/primitives/long/longIO.C
index 770f11f7b8..2b7320164d 100644
--- a/src/OpenFOAM/primitives/long/longIO.C
+++ b/src/OpenFOAM/primitives/long/longIO.C
@@ -38,22 +38,16 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+Foam::word Foam::name(long val)
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Return a string representation of a long
-word name(long l)
-{
-    std::ostringstream osBuffer;
-    osBuffer << l;
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
 }
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Istream& operator>>(Istream& is, long& l)
+Foam::Istream& Foam::operator>>(Istream& is, long& l)
 {
     token t(is);
 
@@ -84,16 +78,16 @@ Istream& operator>>(Istream& is, long& l)
 }
 
 
-long readLong(Istream& is)
+long Foam::readLong(Istream& is)
 {
-    long l;
-    is >> l;
+    long val;
+    is >> val;
 
-    return l;
+    return val;
 }
 
 
-Ostream& operator<<(Ostream& os, const long l)
+Foam::Ostream& Foam::operator<<(Ostream& os, const long l)
 {
     os.write(label(l));
     os.check("Ostream& operator<<(Ostream&, const long)");
@@ -101,8 +95,4 @@ Ostream& operator<<(Ostream& os, const long l)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/longLong/longLong.H b/src/OpenFOAM/primitives/longLong/longLong.H
index 42ece6ef68..3466bfc863 100644
--- a/src/OpenFOAM/primitives/longLong/longLong.H
+++ b/src/OpenFOAM/primitives/longLong/longLong.H
@@ -49,11 +49,11 @@ class Ostream;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Return a string representation of a long long
-word name(long long l);
+word name(long long);
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-long long readLongLong(Istream& is);
+long long readLongLong(Istream&);
 Istream& operator>>(Istream&, long long&);
 Ostream& operator<<(Ostream&, const long long);
 
diff --git a/src/OpenFOAM/primitives/longLong/longLongIO.C b/src/OpenFOAM/primitives/longLong/longLongIO.C
index a479e38e57..ccefe572b6 100644
--- a/src/OpenFOAM/primitives/longLong/longLongIO.C
+++ b/src/OpenFOAM/primitives/longLong/longLongIO.C
@@ -38,22 +38,16 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+Foam::word Foam::name(long long val)
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Return a string representation of a long long
-word name(long long l)
-{
-    std::ostringstream osBuffer;
-    osBuffer << l;
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
 }
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Istream& operator>>(Istream& is, long long& l)
+Foam::Istream& Foam::operator>>(Istream& is, long long& l)
 {
     l = readLongLong(is);
 
@@ -64,7 +58,7 @@ Istream& operator>>(Istream& is, long long& l)
 }
 
 
-long long readLongLong(Istream& is)
+long long Foam::readLongLong(Istream& is)
 {
     register long long result = 0;
 
@@ -94,7 +88,7 @@ long long readLongLong(Istream& is)
 }
 
 
-Ostream& operator<<(Ostream& os, const long long l)
+Foam::Ostream& Foam::operator<<(Ostream& os, const long long l)
 {
     long long val = l;
 
@@ -119,7 +113,7 @@ Ostream& operator<<(Ostream& os, const long long l)
             os.write(char(d+'0'));
         }
 
-        val = val%mask;
+        val = val % mask;
         mask /= 10;
     }
     os.check("Ostream& operator<<(Ostream&, const long long)");
@@ -127,8 +121,4 @@ Ostream& operator<<(Ostream& os, const long long l)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/pTraits/pTraits.H b/src/OpenFOAM/primitives/pTraits/pTraits.H
index 48550e2f20..98a3df7ec9 100644
--- a/src/OpenFOAM/primitives/pTraits/pTraits.H
+++ b/src/OpenFOAM/primitives/pTraits/pTraits.H
@@ -26,8 +26,9 @@ Class
     Foam::pTraits
 
 Description
-    Traits class for primitives.  All primitives need a specialised
-    version of this class
+    Traits class for primitives.
+
+    All primitives need a specialised version of this class
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,22 +46,22 @@ class Istream;
                            Class pTraits Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class primitive>
+template<class PrimitiveType>
 class pTraits
 :
-    public primitive
+    public PrimitiveType
 {
 
 public:
 
-    pTraits(const primitive& p)
+    pTraits(const PrimitiveType& p)
     :
-        primitive(p)
+        PrimitiveType(p)
     {}
 
     pTraits(Istream& is)
     :
-        primitive(is)
+        PrimitiveType(is)
     {}
 };
 
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.C b/src/OpenFOAM/primitives/quaternion/quaternion.C
index 08cbec807e..04e65d6be3 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.C
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.C
@@ -38,7 +38,7 @@ const Foam::quaternion Foam::quaternion::I(1, vector::zero);
 
 Foam::quaternion::quaternion(Istream& is)
 {
-    operator>>(is, *this);
+    is >> *this;
 }
 
 
@@ -46,9 +46,9 @@ Foam::quaternion::quaternion(Istream& is)
 
 Foam::word Foam::name(const quaternion& q)
 {
-    OStringStream osBuffer;
-    osBuffer << '(' << q.w() << ',' << q.v() << ')';
-    return osBuffer.str();
+    OStringStream buf;
+    buf << '(' << q.w() << ',' << q.v() << ')';
+    return buf.str();
 }
 
 
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index 1a00f5be66..c87625f66d 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -194,7 +194,7 @@ inline quaternion inv(const quaternion& q);
 //- Return a string representation of a quaternion
 word name(const quaternion&);
 
-//- Specify data associated with quaternion type is contiguous
+//- Data associated with quaternion type are contiguous
 template<>
 inline bool contiguous<quaternion>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/septernion/septernion.C b/src/OpenFOAM/primitives/septernion/septernion.C
index 35fbea500f..598e350cd0 100644
--- a/src/OpenFOAM/primitives/septernion/septernion.C
+++ b/src/OpenFOAM/primitives/septernion/septernion.C
@@ -38,7 +38,7 @@ const Foam::septernion Foam::septernion::I(vector::zero, quaternion::I);
 
 Foam::septernion::septernion(Istream& is)
 {
-    operator>>(is, *this);
+    is >> *this;
 }
 
 
@@ -46,9 +46,9 @@ Foam::septernion::septernion(Istream& is)
 
 Foam::word Foam::name(const septernion& s)
 {
-    OStringStream osBuffer;
-    osBuffer << '(' << s.t() << ',' << s.r() << ')';
-    return osBuffer.str();
+    OStringStream buf;
+    buf << '(' << s.t() << ',' << s.r() << ')';
+    return buf.str();
 }
 
 
diff --git a/src/OpenFOAM/primitives/septernion/septernion.H b/src/OpenFOAM/primitives/septernion/septernion.H
index 7d32db0fe0..906e68cf00 100644
--- a/src/OpenFOAM/primitives/septernion/septernion.H
+++ b/src/OpenFOAM/primitives/septernion/septernion.H
@@ -159,7 +159,7 @@ inline septernion inv(const septernion& tr);
 word name(const septernion&);
 
 
-//- Specify data associated with septernion type is contiguous
+//- Data associated with septernion type are contiguous
 template<>
 inline bool contiguous<septernion>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
index 9a883de0ba..f5dfa92a58 100644
--- a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
+++ b/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
@@ -55,7 +55,7 @@ static const sphericalTensor oneThirdI(1.0/3.0);
 static const sphericalTensor twoThirdsI(2.0/3.0);
 
 
-//- Specify data associated with sphericalTensor type is contiguous
+//- Specify data associated with sphericalTensor type are contiguous
 template<>
 inline bool contiguous<sphericalTensor>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H b/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H
index 17a999230d..fc4696ab33 100644
--- a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H
@@ -49,14 +49,14 @@ namespace Foam
 
 typedef SphericalTensor2D<scalar> sphericalTensor2D;
 
-// Identity tensor
+//- Identity tensor
 static const sphericalTensor2D I2D(1);
 
 static const sphericalTensor2D oneThirdI2D(1.0/3.0);
 static const sphericalTensor2D twoThirdsI2D(2.0/3.0);
 
 
-//- Specify data associated with sphericalTensor2D type is contiguous
+//- Data associated with sphericalTensor2D type are contiguous
 template<>
 inline bool contiguous<sphericalTensor2D>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/symmTensor/symmTensor.H b/src/OpenFOAM/primitives/symmTensor/symmTensor.H
index 80b5df360b..eb5f02ec84 100644
--- a/src/OpenFOAM/primitives/symmTensor/symmTensor.H
+++ b/src/OpenFOAM/primitives/symmTensor/symmTensor.H
@@ -49,7 +49,7 @@ namespace Foam
 
 typedef SymmTensor<scalar> symmTensor;
 
-//- Specify data associated with symmTensor type is contiguous
+//- Data associated with symmTensor type are contiguous
 template<>
 inline bool contiguous<symmTensor>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/tensor/tensor.H b/src/OpenFOAM/primitives/tensor/tensor.H
index fe0089e13b..42223abf6a 100644
--- a/src/OpenFOAM/primitives/tensor/tensor.H
+++ b/src/OpenFOAM/primitives/tensor/tensor.H
@@ -59,7 +59,7 @@ vector eigenValues(const symmTensor& t);
 vector eigenVector(const symmTensor& t, const scalar lambda);
 tensor eigenVectors(const symmTensor& t);
 
-//- Specify data associated with tensor type is contiguous
+//- Data associated with tensor type are contiguous
 template<>
 inline bool contiguous<tensor>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/tensor2D/tensor2D.H b/src/OpenFOAM/primitives/tensor2D/tensor2D.H
index 34bfe108a4..3022195818 100644
--- a/src/OpenFOAM/primitives/tensor2D/tensor2D.H
+++ b/src/OpenFOAM/primitives/tensor2D/tensor2D.H
@@ -53,7 +53,7 @@ vector2D eigenValues(const tensor2D& t);
 vector2D eigenVector(const tensor2D& t, const scalar lambda);
 tensor2D eigenVectors(const tensor2D& t);
 
-//- Specify data associated with tensor2D type is contiguous
+//- Data associated with tensor2D type are contiguous
 template<>
 inline bool contiguous<tensor2D>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.C b/src/OpenFOAM/primitives/uLabel/uLabel.C
index b4e72c18a6..7d9c456eaf 100644
--- a/src/OpenFOAM/primitives/uLabel/uLabel.C
+++ b/src/OpenFOAM/primitives/uLabel/uLabel.C
@@ -29,28 +29,17 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
+const char* const Foam::pTraits<Foam::uLabel>::typeName = "uLabel";
+const Foam::uLabel Foam::pTraits<Foam::uLabel>::zero(0);
+const Foam::uLabel Foam::pTraits<Foam::uLabel>::one(1);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+const char* Foam::pTraits<Foam::uLabel>::componentNames[] = { "x" };
 
-const char* const pTraits<uLabel>::typeName = "uLabel";
-const uLabel pTraits<uLabel>::zero = 0;
-const uLabel pTraits<uLabel>::one = 1;
-
-const char* pTraits<uLabel>::componentNames[] = { "x" };
-
-pTraits<uLabel>::pTraits(Istream& is)
+Foam::pTraits<Foam::uLabel>::pTraits(Istream& is)
 {
     is >> p_;
 }
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.H b/src/OpenFOAM/primitives/uLabel/uLabel.H
index 7b99b79eb1..e4b670850d 100644
--- a/src/OpenFOAM/primitives/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/uLabel/uLabel.H
@@ -134,7 +134,8 @@ public:
     // Constructors
 
         //- Construct from Istream
-        pTraits(Istream& is);
+        pTraits(Istream&);
+
 
     // Member Functions
 
diff --git a/src/OpenFOAM/primitives/uint/uint.H b/src/OpenFOAM/primitives/uint/uint.H
index 62b8d642c5..5233c56e53 100644
--- a/src/OpenFOAM/primitives/uint/uint.H
+++ b/src/OpenFOAM/primitives/uint/uint.H
@@ -49,11 +49,11 @@ class Ostream;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Return a string representation of an uint
-word name(const unsigned int i);
+word name(const unsigned int);
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-unsigned int readUint(Istream& is);
+unsigned int readUint(Istream&);
 Istream& operator>>(Istream&, unsigned int&);
 Ostream& operator<<(Ostream&, const unsigned int);
 
diff --git a/src/OpenFOAM/primitives/uint/uintIO.C b/src/OpenFOAM/primitives/uint/uintIO.C
index deed3da7ba..1d24188c91 100644
--- a/src/OpenFOAM/primitives/uint/uintIO.C
+++ b/src/OpenFOAM/primitives/uint/uintIO.C
@@ -39,21 +39,16 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+Foam::word Foam::name(const unsigned int val)
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-word name(const unsigned int i)
-{
-    std::ostringstream osBuffer;
-    osBuffer << i;
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
 }
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Istream& operator>>(Istream& is, unsigned int& i)
+Foam::Istream& Foam::operator>>(Istream& is, unsigned int& i)
 {
     token t(is);
 
@@ -84,16 +79,16 @@ Istream& operator>>(Istream& is, unsigned int& i)
 }
 
 
-unsigned int readUint(Istream& is)
+unsigned int Foam::readUint(Istream& is)
 {
-    unsigned int ri;
-    is >> ri;
+    unsigned int val;
+    is >> val;
 
-    return ri;
+    return val;
 }
 
 
-Ostream& operator<<(Ostream& os, const unsigned int i)
+Foam::Ostream& Foam::operator<<(Ostream& os, const unsigned int i)
 {
     os.write(label(i));
     os.check("Ostream& operator<<(Ostream&, const unsigned int)");
@@ -101,8 +96,4 @@ Ostream& operator<<(Ostream& os, const unsigned int i)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ulong/ulong.H b/src/OpenFOAM/primitives/ulong/ulong.H
index 2909898b1d..5cc09b9420 100644
--- a/src/OpenFOAM/primitives/ulong/ulong.H
+++ b/src/OpenFOAM/primitives/ulong/ulong.H
@@ -49,11 +49,11 @@ class Ostream;
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 //- Return a string representation of an ulong
-word name(const unsigned long i);
+word name(const unsigned long);
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-unsigned long readUlong(Istream& is);
+unsigned long readUlong(Istream&);
 Istream& operator>>(Istream&, unsigned long&);
 Ostream& operator<<(Ostream&, const unsigned long);
 
diff --git a/src/OpenFOAM/primitives/ulong/ulongIO.C b/src/OpenFOAM/primitives/ulong/ulongIO.C
index e556b78d63..e8045f45fc 100644
--- a/src/OpenFOAM/primitives/ulong/ulongIO.C
+++ b/src/OpenFOAM/primitives/ulong/ulongIO.C
@@ -39,21 +39,16 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+Foam::word Foam::name(const unsigned long val)
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-word name(const unsigned long i)
-{
-    std::ostringstream osBuffer;
-    osBuffer << i;
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
 }
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Istream& operator>>(Istream& is, unsigned long& i)
+Foam::Istream& Foam::operator>>(Istream& is, unsigned long& i)
 {
     token t(is);
 
@@ -84,16 +79,16 @@ Istream& operator>>(Istream& is, unsigned long& i)
 }
 
 
-unsigned long readUlong(Istream& is)
+unsigned long Foam::readUlong(Istream& is)
 {
-    unsigned long ri;
-    is >> ri;
+    unsigned long val;
+    is >> val;
 
-    return ri;
+    return val;
 }
 
 
-Ostream& operator<<(Ostream& os, const unsigned long i)
+Foam::Ostream& Foam::operator<<(Ostream& os, const unsigned long i)
 {
     os.write(label(i));
     os.check("Ostream& operator<<(Ostream&, const unsigned long)");
@@ -101,8 +96,4 @@ Ostream& operator<<(Ostream& os, const unsigned long i)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/vector/vector.H b/src/OpenFOAM/primitives/vector/vector.H
index 97fe9fb8c6..5c736eb9ae 100644
--- a/src/OpenFOAM/primitives/vector/vector.H
+++ b/src/OpenFOAM/primitives/vector/vector.H
@@ -50,7 +50,7 @@ namespace Foam
 typedef Vector<scalar> vector;
 
 
-//- Specify data associated with vector type is contiguous
+//- Data associated with vector type are contiguous
 template<>
 inline bool contiguous<vector>() {return true;}
 
diff --git a/src/OpenFOAM/primitives/vector2D/vector2D.H b/src/OpenFOAM/primitives/vector2D/vector2D.H
index 8744f182fd..4648ffd255 100644
--- a/src/OpenFOAM/primitives/vector2D/vector2D.H
+++ b/src/OpenFOAM/primitives/vector2D/vector2D.H
@@ -50,7 +50,7 @@ namespace Foam
 typedef Vector2D<scalar> vector2D;
 
 
-//- Specify data associated with vector2D type is contiguous
+//- Data associated with vector2D type are contiguous
 template<>
 inline bool contiguous<vector2D>() {return true;}
 
diff --git a/src/meshTools/octree/pointIndexHit.H b/src/meshTools/octree/pointIndexHit.H
index e5487f8ee4..ed32cbdf00 100644
--- a/src/meshTools/octree/pointIndexHit.H
+++ b/src/meshTools/octree/pointIndexHit.H
@@ -43,7 +43,7 @@ namespace Foam
 typedef PointIndexHit<point> pointIndexHit;
 
 
-//- Specify data associated with pointIndexHit type is contiguous
+//- Data associated with pointIndexHit type are contiguous
 template<>
 inline bool contiguous<pointIndexHit>() {return contiguous<point>();}
 
diff --git a/src/meshTools/octree/treeBoundBox.H b/src/meshTools/octree/treeBoundBox.H
index e9d9b942da..77498b2935 100644
--- a/src/meshTools/octree/treeBoundBox.H
+++ b/src/meshTools/octree/treeBoundBox.H
@@ -327,7 +327,7 @@ public:
 };
 
 
-//- Specify data associated with boundBox type is contiguous
+//- Data associated with treeBoundBox type are contiguous
 template<>
 inline bool contiguous<treeBoundBox>() {return contiguous<boundBox>();}
 

From c20ab11afbf6039945f7a1133c8623351fbd2dd2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Jan 2009 19:08:27 +0100
Subject: [PATCH 09/32] bool and Switch reworked

- Switch now stores its value as an unsigned char, which gives it the same
  storage requirement as bool (1 byte). The original implementation had both
  bool+word (1+XXX bytes storage), an intermediate version with bool+enum
  had 8 bytes (1+4 + boundary alignment).

- The reading code in boolIO.C and SwitchIO.C is now identical except for
  the error message. This allows Switch to accept '1', '0' as logical
  values, and allows bool to accept 'yes', 'no' etc. as logical values.

- The Switch text translation of a bool value is now true/false instead of
  on/off. This is partly personal preference, but we could also output the
  same text when writing a bool value to Ostream.

- Switch gets null and integer constructors so it feels more like bool.
  Added Switch::operator=(const bool);

- Low-level types can be used for the constructors, and low-level return
  values are used for the greatest flexibility (and speed).

- Fixed bugginess with dictionary lookup. The previous version actually used
  a bool instead of a Switch and bombed on 'on/off'.

TODO?
  perhaps don't worry about the error message and just call the Switch
  routines from bool.
---
 src/OpenFOAM/primitives/bools/Switch/Switch.C |  69 +++++-----
 src/OpenFOAM/primitives/bools/Switch/Switch.H | 118 +++++++++++-------
 .../primitives/bools/Switch/SwitchIO.C        |  46 ++++++-
 src/OpenFOAM/primitives/bools/bool/bool.C     |   7 +-
 src/OpenFOAM/primitives/bools/bool/bool.H     |   4 +-
 src/OpenFOAM/primitives/bools/bool/boolIO.C   |  47 ++++---
 6 files changed, 181 insertions(+), 110 deletions(-)

diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.C b/src/OpenFOAM/primitives/bools/Switch/Switch.C
index 3a5a3554e6..caf3cebf98 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.C
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.C
@@ -31,7 +31,7 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 // NB: values chosen such that bitwise '&' 0x1 yields the bool value
-
+// INVALID is also evaluates to false, but don't rely on that
 const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
 {
     "false", "true",
@@ -44,24 +44,31 @@ const char* Foam::Switch::names[Foam::Switch::INVALID+1] =
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
+Foam::Switch::switchType Foam::Switch::asEnum(const bool val)
+{
+    return val ? Switch::FALSE : Switch::TRUE;
+}
 
-Foam::Switch::switchType Foam::Switch::asEnum
+
+Foam::Switch::switchType
+Foam::Switch::asEnum
 (
-    const word& val,
-    const bool ignoreError
+    const std::string& str,
+    const bool allowInvalid
 )
 {
-    for (int sw = 0; sw < INVALID; sw++)
+    for (int sw = 0; sw < Switch::INVALID; sw++)
     {
-        if (val == names[sw])
+        if (str == names[sw])
         {
-            if (sw == NO_1)
+            // convert y/n to yes/no (perhaps should deprecate y/n)
+            if (sw == Switch::NO_1)
             {
-                return NO;
+                return Switch::NO;
             }
-            else if (sw == YES_1)
+            else if (sw == Switch::YES_1)
             {
-                return YES;
+                return Switch::YES;
             }
             else
             {
@@ -70,10 +77,10 @@ Foam::Switch::switchType Foam::Switch::asEnum
         }
     }
 
-    if (!ignoreError)
+    if (!allowInvalid)
     {
-        FatalErrorIn("Switch::asEnum(const word&)")
-            << "unknown switch word " << val
+        FatalErrorIn("Switch::asEnum(const std::string&)")
+            << "unknown switch word " << str << nl
             << abort(FatalError);
     }
 
@@ -81,47 +88,41 @@ Foam::Switch::switchType Foam::Switch::asEnum
 }
 
 
-Foam::Switch::switchType Foam::Switch::asEnum(const bool val)
+bool Foam::Switch::asBool(const switchType sw)
 {
-    return val ? ON : OFF;
+    return (sw & 0x1);
 }
 
 
 bool Foam::Switch::asBool
 (
-    const word& val,
-    const bool ignoreError
+    const std::string& str,
+    const bool allowInvalid
 )
 {
-    switchType sw = asEnum(val, true);
+    // allow invalid values, but catch after for correct error message
+    switchType sw = asEnum(str, true);
 
-    // catch error here
-    if (sw == INVALID && !ignoreError)
+    if (sw == Switch::INVALID && !allowInvalid)
     {
-        FatalErrorIn("Switch::asBool(const word&)")
-            << "unknown switch word " << val
+        FatalErrorIn("Switch::asBool(const std::string&)")
+            << "unknown switch word " << str << nl
             << abort(FatalError);
     }
 
-    return asBool(sw);
+    return (sw & 0x1);
 }
 
 
-bool Foam::Switch::asBool(const switchType& val)
+const char* Foam::Switch::asText(const bool b)
 {
-    return (val & 0x1);
+    return b ? names[Switch::TRUE] : names[Switch::FALSE];
 }
 
 
-Foam::word Foam::Switch::asWord(const bool val)
+const char* Foam::Switch::asText(const switchType sw)
 {
-    return word((val ? names[ON] : names[OFF]), false);
-}
-
-
-Foam::word Foam::Switch::asWord(const switchType& val)
-{
-    return word(names[val], false);
+    return names[sw];
 }
 
 
@@ -140,7 +141,7 @@ Foam::Switch Foam::Switch::lookupOrAddToDict
 
 bool Foam::Switch::readIfPresent(const word& name, const dictionary& dict)
 {
-    return dict.readIfPresent(name, bool_);
+    return dict.readIfPresent<Switch>(name, *this);
 }
 
 
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.H b/src/OpenFOAM/primitives/bools/Switch/Switch.H
index ff46b8feee..b37e2bbb40 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.H
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.H
@@ -27,7 +27,7 @@ Class
 
 Description
     A simple wrapper around bool so that it can be read as a word:
-    on/off, true/false, yes/no or y/n.
+    true/false, on/off, yes/no or y/n.
 
 SourceFiles
     Switch.C
@@ -61,19 +61,28 @@ class dictionary;
 
 class Switch
 {
+private:
+
+    // Private data
+
+        //- The logic and enumerated text representation stored as a single byte
+        unsigned char switch_;
+
 public:
 
-    //- The various text representations for a switch value.
-    enum switchType
-    {
-        FALSE = 0,  TRUE  = 1,
-        OFF   = 2,  ON    = 3,
-        NO    = 4,  YES   = 5,
-        NO_1  = 6,  YES_1 = 7,
-        INVALID
-    };
+    // Public data types
+
+        //- The various text representations for a switch value.
+        //  These also correspond to the entries in names.
+        enum switchType
+        {
+            FALSE = 0,  TRUE  = 1,
+            OFF   = 2,  ON    = 3,
+            NO    = 4,  YES   = 5,
+            NO_1  = 6,  YES_1 = 7,
+            INVALID
+        };
 
-private:
 
     // Static data members
 
@@ -81,49 +90,68 @@ private:
         //  Includes an extra entry for "invalid".
         static const char* names[INVALID+1];
 
-    // Private data
 
-        //- Enumerated string representation
-        switchType switch_;
-
-        //- The boolean value
-        bool bool_;
-
-public:
-    // Private member functions
+    // Static Member Functions
 
         //- Return a switchType representation of a bool
         static switchType asEnum(const bool);
 
         //- Return a switchType representation of a word
-        static switchType asEnum(const word&, const bool ignoreError=false);
-
-        //- Return a bool representation of a word
-        static bool asBool(const word&, const bool ignoreError=false);
+        //  Optionally allow bad words, and catch the error elsewhere
+        static switchType asEnum
+        (
+            const std::string&,
+            const bool allowInvalid=false
+        );
 
         //- Return a bool representation of a switchType
-        static bool asBool(const switchType&);
+        static bool asBool(const switchType);
 
-        //- Return a word representation of a bool value
-        static word asWord(const bool);
+        //- Return a bool representation of a word
+        //  Optionally allow bad words, and catch the error elsewhere
+        static bool asBool
+        (
+            const std::string&,
+            const bool allowInvalid=false
+        );
+
+        //- Return a text representation of a bool value
+        static const char* asText(const bool);
+
+        //- Return a text representation of a switchType
+        static const char* asText(const switchType);
 
-        //- Return a word representation of a switchType
-        static word asWord(const switchType&);
 
     // Constructors
 
+        //- Construct null as false
+        Switch()
+        :
+            switch_(Switch::FALSE)
+        {}
+
         //- Construct from bool
         Switch(const bool value)
         :
-            switch_(asEnum(value)),
-            bool_(value)
+            switch_(asEnum(value))
         {}
 
-        //- Construct from word
-        Switch(const word& value)
+        //- Construct from integer values (treats integer as bool value)
+        Switch(const int value)
         :
-            switch_(asEnum(value)),
-            bool_(asBool(switch_))
+            switch_(asEnum(bool(value)))
+        {}
+
+        //- Construct from std::string, string, word
+        Switch(const std::string& value)
+        :
+            switch_(asEnum(value))
+        {}
+
+        //- Construct from character array
+        Switch(const char* value)
+        :
+            switch_(asEnum(std::string(value)))
         {}
 
         //- Construct from Istream
@@ -141,23 +169,17 @@ public:
 
     // Member Operators
 
-        Switch& operator=(const Switch& rhs)
-        {
-            switch_ = rhs.switch_;
-            bool_   = rhs.bool_;
-
-            return *this;
-        }
-
+        //- Conversion to bool
         operator bool() const
         {
-            return bool_;
+            return (switch_ & 0x1);
         }
 
-//         operator const word&() const
-//         {
-//             return asWord(switch_);
-//         }
+        //- Assignment from bool
+        void operator=(const bool b)
+        {
+            switch_ = (b ? Switch::TRUE : Switch::FALSE);
+        }
 
 
     // Member fuctions
diff --git a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
index 5894c8c5c7..d1c43ee858 100644
--- a/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
+++ b/src/OpenFOAM/primitives/bools/Switch/SwitchIO.C
@@ -39,11 +39,49 @@ Foam::Switch::Switch(Istream& is)
 
 Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
 {
-    word w(is);
+    token t(is);
 
-    s.switch_ = Switch::asEnum(w);
-    s.bool_   = Switch::asBool(s.switch_);
+    if (!t.good())
+    {
+        is.setBad();
+        return is;
+    }
 
+    if (t.isLabel())
+    {
+        s.switch_ = Switch::asEnum(bool(t.labelToken()));
+    }
+    else if (t.isWord())
+    {
+        // allow invalid values, but catch after for correct error message
+        Switch::switchType sw = Switch::asEnum(t.wordToken(), true);
+
+        if (sw == Switch::INVALID)
+        {
+            is.setBad();
+            FatalIOErrorIn("operator>>(Istream&, Switch&)", is)
+                << "expected 'true/false', 'on/off' ... found " << t.wordToken()
+                << exit(FatalIOError);
+
+            return is;
+        }
+        else
+        {
+            s.switch_ = sw;
+        }
+    }
+    else
+    {
+        is.setBad();
+        FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
+            << "wrong token type - expected bool found " << t
+            << exit(FatalIOError);
+
+        return is;
+    }
+
+
+    // Check state of Istream
     is.check("Istream& operator>>(Istream&, Switch&)");
 
     return is;
@@ -52,7 +90,7 @@ Foam::Istream& Foam::operator>>(Istream& is, Switch& s)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const Switch& s)
 {
-    os  << Switch::names[s.switch_];
+    os << Switch::names[s.switch_];
     os.check("Ostream& operator<<(Ostream&, const Switch&)");
     return os;
 }
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.C b/src/OpenFOAM/primitives/bools/bool/bool.C
index 4fb5284271..9848e9983c 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.C
+++ b/src/OpenFOAM/primitives/bools/bool/bool.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
-
 \*---------------------------------------------------------------------------*/
 
 #include "bool.H"
@@ -32,8 +29,8 @@ Description
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 const char* const Foam::pTraits<bool>::typeName = "bool";
-const bool Foam::pTraits<bool>::zero = 0;
-const bool Foam::pTraits<bool>::one = 1;
+const bool Foam::pTraits<bool>::zero(false);
+const bool Foam::pTraits<bool>::one(true);
 
 const char* Foam::pTraits<bool>::componentNames[] = { "x" };
 
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index 3538d94239..73b0701e0a 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -77,7 +77,7 @@ public:
         enum
         {
             dim = 3,         // Dimensionality of space
-            rank = 0,        // Rank od bool is 0
+            rank = 0,        // Rank of bool is 0
             nComponents = 1  // Number of components in bool is 1
         };
 
@@ -91,7 +91,7 @@ public:
     // Constructors
 
         //- Construct from Istream
-        pTraits(Istream& is);
+        pTraits(Istream&);
 
     // Member Functions
 
diff --git a/src/OpenFOAM/primitives/bools/bool/boolIO.C b/src/OpenFOAM/primitives/bools/bool/boolIO.C
index b5636b5890..a78cfbb7b8 100644
--- a/src/OpenFOAM/primitives/bools/bool/boolIO.C
+++ b/src/OpenFOAM/primitives/bools/bool/boolIO.C
@@ -32,12 +32,25 @@ Description
 #include "error.H"
 
 #include "bool.H"
+#include "Switch.H"
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>(Istream& is, bool& b)
 {
+    // we could also process everything via Switch
+    // The error messages are the problem: they are from SwitchIO.C
+//    Switch sw(is);
+//
+//    if (is.good())
+//    {
+//        b = sw;
+//    }
+//
+//    return is;
+//
+//
     token t(is);
 
     if (!t.good())
@@ -52,29 +65,27 @@ Foam::Istream& Foam::operator>>(Istream& is, bool& b)
     }
     else if (t.isWord())
     {
-        // use Switch asBool() here?
-        if (t.wordToken() == "true" || t.wordToken() == "on")
-        {
-            b = true;
-        }
-        else if (t.wordToken() == "false" || t.wordToken() == "off")
-        {
-            b = false;
-        }
-        else
+        // allow invalid values, but catch after for correct error message
+        Switch::switchType sw = Switch::asEnum(t.wordToken(), true);
+
+        if (sw == Switch::INVALID)
         {
             is.setBad();
             FatalIOErrorIn("operator>>(Istream&, bool&)", is)
-                << "expected 'true' or 'false', found " << t.wordToken()
+                << "expected 'true/false', 'on/off', found " << t.wordToken()
                 << exit(FatalIOError);
 
             return is;
         }
+        else
+        {
+            b = Switch::asBool(sw);
+        }
     }
     else
     {
         is.setBad();
-        FatalIOErrorIn("operator>>(Istream&, bool&)", is)
+        FatalIOErrorIn("operator>>(Istream&, bool/Switch&)", is)
             << "wrong token type - expected bool found " << t
             << exit(FatalIOError);
 
@@ -82,7 +93,6 @@ Foam::Istream& Foam::operator>>(Istream& is, bool& b)
     }
 
 
-
     // Check state of Istream
     is.check("Istream& operator>>(Istream&, bool&)");
 
@@ -92,18 +102,21 @@ Foam::Istream& Foam::operator>>(Istream& is, bool& b)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const bool b)
 {
+    // we could also write as text string without any difficulty
+    // os << Switch::asText(b);
     os.write(label(b));
-    os.check("Ostream& operator<<(Ostream&, const bool&)");
+    os.check("Ostream& operator<<(Ostream&, const bool)");
     return os;
 }
 
 
 bool Foam::readBool(Istream& is)
 {
-    bool b;
-    is >> b;
+    bool val;
+    is >> val;
 
-    return b;
+    return val;
 }
 
+
 // ************************************************************************* //

From a83961a02a6e5445cb57e363f5e5c1b1773df815 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Jan 2009 22:08:24 +0100
Subject: [PATCH 10/32] coordinate system cleanup

- coordinateSystem, cylindricalCS, sphericalCS:
  get copy with name constructor

- cylindricalCS, sphericalCS:
  can switch off default degrees

- dropped cartesianCS class (already covered by coordinateSystem) and just
  always use coordinateSystem directly.
  The dictionary runtime selection still accepts type "cartesian" as an alias,
  to provide the least surprises.

- dropped runtime selection based on origin/axis/direction (not used), but
  left runtime selection based on origin/coordinateRotation as still being
  potentially useful.
---
 .../timeVaryingMappedFixedValueFvPatchField.C |  13 +-
 .../timeVaryingMappedFixedValueFvPatchField.H |   2 +-
 src/meshTools/Make/files                      |   7 +-
 src/meshTools/coordinateSystems/cartesianCS.C |  81 -----------
 src/meshTools/coordinateSystems/cartesianCS.H |  98 -------------
 .../EulerCoordinateRotation.C                 |   4 +-
 .../STARCDCoordinateRotation.C                |   4 +-
 .../coordinateRotation/coordinateRotation.H   |  11 +-
 .../coordinateSystems/coordinateSystem.C      |  34 +++--
 .../coordinateSystems/coordinateSystem.H      |  79 ++++-------
 ...ordinateSystem.C => coordinateSystemNew.C} | 121 ++++++----------
 .../coordinateSystems/coordinateSystems.C     |   1 +
 .../coordinateSystems/cylindricalCS.C         | 113 +++++++++++----
 .../coordinateSystems/cylindricalCS.H         |  55 ++++++--
 .../parabolicCylindricalCS.C                  |  13 +-
 .../parabolicCylindricalCS.H                  |  16 +--
 src/meshTools/coordinateSystems/sphericalCS.C | 129 +++++++++++++-----
 src/meshTools/coordinateSystems/sphericalCS.H |  55 ++++++--
 src/meshTools/coordinateSystems/toroidalCS.C  |  13 --
 src/meshTools/coordinateSystems/toroidalCS.H  |  18 +--
 20 files changed, 395 insertions(+), 472 deletions(-)
 delete mode 100644 src/meshTools/coordinateSystems/cartesianCS.C
 delete mode 100644 src/meshTools/coordinateSystems/cartesianCS.H
 rename src/meshTools/coordinateSystems/{newCoordinateSystem.C => coordinateSystemNew.C} (72%)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index d29b694aca..b1afef7b88 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -28,7 +28,6 @@ License
 #include "Time.H"
 #include "triSurfaceTools.H"
 #include "triSurface.H"
-#include "cartesianCS.H"
 #include "vector2D.H"
 #include "OFstream.H"
 #include "long.H"
@@ -348,12 +347,12 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()
 
     referenceCS_.reset
     (
-        new cartesianCS
+        new coordinateSystem
         (
             "reference",
-            p0,             // origin
-            n,              // normal
-            e1              // 0-axis
+            p0,  // origin
+            n,   // normal
+            e1   // 0-axis
         )
     );
 
@@ -397,7 +396,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::readSamplePoints()
             str<< "v " << p.x() << ' ' << p.y() << ' ' << p.z() << nl;
         }
     }
-    
+
     // Determine interpolation onto face centres.
     triSurfaceTools::calcInterpolationWeights
     (
@@ -721,7 +720,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
     {
         const Field<Type>& fld = *this;
 
-        Type averagePsi = 
+        Type averagePsi =
             gSum(this->patch().magSf()*fld)
            /gSum(this->patch().magSf());
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
index 921b39ac19..31b88ae03a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.H
@@ -107,7 +107,7 @@ class timeVaryingMappedFixedValueFvPatchField
             label& lo,
             label& hi
         ) const;
-        
+
         //- Read boundary points and determine interpolation weights to patch
         //  faceCentres
         void readSamplePoints();
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 86d1fe3ddb..1d67c48877 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -10,13 +10,12 @@ cellDist/wallPoint/wallPoint.C
 cellFeatures/cellFeatures.C
 
 coordinateSystems/coordinateSystem.C
+coordinateSystems/coordinateSystemNew.C
 coordinateSystems/coordinateSystems.C
-coordinateSystems/parabolicCylindricalCS.C
-coordinateSystems/toroidalCS.C
-coordinateSystems/cartesianCS.C
-coordinateSystems/newCoordinateSystem.C
 coordinateSystems/cylindricalCS.C
 coordinateSystems/sphericalCS.C
+coordinateSystems/parabolicCylindricalCS.C
+coordinateSystems/toroidalCS.C
 coordinateSystems/coordinateRotation/coordinateRotation.C
 coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
 coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
diff --git a/src/meshTools/coordinateSystems/cartesianCS.C b/src/meshTools/coordinateSystems/cartesianCS.C
deleted file mode 100644
index 30f1179baa..0000000000
--- a/src/meshTools/coordinateSystems/cartesianCS.C
+++ /dev/null
@@ -1,81 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "cartesianCS.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(cartesianCS, 0);
-    addToRunTimeSelectionTable(coordinateSystem, cartesianCS, origAxisDir);
-    addToRunTimeSelectionTable(coordinateSystem, cartesianCS, origRotation);
-    addToRunTimeSelectionTable(coordinateSystem, cartesianCS, dictionary);
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::cartesianCS::cartesianCS()
-:
-    coordinateSystem()
-{}
-
-
-Foam::cartesianCS::cartesianCS
-(
-    const word& name,
-    const point& origin,
-    const vector& axis,
-    const vector& dir
-)
-:
-    coordinateSystem(name, origin, axis, dir)
-{}
-
-
-Foam::cartesianCS::cartesianCS
-(
-    const word& name,
-    const point& origin,
-    const coordinateRotation& cr
-)
-:
-    coordinateSystem(name, origin, cr)
-{}
-
-
-Foam::cartesianCS::cartesianCS
-(
-    const word& name,
-    const dictionary& dict
-)
-:
-    coordinateSystem(name, dict)
-{}
-
-// ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/cartesianCS.H b/src/meshTools/coordinateSystems/cartesianCS.H
deleted file mode 100644
index c46292af0b..0000000000
--- a/src/meshTools/coordinateSystems/cartesianCS.H
+++ /dev/null
@@ -1,98 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::cartesianCS
-
-Description
-    General coordinate transformations from arbitrary coordinate systems
-    to the global Cartesian system
-
-SourceFiles
-    cartesianCS.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cartesianCS_H
-#define cartesianCS_H
-
-#include "coordinateSystem.H"
-#include "typeInfo.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class cartesianCS Declaration
-\*---------------------------------------------------------------------------*/
-
-class cartesianCS
-:
-    public coordinateSystem
-{
-public:
-
-    //- Runtime type information
-    TypeName("cartesian");
-
-
-    // Constructors
-
-        //- Construct null
-        cartesianCS();
-
-        //- Construct from origin and 2 axes
-        cartesianCS
-        (
-            const word& name,
-            const point& origin,
-            const vector& axis,
-            const vector& dir
-        );
-
-        //- Construct from origin and rotation
-        cartesianCS
-        (
-            const word& name,
-            const point& origin,
-            const coordinateRotation&
-        );
-
-        //- Construct from dictionary
-        cartesianCS(const word& name, const dictionary&);
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
index f088abdc70..963d5084db 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C
@@ -25,10 +25,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "EulerCoordinateRotation.H"
-#include "dictionary.H"
-#include "addToRunTimeSelectionTable.H"
+
 #include "Switch.H"
 #include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
index 697b4e7f02..168a25ef79 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C
@@ -25,10 +25,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "STARCDCoordinateRotation.H"
-#include "dictionary.H"
-#include "addToRunTimeSelectionTable.H"
+
 #include "Switch.H"
 #include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
index 227bd38ac3..429d6ef8ef 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
@@ -73,6 +73,7 @@ Deprecated
 
 #include "vector.H"
 #include "tensor.H"
+#include "dictionary.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -80,8 +81,6 @@ Deprecated
 namespace Foam
 {
 
-class dictionary;
-
 /*---------------------------------------------------------------------------*\
                     Class coordinateRotation Declaration
 \*---------------------------------------------------------------------------*/
@@ -93,7 +92,8 @@ class coordinateRotation
     // Private data
 
         //- the combination of local axes to be used
-        enum axisOrder {
+        enum axisOrder
+        {
             e1e2,
             e2e3,
             e3e1
@@ -129,6 +129,11 @@ public:
         //- Construct from dictionary
         coordinateRotation(const dictionary&);
 
+        //- Return clone
+        autoPtr<coordinateRotation> clone() const
+        {
+            return autoPtr<coordinateRotation>(new coordinateRotation(*this));
+        }
 
     // Declare run-time constructor selection table
 
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index 8e28c23c60..80232ffd8d 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -34,9 +34,8 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(coordinateSystem, 0);
-    defineRunTimeSelectionTable(coordinateSystem, origAxisDir);
-    defineRunTimeSelectionTable(coordinateSystem, origRotation);
     defineRunTimeSelectionTable(coordinateSystem, dictionary);
+    defineRunTimeSelectionTable(coordinateSystem, origRotation);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -54,16 +53,14 @@ Foam::coordinateSystem::coordinateSystem()
 Foam::coordinateSystem::coordinateSystem
 (
     const word& name,
-    const point& origin,
-    const vector& axis,
-    const vector& dir
+    const coordinateSystem& cs
 )
 :
     name_(name),
     note_(),
-    origin_(origin),
-    R_(axis, dir),
-    Rtr_(R_.T())
+    origin_(cs.origin_),
+    R_(cs.R_),
+    Rtr_(Rtr_)
 {}
 
 
@@ -82,6 +79,22 @@ Foam::coordinateSystem::coordinateSystem
 {}
 
 
+Foam::coordinateSystem::coordinateSystem
+(
+    const word& name,
+    const point& origin,
+    const vector& axis,
+    const vector& dirn
+)
+:
+    name_(name),
+    note_(),
+    origin_(origin),
+    R_(axis, dirn),
+    Rtr_(R_.T())
+{}
+
+
 Foam::coordinateSystem::coordinateSystem
 (
     const word& name,
@@ -348,10 +361,7 @@ void Foam::coordinateSystem::operator=(const dictionary& rhs)
     // specify via coordinateRotation sub-dictionary
     if (dict.found("coordinateRotation"))
     {
-        autoPtr<coordinateRotation> cr =
-            coordinateRotation::New(dict.subDict("coordinateRotation"));
-
-        R_  = cr();
+        R_  = coordinateRotation::New(dict.subDict("coordinateRotation"))();
     }
     else
     {
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index 6492f2b9ec..5bff54e523 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.H
@@ -27,7 +27,7 @@ Class
 
 Description
     A cartesian coordinate system and the base class for other coordinate
-    system specifications
+    system specifications.
 
     All systems are defined by an origin point and a coordinateRotation.
     For convenience, the dictionary constructor forms allow a few shortcuts:
@@ -38,7 +38,6 @@ Description
     @verbatim
         flipped
         {
-            type    cartesian;
             origin  (0 0 0);
             coordinateRotation
             {
@@ -54,7 +53,6 @@ Description
     @verbatim
         flipped     // the same, specified as axes
         {
-            type    cartesian;
             origin  (0 0 0);
             coordinateRotation
             {
@@ -71,7 +69,7 @@ Description
     @endverbatim
 
     - if a sub-dictionary coordinateSystem is found within the dictionary, it
-      will be used. This provides a convenient means of embedding the
+      will be used. This provides a convenient means of embedding
       coordinateSystem information in another dictionary.
       This is used, for example, in the porousZones:
 
@@ -101,6 +99,7 @@ Description
 
     - additionally, if the coordinateSystem points to a plain entry,
       it can be used to reference one of the global coordinateSystems
+
     @verbatim
         1
         (
@@ -206,21 +205,28 @@ public:
         //- Construct null. This is equivalent to an identity coordinateSystem
         coordinateSystem();
 
+        //- Construct copy with a different name
+        coordinateSystem
+        (
+            const word& name,
+            const coordinateSystem&
+        );
+
+        //- Construct from origin and rotation
+        coordinateSystem
+        (
+            const word& name,
+            const point& origin,
+            const coordinateRotation&
+        );
+
         //- Construct from origin and 2 axes
         coordinateSystem
         (
             const word& name,
             const point& origin,
             const vector& axis,
-            const vector& dir
-        );
-
-        //- Construct from origin and rotation angles
-        coordinateSystem
-        (
-            const word& name,
-            const point& origin,
-            const coordinateRotation&
+            const vector& dirn
         );
 
         //- Construct from dictionary with a given name
@@ -240,15 +246,7 @@ public:
         //- Return clone
         autoPtr<coordinateSystem> clone() const
         {
-            return autoPtr<coordinateSystem>
-            (
-                new coordinateSystem
-                (
-                    name(),
-                    origin(),
-                    rotation()
-                )
-            );
+            return autoPtr<coordinateSystem>(new coordinateSystem(*this));
         }
 
     // Declare run-time constructor selection table
@@ -257,14 +255,12 @@ public:
         (
             autoPtr,
             coordinateSystem,
-            origAxisDir,
+            dictionary,
             (
                 const word& name,
-                const point& origin,
-                const vector& axis,
-                const vector& dir
+                const dictionary& dict
             ),
-            (name, origin, axis, dir)
+            (name, dict)
         );
 
         declareRunTimeSelectionTable
@@ -280,29 +276,13 @@ public:
             (name, origin, cr)
         );
 
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            coordinateSystem,
-            dictionary,
-            (
-                const word& name,
-                const dictionary& dict
-            ),
-            (name, dict)
-        );
-
-
     // Selectors
 
-        //- Select constructed from origin and 2 axes
+        //- Select constructed from dictionary
         static autoPtr<coordinateSystem> New
         (
-            const word& coordType,
             const word& name,
-            const point& origin,
-            const vector& axis,
-            const vector& dir
+            const dictionary&
         );
 
         //- Select constructed from origin and rotation
@@ -314,13 +294,6 @@ public:
             const coordinateRotation&
         );
 
-        //- Select constructed from dictionary
-        static autoPtr<coordinateSystem> New
-        (
-            const word& name,
-            const dictionary&
-        );
-
         //- Select constructed from Istream
         static autoPtr<coordinateSystem> New(Istream& is);
 
@@ -490,7 +463,7 @@ public:
 
         friend bool operator!=
         (
-            const coordinateSystem&, 
+            const coordinateSystem&,
             const coordinateSystem&
         );
 
diff --git a/src/meshTools/coordinateSystems/newCoordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
similarity index 72%
rename from src/meshTools/coordinateSystems/newCoordinateSystem.C
rename to src/meshTools/coordinateSystems/coordinateSystemNew.C
index 7c5e5d92ca..9a6ec2a0b4 100644
--- a/src/meshTools/coordinateSystems/newCoordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -29,79 +29,6 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
-(
-    const word& coordType,
-    const word& name,
-    const point& origin,
-    const vector& axis,
-    const vector& dir
-)
-{
-    if (debug)
-    {
-        Pout<< "coordinateSystem::New(const word&, const word&, "
-            << "const vector&, const vector&, const vector&) : "
-               "constructing coordinateSystem"
-            << endl;
-    }
-
-    origAxisDirConstructorTable::iterator cstrIter =
-        origAxisDirConstructorTablePtr_->find(coordType);
-
-    if (cstrIter == origAxisDirConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "coordinateSystem::New(const word&, const word&, "
-            "const vector&, const vector&, const vector&) : "
-            "constructing coordinateSystem"
-        )   << "Unknown coordinateSystem type " << coordType << nl << nl
-            << "Valid coordinateSystem types are :" << nl
-            << origAxisDirConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<coordinateSystem>(cstrIter()(name, origin, axis, dir));
-}
-
-
-Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
-(
-    const word& coordType,
-    const word& name,
-    const point& origin,
-    const coordinateRotation& cr
-)
-{
-    if (debug)
-    {
-        Pout<< "coordinateSystem::New(const word&, const word&, "
-            << "const vector&, const coordinateRotation&) : "
-               "constructing coordinateSystem"
-            << endl;
-    }
-
-    origRotationConstructorTable::iterator cstrIter =
-        origRotationConstructorTablePtr_->find(coordType);
-
-    if (cstrIter == origRotationConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "coordinateSystem::New(const word&, const word&, "
-            "const vector&, const coordinateRotation&) : "
-            "constructing coordinateSystem"
-        )   << "Unknown coordinateSystem type " << coordType << nl << nl
-            << "Valid coordinateSystem types are :" << nl
-            << origRotationConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<coordinateSystem>(cstrIter()(name, origin, cr));
-}
-
-
 Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 (
     const word& name,
@@ -115,12 +42,14 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
             << endl;
     }
 
-    // default type is self
+    // construct base class directly, also allow 'cartesian' as an alias
     word coordType(typeName_());
-    dict.readIfPresent("type", coordType);
-
-    // can (must) construct base class directly
-    if (coordType == typeName_())
+    if
+    (
+        !dict.readIfPresent("type", coordType)
+     || coordType == typeName_()
+     || coordType == "cartesian"
+    )
     {
         return autoPtr<coordinateSystem>(new coordinateSystem(name, dict));
     }
@@ -145,6 +74,42 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 }
 
 
+Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
+(
+    const word& coordType,
+    const word& name,
+    const point& origin,
+    const coordinateRotation& cr
+)
+{
+    if (debug)
+    {
+        Pout<< "coordinateSystem::New(const word&, const word&, "
+            << "const point&, const coordinateRotation&) : "
+               "constructing coordinateSystem"
+            << endl;
+    }
+
+    origRotationConstructorTable::iterator cstrIter =
+        origRotationConstructorTablePtr_->find(coordType);
+
+    if (cstrIter == origRotationConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "coordinateSystem::New(const word&, const word&, "
+            "const point&, const coordinateRotation&) : "
+            "constructing coordinateSystem"
+        )   << "Unknown coordinateSystem type " << coordType << nl << nl
+            << "Valid coordinateSystem types are :" << nl
+            << origRotationConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<coordinateSystem>(cstrIter()(name, origin, cr));
+}
+
+
 Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 (
     Istream& is
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.C b/src/meshTools/coordinateSystems/coordinateSystems.C
index 548f456672..eb54637951 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.C
+++ b/src/meshTools/coordinateSystems/coordinateSystems.C
@@ -146,4 +146,5 @@ bool Foam::coordinateSystems::writeData(Ostream& os, bool subDict) const
     return os.good();
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.C b/src/meshTools/coordinateSystems/cylindricalCS.C
index 6b817f5aa9..33a7455cc2 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.C
+++ b/src/meshTools/coordinateSystems/cylindricalCS.C
@@ -25,25 +25,64 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cylindricalCS.H"
-#include "addToRunTimeSelectionTable.H"
+
+#include "one.H"
+#include "Switch.H"
 #include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
     defineTypeNameAndDebug(cylindricalCS, 0);
-    addToRunTimeSelectionTable(coordinateSystem, cylindricalCS, origAxisDir);
-    addToRunTimeSelectionTable(coordinateSystem, cylindricalCS, origRotation);
     addToRunTimeSelectionTable(coordinateSystem, cylindricalCS, dictionary);
+    addToRunTimeSelectionTable(coordinateSystem, cylindricalCS, origRotation);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cylindricalCS::cylindricalCS()
+Foam::cylindricalCS::cylindricalCS(const bool inDegrees)
 :
-    coordinateSystem()
+    coordinateSystem(),
+    inDegrees_(inDegrees)
+{}
+
+
+Foam::cylindricalCS::cylindricalCS
+(
+    const coordinateSystem& cs,
+    const bool inDegrees
+)
+:
+    coordinateSystem(cs),
+    inDegrees_(inDegrees)
+{}
+
+
+Foam::cylindricalCS::cylindricalCS
+(
+    const word& name,
+    const coordinateSystem& cs,
+    const bool inDegrees
+)
+:
+    coordinateSystem(name, cs),
+    inDegrees_(inDegrees)
+{}
+
+
+Foam::cylindricalCS::cylindricalCS
+(
+    const word& name,
+    const point& origin,
+    const coordinateRotation& cr,
+    const bool inDegrees
+)
+:
+    coordinateSystem(name, origin, cr),
+    inDegrees_(inDegrees)
 {}
 
 
@@ -52,21 +91,12 @@ Foam::cylindricalCS::cylindricalCS
     const word& name,
     const point& origin,
     const vector& axis,
-    const vector& direction
+    const vector& dirn,
+    const bool inDegrees
 )
 :
-    coordinateSystem(name, origin, axis, direction)
-{}
-
-
-Foam::cylindricalCS::cylindricalCS
-(
-    const word& name,
-    const point& origin,
-    const coordinateRotation& cr
-)
-:
-    coordinateSystem(name, origin, cr)
+    coordinateSystem(name, origin, axis, dirn),
+    inDegrees_(inDegrees)
 {}
 
 
@@ -76,20 +106,35 @@ Foam::cylindricalCS::cylindricalCS
     const dictionary& dict
 )
 :
-    coordinateSystem(name, dict)
+    coordinateSystem(name, dict),
+    inDegrees_(dict.lookupOrDefault<Switch>("degrees", true))
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+bool Foam::cylindricalCS::inDegrees() const
+{
+    return inDegrees_;
+}
+
+
+bool& Foam::cylindricalCS::inDegrees()
+{
+    return inDegrees_;
+}
+
+
 Foam::vector Foam::cylindricalCS::localToGlobal
 (
     const vector& local,
     bool translate
 ) const
 {
-    scalar theta =
-        local.y()*mathematicalConstant::pi/180.0;
+    scalar theta
+    (
+        local.y() * ( inDegrees_ ? mathematicalConstant::pi/180.0 : 1.0 )  
+    );
 
     return coordinateSystem::localToGlobal
     (
@@ -98,6 +143,7 @@ Foam::vector Foam::cylindricalCS::localToGlobal
     );
 }
 
+
 Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
 (
     const vectorField& local,
@@ -105,7 +151,11 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
 ) const
 {
     scalarField theta =
-        local.component(vector::Y)*mathematicalConstant::pi/180.0;
+    (
+        local.component(vector::Y)
+      * ( inDegrees_ ? mathematicalConstant::pi/180.0 : 1.0 )
+    );
+
 
     vectorField lc(local.size());
     lc.replace(vector::X, local.component(vector::X)*cos(theta));
@@ -115,23 +165,28 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
     return coordinateSystem::localToGlobal(lc, translate);
 }
 
+
 Foam::vector Foam::cylindricalCS::globalToLocal
 (
     const vector& global,
     bool translate
 ) const
 {
-    const vector lc =
-        coordinateSystem::globalToLocal(global, translate);
+    const vector lc = coordinateSystem::globalToLocal(global, translate);
 
     return vector
     (
         sqrt(sqr(lc.x()) + sqr(lc.y())),
-        atan2(lc.y(),lc.x())*180.0/mathematicalConstant::pi,
+        atan2
+        (
+            lc.y(),
+            lc.x()
+        ) * ( inDegrees_ ? 180.0/mathematicalConstant::pi : 1.0 ),
         lc.z()
     );
 }
 
+
 Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
 (
     const vectorField& global,
@@ -153,8 +208,11 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
     result.replace
     (
         vector::Y,
-        atan2(lc.component(vector::Y), lc.component(vector::X))*
-        180.0/mathematicalConstant::pi
+        atan2
+        (
+            lc.component(vector::Y),
+            lc.component(vector::X)
+        ) * ( inDegrees_ ? 180.0/mathematicalConstant::pi : 1.0 )
     );
 
     result.replace(vector::Z, lc.component(vector::Z));
@@ -162,4 +220,5 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
     return tresult;
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.H b/src/meshTools/coordinateSystems/cylindricalCS.H
index 2e8018b1f9..e41f263a7e 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.H
+++ b/src/meshTools/coordinateSystems/cylindricalCS.H
@@ -45,13 +45,18 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class cylindricalCS Declaration
+                        Class cylindricalCS Declaration
 \*---------------------------------------------------------------------------*/
 
 class cylindricalCS
 :
     public coordinateSystem
 {
+    // Private data members
+
+        //- Are angles in degrees? (default = true)
+        bool inDegrees_;
+
 
 protected:
 
@@ -90,28 +95,54 @@ public:
     // Constructors
 
         //- Construct null
-        cylindricalCS();
+        cylindricalCS(const bool inDegrees=true);
 
-        //- Construct from components
+        //- Construct copy
+        cylindricalCS
+        (
+            const coordinateSystem&,
+            const bool inDegrees=true
+        );
+
+        //- Construct copy with a different name
+        cylindricalCS
+        (
+            const word& name,
+            const coordinateSystem&,
+            const bool inDegrees=true
+        );
+
+        //- Construct from origin and rotation
+        cylindricalCS
+        (
+            const word& name,
+            const point& origin,
+            const coordinateRotation&,
+            const bool inDegrees=true
+        );
+
+        //- Construct from origin and 2 axes
         cylindricalCS
         (
             const word& name,
             const point& origin,
             const vector& axis,
-            const vector& direction
-        );
-
-        //- Construct from origin and rotation angles
-        cylindricalCS
-        (
-            const word& name,
-            const point& origin,
-            const coordinateRotation&
+            const vector& dirn,
+            const bool inDegrees=true
         );
 
         //- Construct from dictionary
         cylindricalCS(const word& name, const dictionary&);
 
+
+    // Member Functions
+
+        //- Are angles in degrees?
+        bool  inDegrees() const;
+
+        //- Non-const access to inDegrees
+        bool& inDegrees();
+
 };
 
 
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
index 2bae21e186..f2e83108ac 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
@@ -40,6 +40,7 @@ namespace Foam
     );
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::parabolicCylindricalCS::parabolicCylindricalCS()
@@ -48,18 +49,6 @@ Foam::parabolicCylindricalCS::parabolicCylindricalCS()
 {}
 
 
-Foam::parabolicCylindricalCS::parabolicCylindricalCS
-(
-    const word& name,
-    const point& origin,
-    const vector& axis,
-    const vector& direction
-)
-:
-    coordinateSystem(name, origin, axis, direction)
-{}
-
-
 Foam::parabolicCylindricalCS::parabolicCylindricalCS
 (
     const word& name,
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
index 0650a0989c..d5fb5ccec3 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
@@ -30,6 +30,9 @@ Description
 
     Notation: u = a.x() v = a.y() z = a.z();
 
+Note
+    The maintenance of this class may lag that of the main types.
+
 SourceFiles
     parabolicCylindricalCS.C
 
@@ -46,7 +49,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class parabolicCylindricalCS Declaration
+                   Class parabolicCylindricalCS Declaration
 \*---------------------------------------------------------------------------*/
 
 class parabolicCylindricalCS
@@ -93,16 +96,7 @@ public:
         //- Construct null
         parabolicCylindricalCS();
 
-        //- Construct from components
-        parabolicCylindricalCS
-        (
-            const word& name,
-            const point& origin,
-            const vector& axis,
-            const vector& direction
-        );
-
-        //- Construct from origin and rotation angles
+        //- Construct from origin and rotation
         parabolicCylindricalCS
         (
             const word& name,
diff --git a/src/meshTools/coordinateSystems/sphericalCS.C b/src/meshTools/coordinateSystems/sphericalCS.C
index b7e2934cfd..0e3f2663e5 100644
--- a/src/meshTools/coordinateSystems/sphericalCS.C
+++ b/src/meshTools/coordinateSystems/sphericalCS.C
@@ -25,24 +25,64 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "sphericalCS.H"
-#include "addToRunTimeSelectionTable.H"
+
+#include "one.H"
+#include "Switch.H"
 #include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
     defineTypeNameAndDebug(sphericalCS, 0);
-    addToRunTimeSelectionTable(coordinateSystem, sphericalCS, origAxisDir);
-    addToRunTimeSelectionTable(coordinateSystem, sphericalCS, origRotation);
     addToRunTimeSelectionTable(coordinateSystem, sphericalCS, dictionary);
+    addToRunTimeSelectionTable(coordinateSystem, sphericalCS, origRotation);
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::sphericalCS::sphericalCS()
+Foam::sphericalCS::sphericalCS(const bool inDegrees)
 :
-    coordinateSystem()
+    coordinateSystem(),
+    inDegrees_(inDegrees)
+{}
+
+
+Foam::sphericalCS::sphericalCS
+(
+    const coordinateSystem& cs,
+    const bool inDegrees
+)
+:
+    coordinateSystem(cs),
+    inDegrees_(inDegrees)
+{}
+
+
+Foam::sphericalCS::sphericalCS
+(
+    const word& name,
+    const coordinateSystem& cs,
+    const bool inDegrees
+)
+:
+    coordinateSystem(name, cs),
+    inDegrees_(inDegrees)
+{}
+
+
+Foam::sphericalCS::sphericalCS
+(
+    const word& name,
+    const point& origin,
+    const coordinateRotation& cr,
+    const bool inDegrees
+)
+:
+    coordinateSystem(name, origin, cr),
+    inDegrees_(inDegrees)
 {}
 
 
@@ -51,21 +91,12 @@ Foam::sphericalCS::sphericalCS
     const word& name,
     const point& origin,
     const vector& axis,
-    const vector& direction
+    const vector& dirn,
+    const bool inDegrees
 )
 :
-    coordinateSystem(name, origin, axis, direction)
-{}
-
-
-Foam::sphericalCS::sphericalCS
-(
-    const word& name,
-    const point& origin,
-    const coordinateRotation& cr
-)
-:
-    coordinateSystem(name, origin, cr)
+    coordinateSystem(name, origin, axis, dirn),
+    inDegrees_(inDegrees)
 {}
 
 
@@ -75,11 +106,25 @@ Foam::sphericalCS::sphericalCS
     const dictionary& dict
 )
 :
-    coordinateSystem(name, dict)
+    coordinateSystem(name, dict),
+    inDegrees_(dict.lookupOrDefault<Switch>("degrees", true))
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::sphericalCS::inDegrees() const
+{
+    return inDegrees_;
+}
+
+
+bool& Foam::sphericalCS::inDegrees()
+{
+    return inDegrees_;
+}
+
+
 Foam::vector Foam::sphericalCS::localToGlobal
 (
     const vector& local,
@@ -87,8 +132,16 @@ Foam::vector Foam::sphericalCS::localToGlobal
 ) const
 {
     scalar r = local.x();
-    scalar theta = local.y()*mathematicalConstant::pi/180.0;
-    scalar phi = local.z()*mathematicalConstant::pi/180.0;
+    const scalar theta
+    (
+        local.y()
+      * ( inDegrees_ ? mathematicalConstant::pi/180.0 : 1.0 )
+    );
+    const scalar phi
+    (
+        local.z()
+      * ( inDegrees_ ? mathematicalConstant::pi/180.0 : 1.0 )
+    );
 
     return coordinateSystem::localToGlobal
     (
@@ -105,12 +158,16 @@ Foam::tmp<Foam::vectorField> Foam::sphericalCS::localToGlobal
 ) const
 {
     const scalarField r = local.component(vector::X);
-
-    const scalarField theta =
-        local.component(vector::Y)*mathematicalConstant::pi/180.0;
-
-    const scalarField phi =
-        local.component(vector::Z)*mathematicalConstant::pi/180.0;
+    const scalarField theta
+    (
+        local.component(vector::Y)
+      * ( inDegrees_ ? mathematicalConstant::pi/180.0 : 1.0 )
+    );
+    const scalarField phi
+    (
+        local.component(vector::Z)
+      * ( inDegrees_ ? mathematicalConstant::pi/180.0 : 1.0 )
+    );
 
     vectorField lc(local.size());
     lc.replace(vector::X, r*cos(theta)*sin(phi));
@@ -133,8 +190,14 @@ Foam::vector Foam::sphericalCS::globalToLocal
     return vector
     (
         r,
-        atan2(lc.y(), lc.x())*180.0/mathematicalConstant::pi,
-        acos(lc.z()/(r + SMALL))*180.0/mathematicalConstant::pi
+        atan2
+        (
+            lc.y(), lc.x()
+        ) * ( inDegrees_ ? 180.0/mathematicalConstant::pi : 1.0 ),
+        acos
+        (
+            lc.z()/(r + SMALL)
+        ) * ( inDegrees_ ? 180.0/mathematicalConstant::pi : 1.0 )
     );
 }
 
@@ -164,16 +227,20 @@ Foam::tmp<Foam::vectorField> Foam::sphericalCS::globalToLocal
         (
             lc.component(vector::Y),
             lc.component(vector::X)
-        )*180.0/mathematicalConstant::pi
+        ) * ( inDegrees_ ? 180.0/mathematicalConstant::pi : 1.0 )
     );
 
     result.replace
     (
         vector::Z,
-        acos(lc.component(vector::Z)/(r + SMALL))*180.0/mathematicalConstant::pi
+        acos
+        (
+            lc.component(vector::Z)/(r + SMALL)
+        ) * ( inDegrees_ ? 180.0/mathematicalConstant::pi : 1.0 )
     );
 
     return tresult;
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/sphericalCS.H b/src/meshTools/coordinateSystems/sphericalCS.H
index 7640f81c1f..31d32bc9e4 100644
--- a/src/meshTools/coordinateSystems/sphericalCS.H
+++ b/src/meshTools/coordinateSystems/sphericalCS.H
@@ -44,13 +44,18 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class sphericalCS Declaration
+                         Class sphericalCS Declaration
 \*---------------------------------------------------------------------------*/
 
 class sphericalCS
 :
     public coordinateSystem
 {
+    // Private data members
+
+        //- Are angles in degrees? (default = true)
+        bool inDegrees_;
+
 
 protected:
 
@@ -89,30 +94,54 @@ public:
     // Constructors
 
         //- Construct null
-        sphericalCS();
+        sphericalCS(const bool inDegrees=true);
 
-        //- Construct from components
+        //- Construct copy
+        sphericalCS
+        (
+            const coordinateSystem&,
+            const bool inDegrees=true
+        );
+
+        //- Construct copy with a different name
+        sphericalCS
+        (
+            const word& name,
+            const coordinateSystem&,
+            const bool inDegrees=true
+        );
+
+        //- Construct from origin and rotation
+        sphericalCS
+        (
+            const word& name,
+            const point& origin,
+            const coordinateRotation&,
+            const bool inDegrees=true
+        );
+
+        //- Construct from origin and 2 axes
         sphericalCS
         (
             const word& name,
             const point& origin,
             const vector& axis,
-            const vector& direction
+            const vector& dirn,
+            const bool inDegrees=true
         );
 
-        //- Construct from origin and rotation angles
-        sphericalCS
-        (
-            const word& name,
-            const point& origin,
-            const coordinateRotation&
-        );
-
-
         //- Construct from dictionary
         sphericalCS(const word& name, const dictionary&);
 
 
+    // Member Functions
+
+        //- Are angles in degrees?
+        bool  inDegrees() const;
+
+        //- Non-const access to inDegrees
+        bool& inDegrees();
+
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinateSystems/toroidalCS.C b/src/meshTools/coordinateSystems/toroidalCS.C
index bab4a9a1e9..f098a0d18f 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.C
+++ b/src/meshTools/coordinateSystems/toroidalCS.C
@@ -38,19 +38,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::toroidalCS::toroidalCS
-(
-    const word& name,
-    const point& origin,
-    const vector& axis,
-    const vector& direction,
-    const scalar radius
-)
-:
-    coordinateSystem(name, origin, axis, direction),
-    radius_(radius)
-{}
-
 
 Foam::toroidalCS::toroidalCS
 (
diff --git a/src/meshTools/coordinateSystems/toroidalCS.H b/src/meshTools/coordinateSystems/toroidalCS.H
index 8fc538ac07..c04498dda8 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.H
+++ b/src/meshTools/coordinateSystems/toroidalCS.H
@@ -26,7 +26,10 @@ Class
     Foam::toroidalCS
 
 Description
-    Toroidal coordinate system
+    Toroidal coordinate system, always in degrees
+
+Note
+    The maintenance of this class may lag that of the main types.
 
 SourceFiles
     toroidalCS.C
@@ -91,17 +94,7 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        toroidalCS
-        (
-            const word& name,
-            const point& origin,
-            const vector& axis,
-            const vector& direction,
-            const scalar radius
-        );
-
-        //- Construct from origin and rotation angles
+        //- Construct from origin, rotation and radius
         toroidalCS
         (
             const word& name,
@@ -110,6 +103,7 @@ public:
             const scalar radius
         );
 
+
         //- Construct from dictionary
         toroidalCS(const word& name, const dictionary&);
 

From 7ab7eaa4e630a0e7bdf9c5682c9852c6e2006e38 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 19 Jan 2009 13:58:06 +0100
Subject: [PATCH 11/32] stringListOps - allow 'const char*' and 'const
 std::string&' arguments

---
 src/OpenFOAM/primitives/Lists/stringListOps.H |  9 +++-
 .../primitives/Lists/stringListOpsTemplates.C | 44 +++++++++++++------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/OpenFOAM/primitives/Lists/stringListOps.H b/src/OpenFOAM/primitives/Lists/stringListOps.H
index ac35d2afe4..253a249c3d 100644
--- a/src/OpenFOAM/primitives/Lists/stringListOps.H
+++ b/src/OpenFOAM/primitives/Lists/stringListOps.H
@@ -44,12 +44,19 @@ SourceFiles
 
 namespace Foam
 {
+    //- Return list indices for strings matching the regular expression
+    template<class StringType>
+    labelList findStrings
+    (
+        const char* regexpPattern,
+        const UList<StringType>&
+    );
 
     //- Return list indices for strings matching the regular expression
     template<class StringType>
     labelList findStrings
     (
-        const string& regexpPattern,
+        const std::string& regexpPattern,
         const UList<StringType>&
     );
 
diff --git a/src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C b/src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C
index 9ee1fa6f0a..54f624d60a 100644
--- a/src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C
+++ b/src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C
@@ -29,15 +29,11 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class StringType>
-labelList findStrings
+Foam::labelList Foam::findStrings
 (
-    const string& pattern,
+    const char* pattern,
     const UList<StringType>& lst
 )
 {
@@ -59,7 +55,31 @@ labelList findStrings
 
 
 template<class StringType>
-labelList findStrings
+Foam::labelList Foam::findStrings
+(
+    const std::string& pattern,
+    const UList<StringType>& lst
+)
+{
+    regExp re(pattern);
+    labelList matched(lst.size());
+
+    label matchI = 0;
+    forAll(lst, elemI)
+    {
+        if (re.match(lst[elemI]))
+        {
+            matched[matchI++] = elemI;
+        }
+    }
+    matched.setSize(matchI);
+
+    return matched;
+}
+
+
+template<class StringType>
+Foam::labelList Foam::findStrings
 (
     const wordRe& wre,
     const UList<StringType>& lst
@@ -82,7 +102,7 @@ labelList findStrings
 
 
 template<class StringType>
-labelList findStrings
+Foam::labelList Foam::findStrings
 (
     const UList<wordRe>& wreLst,
     const UList<StringType>& lst
@@ -109,7 +129,7 @@ labelList findStrings
 
 
 template<class StringType>
-bool findStrings
+bool Foam::findStrings
 (
     const UList<wordRe>& wreLst,
     const StringType& str
@@ -122,13 +142,9 @@ bool findStrings
             return true;
         }
     }
-    
+
     return false;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //

From 96751f7e024d3694c55cfb647dcb5efd06d2f0e3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 19 Jan 2009 14:31:31 +0100
Subject: [PATCH 12/32] Applied Mattijs' DynamicList copy constructor patch

---
 applications/test/DynamicList/DynamicListTest.C     | 13 +++++++++++++
 .../containers/Lists/DynamicList/DynamicList.H      |  7 +++++++
 .../containers/Lists/DynamicList/DynamicListI.H     | 12 +++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/applications/test/DynamicList/DynamicListTest.C b/applications/test/DynamicList/DynamicListTest.C
index 7e72651294..324c5361bb 100644
--- a/applications/test/DynamicList/DynamicListTest.C
+++ b/applications/test/DynamicList/DynamicListTest.C
@@ -160,6 +160,19 @@ int main(int argc, char *argv[])
         << " " << lstB.size() << endl;
     Info<< "<dlD>" << dlD << "</dlD>" << nl << "sizes: "
         << " " << dlD.size() << "/" << dlD.capacity() << endl;
+    
+    DynamicList<label,10> dlE1(10);
+    DynamicList<label> dlE2(dlE1);
+
+    Info<< "<dlE1>" << dlE1 << "</dlE1>" << nl << "sizes: "
+        << " " << dlE1.size() << "/" << dlE1.capacity() << endl;
+    Info<< "<dlE2>" << dlE2 << "</dlE2>" << nl << "sizes: "
+        << " " << dlE2.size() << "/" << dlE2.capacity() << endl;
+
+    dlE2.append(100);
+    Info<< "<dlE2>" << dlE2 << "</dlE2>" << endl;
+    
+    Info<< "\nEnd\n";
 
     return 0;
 }
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index dbbcb82b80..1e62ceb96c 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -101,7 +101,14 @@ public:
         //- Construct given size.
         explicit inline DynamicList(const label);
 
+        //- Construct copy.
+        explicit inline DynamicList
+        (
+            const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+        );
+
         //- Construct from UList. Size set to UList size.
+        //  Also constructs from DynamicList with different sizing parameters.
         explicit inline DynamicList(const UList<T>&);
 
         //- Construct by transferring the parameter contents
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 8357ee5889..5f65f0e665 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -50,6 +50,17 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 }
 
 
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
+(
+    const DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
+)
+:
+    List<T>(lst),
+    capacity_(lst.size())
+{}
+
+
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 (
@@ -99,7 +110,6 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setCapacity
     }
     // we could also enforce SizeInc granularity when (!SizeMult || !SizeDiv)
 
-
     List<T>::setSize(capacity_);
     List<T>::size(nextFree);
 }

From 9087cd7b8e2e477b436700bcbb130654a3311321 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 19 Jan 2009 11:33:37 +0100
Subject: [PATCH 13/32] Support for single-quoted strings

- token class handles both single and double quoted strings. Single quoted
  strings are used to tag regular expressions. At the moment this is just
  syntactical sugar and isn't (yet) treated differently than double-quoted
  strings.

- write output for std:string, with/without single quotes with the method
  writeQuoted(). Use distinct method name to avoid inadvertent compiler
  conversions.

- write wordRe and keyType using writeQuoted()
---
 src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C | 13 +--
 src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H |  8 ++
 src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C | 12 +++
 src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H |  8 ++
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C | 92 +++++++++---------
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C | 94 +++++++++++++++----
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H |  8 ++
 .../db/IOstreams/Sstreams/prefixOSstream.C    | 11 +++
 .../db/IOstreams/Sstreams/prefixOSstream.H    |  8 ++
 .../IOstreams/StringStreams/IStringStream.H   |  1 +
 .../IOstreams/StringStreams/OStringStream.H   |  3 +-
 src/OpenFOAM/db/IOstreams/token/token.H       | 43 +++++----
 .../primitives/strings/fileName/fileNameI.H   |  7 +-
 src/OpenFOAM/primitives/strings/word/wordI.H  | 13 +--
 .../primitives/strings/wordRe/wordRe.H        |  2 +-
 .../primitives/strings/wordRe/wordReIO.C      | 11 +--
 16 files changed, 226 insertions(+), 108 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
index 18a93e93bc..c0d1a03535 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
@@ -48,17 +48,11 @@ void Foam::Ostream::decrIndent()
 
 
 // Write keyType
+// write regular expression as single-quoted string
+// write plain word as word (unquoted)
 Foam::Ostream& Foam::Ostream::write(const keyType& kw)
 {
-    // Write as word or string
-    if (kw.isPattern())
-    {
-        return write(static_cast<const string&>(kw));
-    }
-    else
-    {
-        return write(static_cast<const word&>(kw));
-    }
+    return writeQuoted(kw, kw.isPattern());
 }
 
 
@@ -76,6 +70,7 @@ Foam::Ostream& Foam::Ostream::writeKeyword(const keyType& kw)
         nSpaces -= 2;
     }
 
+    // could also increment by indentSize_ ...
     if (nSpaces < 1)
     {
         nSpaces = 1;
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index 30ecf298dc..6d01d46438 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -115,6 +115,14 @@ public:
             //- Write string
             virtual Ostream& write(const string&) = 0;
 
+            //- Write std::string surrounded by single quotes.
+            //  Optional write without quotes.
+            virtual Ostream& writeQuoted
+            (
+                const std::string&,
+                const bool quoted=true
+            ) = 0;
+
             //- Write label
             virtual Ostream& write(const label) = 0;
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
index 8e754ce2fd..1cfcd9eec6 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
@@ -175,6 +175,18 @@ Foam::Ostream& Foam::OPstream::write(const string& str)
 }
 
 
+Foam::Ostream& Foam::OPstream::writeQuoted(const std::string& str, const bool)
+{
+    write(char(token::STRING));
+
+    size_t len = str.size();
+    writeToBuffer(len);
+    writeToBuffer(str.c_str(), len + 1, 1);
+
+    return *this;
+}
+
+
 Foam::Ostream& Foam::OPstream::write(const label val)
 {
     write(char(token::LABEL));
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
index 075f7c557c..b02f892d9e 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
@@ -136,6 +136,14 @@ public:
             //- Write string
             Ostream& write(const string&);
 
+            //- Write std::string surrounded by single quotes.
+            //  Optional write without quotes.
+            Ostream& writeQuoted
+            (
+                const std::string&,
+                const bool quoted=true
+            );
+
             //- Write label
             Ostream& write(const label);
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index c2e27d5d16..c94e6c9bbc 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -152,8 +152,9 @@ Foam::Istream& Foam::ISstream::read(token& t)
             return *this;
         }
 
-        // Strings: enclosed by double quotes.
+        // Strings: enclosed by single or double quotes.
         case token::BEGIN_STRING :
+        case token::BEGIN_QSTRING :
         {
             putback(c);
             string* sPtr = new string;
@@ -366,7 +367,13 @@ Foam::Istream& Foam::ISstream::read(string& str)
         return *this;
     }
 
-    if (c != token::BEGIN_STRING)
+    char endTok = token::END_STRING;
+
+    if (c == token::BEGIN_QSTRING)
+    {
+        endTok = token::END_QSTRING;
+    }
+    else if (c != token::BEGIN_STRING)
     {
         buf[0] = '\0';
 
@@ -382,52 +389,49 @@ Foam::Istream& Foam::ISstream::read(string& str)
 
     while (get(c))
     {
-        switch (c)
+        if (c == endTok)
         {
-            case token::END_STRING :
-                if (escaped)
-                {
-                    escaped = false;
-                    i--;    // overwrite backslash
-                }
-                else
-                {
-                    // done reading string
-                    buf[i] = '\0';
-                    str = buf;
-                    return *this;
-                }
-                break;
-
-            case token::NL :
-                if (escaped)
-                {
-                    escaped = false;
-                    i--;    // overwrite backslash
-                }
-                else
-                {
-                    buf[i] = '\0';
-                    buf[errLen] = '\0';
-
-                    FatalIOErrorIn("ISstream::read(string&)", *this)
-                        << "found '\\n' while reading string \""
-                        << buf << "...\""
-                        << exit(FatalIOError);
-
-                    return *this;
-                }
-                break;
-
-            case '\\':
-                escaped = !escaped;    // toggle state (retains backslashes)
-                break;
-
-            default:
+            if (escaped)
+            {
                 escaped = false;
-                break;
+                i--;    // overwrite backslash
+            }
+            else
+            {
+                // done reading string
+                buf[i] = '\0';
+                str = buf;
+                return *this;
+            }
         }
+        else if (c == token::NL)
+        {
+            if (escaped)
+            {
+                escaped = false;
+                i--;    // overwrite backslash
+            }
+            else
+            {
+                buf[i] = '\0';
+                buf[errLen] = '\0';
 
+                FatalIOErrorIn("ISstream::read(string&)", *this)
+                    << "found '\\n' while reading string \""
+                    << buf << "...\""
+                    << exit(FatalIOError);
+
+                return *this;
+            }
+        }
+        else if (c == '\\')
+        {
+            escaped = !escaped;    // toggle state (retains backslashes)
+        }
+        else
+        {
+            escaped = false;
+        }
 
         buf[i] = c;
         if (i++ == maxLen)
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
index 5c60ada59f..a954f1b778 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
@@ -74,28 +74,26 @@ Foam::Ostream& Foam::OSstream::write(const string& str)
     {
         register char c = *iter;
 
-        switch (c)
+        if (c == '\\')
         {
-            case '\\' :
-                backslash++;
-                // suppress output until we know if other characters follow
-                continue;
-                break;
-
-            case token::NL :
-                lineNumber_++;
-                backslash++;    // backslash escape for newline
-                break;
-
-            case token::END_STRING :
-                backslash++;    // backslash escape for double-quote
-                break;
+            backslash++;
+            // suppress output until we know if other characters follow
+            continue;
+        }
+        else if (c == token::NL)
+        {
+            lineNumber_++;
+            backslash++;    // backslash escape for newline
+        }
+        else if (c == token::END_STRING)
+        {
+            backslash++;    // backslash escape for quote
         }
 
         // output pending backslashes
         while (backslash)
         {
-            os_ << '\\';    // escape for new-line
+            os_ << '\\';
             backslash--;
         }
 
@@ -103,7 +101,7 @@ Foam::Ostream& Foam::OSstream::write(const string& str)
     }
 
     // silently drop any trailing backslashes
-    // they would otherwise appear like an escaped double-quote
+    // they would otherwise appear like an escaped end-quote
 
     os_ << token::END_STRING;
 
@@ -112,6 +110,68 @@ Foam::Ostream& Foam::OSstream::write(const string& str)
 }
 
 
+Foam::Ostream& Foam::OSstream::writeQuoted
+(
+    const std::string& str,
+    const bool quoted
+)
+{
+    if (quoted)
+    {
+        os_ << token::BEGIN_QSTRING;
+
+        register int backslash = 0;
+        for
+        (
+            string::const_iterator iter = str.begin();
+            iter != str.end();
+            ++iter
+        )
+        {
+            register char c = *iter;
+
+            if (c == '\\')
+            {
+                backslash++;
+                // suppress output until we know if other characters follow
+                continue;
+            }
+            else if (c == token::NL)
+            {
+                lineNumber_++;
+                backslash++;    // backslash escape for newline
+            }
+            else if (c == token::END_QSTRING)
+            {
+                backslash++;    // backslash escape for quote
+            }
+
+            // output pending backslashes
+            while (backslash)
+            {
+                os_ << '\\';
+                backslash--;
+            }
+
+            os_ << c;
+        }
+
+        // silently drop any trailing backslashes
+        // they would otherwise appear like an escaped end-quote
+        os_ << token::END_QSTRING;
+    }
+    else
+    {
+        // output unquoted string, only advance line number on newline
+        lineNumber_ += string(str).count(token::NL);
+        os_ << str;
+    }
+
+    setState(os_.rdstate());
+    return *this;
+}
+
+
 Foam::Ostream& Foam::OSstream::write(const label val)
 {
     os_ << val;
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index 816021f8c5..d4f552bd53 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -141,6 +141,14 @@ public:
             //  double-quote.
             virtual Ostream& write(const string&);
 
+            //- Write std::string surrounded by single quotes.
+            //  Optional write without quotes.
+            virtual Ostream& writeQuoted
+            (
+                const std::string&,
+                const bool quoted=true
+            );
+
             //- Write label
             virtual Ostream& write(const label);
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C
index 79aa6d5a03..9d6b740b7e 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C
@@ -115,6 +115,17 @@ Foam::Ostream& Foam::prefixOSstream::write(const string& val)
 }
 
 
+Foam::Ostream& Foam::prefixOSstream::writeQuoted
+(
+    const std::string& val,
+    const bool quoted
+)
+{
+    checkWritePrefix();
+    return OSstream::writeQuoted(val, quoted);
+}
+
+
 Foam::Ostream& Foam::prefixOSstream::write(const label val)
 {
     checkWritePrefix();
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
index 85e909bdcb..aede82b4b9 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
@@ -114,6 +114,14 @@ public:
             //- Write string
             virtual Ostream& write(const string&);
 
+            //- Write std::string
+            //  Specify if string should be single quoted or remain unquoted.
+            virtual Ostream& writeQuoted
+            (
+                const std::string&,
+                const bool quoted=true
+            );
+
             //- Write label
             virtual Ostream& write(const label);
 
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
index 760b4cfed1..d7e9995e9b 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
@@ -105,6 +105,7 @@ public:
 
         // Access
 
+            //- Return the string
             string str() const
             {
                 return dynamic_cast<const std::istringstream&>(stream()).str();
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index c50ac7babc..8f76748292 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -57,7 +57,7 @@ public:
 
     // Constructors
 
-        //- Set stream status
+        //- Construct and set stream status
         OStringStream
         (
             streamFormat format=ASCII,
@@ -106,6 +106,7 @@ public:
 
         // Access
 
+            //- Return the string
             string str() const
             {
                 return dynamic_cast<const std::ostringstream&>(stream()).str();
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index b265739572..9cd5bde737 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -92,28 +92,31 @@ public:
     //- Standard punctuation tokens
     enum punctuationToken
     {
-        NULL_TOKEN    = '\0',
-        SPACE         = ' ',
-        TAB           = '\t',
-        NL            = '\n',
+        NULL_TOKEN     = '\0',
+        SPACE          = ' ',
+        TAB            = '\t',
+        NL             = '\n',
 
-        END_STATEMENT = ';',
-        BEGIN_LIST    = '(',
-        END_LIST      = ')',
-        BEGIN_SQR     = '[',
-        END_SQR       = ']',
-        BEGIN_BLOCK   = '{',
-        END_BLOCK     = '}',
-        COLON         = ':',
-        COMMA         = ',',
-        BEGIN_STRING  = '"',
-        END_STRING    = '"',
+        END_STATEMENT  = ';',
+        BEGIN_LIST     = '(',
+        END_LIST       = ')',
+        BEGIN_SQR      = '[',
+        END_SQR        = ']',
+        BEGIN_BLOCK    = '{',
+        END_BLOCK      = '}',
+        COLON          = ':',
+        COMMA          = ',',
 
-        ASSIGN        = '=',
-        ADD           = '+',
-        SUBTRACT      = '-',
-        MULTIPLY      = '*',
-        DIVIDE        = '/'
+        BEGIN_STRING   = '"',
+        END_STRING     = BEGIN_STRING,
+        BEGIN_QSTRING  = '\'',
+        END_QSTRING    = BEGIN_QSTRING,
+
+        ASSIGN         = '=',
+        ADD            = '+',
+        SUBTRACT       = '-',
+        MULTIPLY       = '*',
+        DIVIDE         = '/'
     };
 
 
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileNameI.H b/src/OpenFOAM/primitives/strings/fileName/fileNameI.H
index f2fb48345b..d8b03fe645 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileNameI.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileNameI.H
@@ -94,7 +94,12 @@ inline Foam::fileName::fileName(const char* str)
 
 inline bool Foam::fileName::valid(char c)
 {
-    return (!isspace(c) && c != '"');
+    return
+    (
+        !isspace(c)
+     && c != '"'   // string quote
+     && c != '\''  // string quote
+    );
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/word/wordI.H b/src/OpenFOAM/primitives/strings/word/wordI.H
index f84b99be43..b1daf2752c 100644
--- a/src/OpenFOAM/primitives/strings/word/wordI.H
+++ b/src/OpenFOAM/primitives/strings/word/wordI.H
@@ -119,12 +119,13 @@ inline bool Foam::word::valid(char c)
 {
     return
     (
-          !isspace(c)
-     && c != '"'
-     && c != '/'
-     && c != ';'
-     && c != '{'
-     && c != '}'
+        !isspace(c)
+     && c != '"'   // string quote
+     && c != '\''  // string quote
+     && c != '/'   // path separator
+     && c != ';'   // end statement
+     && c != '{'   // beg subdict
+     && c != '}'   // end subdict
     );
 }
 
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
index 3eec24b2b2..aee6c3a883 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
@@ -91,7 +91,7 @@ public:
         //  Note that 'REGEXP' is implicit if 'NOCASE' is specified alone.
         enum compOption
         {
-            LITERAL = 0, /*!< treat as a strign literal */
+            LITERAL = 0, /*!< treat as a string literal */
             DETECT  = 1, /*!< treat as regular expression */
             REGEXP  = 2, /*!< detect if the string contains meta-characters */
             NOCASE  = 4, /*!< ignore case in regular expression */
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C b/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C
index 49bfd17ddf..dab1542b27 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordReIO.C
@@ -78,14 +78,7 @@ Foam::Istream& Foam::operator>>(Istream& is, wordRe& w)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const wordRe& w)
 {
-    if (w.isPattern())
-    {
-        os.write(static_cast<const string&>(w));
-    }
-    else
-    {
-        os.write(static_cast<const word&>(w));
-    }
+    os.writeQuoted(w, w.isPattern());
     os.check("Ostream& operator<<(Ostream&, const wordRe&)");
     return os;
 }
@@ -99,7 +92,7 @@ Foam::Ostream& Foam::wordRe::info(Ostream& os) const
     }
     else
     {
-        os  << "wordRe(plain) '" << *this << "'";
+        os  << "wordRe(plain) \"" << *this << '"';
     }
     os.flush();
 

From 7b769b50357a8ddce3d3afb5c970e415b7dcc3e2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 20 Jan 2009 10:55:39 +0100
Subject: [PATCH 14/32] added C++0x-style cbegin(), cend() iterator methods

- added STL-compatible resize() method.
  Should this be the primary entry point?

- made [DS]LListBase end iterators private
---
 .../HashTables/HashTable/HashTable.H          |  6 +++
 .../HashTables/HashTable/HashTableI.H         | 18 +++++++-
 .../StaticHashTable/StaticHashTable.H         | 11 +++--
 .../StaticHashTable/StaticHashTableI.H        | 18 +++++++-
 .../linkTypes/DLListBase/DLListBase.C         |  6 +--
 .../linkTypes/DLListBase/DLListBase.H         | 31 ++++++++------
 .../linkTypes/DLListBase/DLListBaseI.H        | 24 ++++++++---
 .../linkTypes/SLListBase/SLListBase.C         |  4 +-
 .../linkTypes/SLListBase/SLListBase.H         | 28 +++++++------
 .../linkTypes/SLListBase/SLListBaseI.H        | 24 ++++++++---
 .../Lists/CompactListList/CompactListList.C   | 36 +++++++++-------
 .../Lists/CompactListList/CompactListList.H   | 19 +++++++--
 .../Lists/CompactListList/CompactListListI.H  | 37 +++++++++++++++++
 .../Lists/DynamicList/DynamicList.H           |  9 ++++
 .../Lists/DynamicList/DynamicListI.H          | 21 ++++++++++
 .../containers/Lists/FixedList/FixedList.H    | 34 +++++++++------
 .../containers/Lists/FixedList/FixedListI.H   | 41 +++++++++++++++++++
 src/OpenFOAM/containers/Lists/List/List.H     |  6 +++
 src/OpenFOAM/containers/Lists/List/ListI.H    | 14 +++++++
 .../containers/Lists/PackedList/PackedList.H  |  3 ++
 .../containers/Lists/PackedList/PackedListI.H |  7 ++++
 .../containers/Lists/PtrList/PtrList.H        |  6 +++
 .../containers/Lists/PtrList/PtrListI.H       |  7 ++++
 src/OpenFOAM/containers/Lists/UList/UList.H   | 30 ++++++++------
 src/OpenFOAM/containers/Lists/UList/UListI.H  | 28 +++++++++++++
 .../containers/Lists/UPtrList/UPtrList.H      |  8 ++++
 .../containers/Lists/UPtrList/UPtrListI.H     | 15 ++++++-
 src/lagrangian/basic/Cloud/Cloud.H            | 10 +++++
 .../edgeFaceCirculator/edgeFaceCirculator.H   |  2 +
 .../edgeFaceCirculator/edgeFaceCirculatorI.H  | 24 +++++++++++
 src/meshTools/octree/octree.C                 | 16 ++++++++
 src/meshTools/octree/octree.H                 |  6 +--
 .../UnsortedMeshedSurface.H                   |  3 ++
 33 files changed, 461 insertions(+), 91 deletions(-)

diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 2fbb548d0e..457e2f1b7e 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -384,6 +384,12 @@ public:
         };
 
 
+        //- const_iterator set to the beginning of the HashTable
+        inline const_iterator cbegin() const;
+
+        //- const_iterator set to beyond the end of the HashTable
+        inline const const_iterator& cend() const;
+
         //- const_iterator set to the beginning of the HashTable
         inline const_iterator begin() const;
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 03359b2fd1..79ff374145 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -452,7 +452,7 @@ const Key& Foam::HashTable<T, Key, Hash>::const_iterator::key()
 
 template<class T, class Key, class Hash>
 inline typename Foam::HashTable<T, Key, Hash>::const_iterator
-Foam::HashTable<T, Key, Hash>::begin() const
+Foam::HashTable<T, Key, Hash>::cbegin() const
 {
     label i = 0;
 
@@ -477,6 +477,22 @@ Foam::HashTable<T, Key, Hash>::begin() const
 }
 
 
+template<class T, class Key, class Hash>
+inline const typename Foam::HashTable<T, Key, Hash>::const_iterator&
+Foam::HashTable<T, Key, Hash>::cend() const
+{
+    return HashTable<T, Key, Hash>::endConstIter_;
+}
+
+
+template<class T, class Key, class Hash>
+inline typename Foam::HashTable<T, Key, Hash>::const_iterator
+Foam::HashTable<T, Key, Hash>::begin() const
+{
+    return this->cbegin();
+}
+
+
 template<class T, class Key, class Hash>
 inline const typename Foam::HashTable<T, Key, Hash>::const_iterator&
 Foam::HashTable<T, Key, Hash>::end() const
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index 2816056383..4513ea0245 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
@@ -317,19 +317,24 @@ public:
         };
 
 
-        //- iterator set to the begining of the StaticHashTable
+        //- iterator set to the beginning of the StaticHashTable
         inline iterator begin();
 
         //- iterator set to beyond the end of the StaticHashTable
         inline const iterator& end();
 
-        //- const_iterator set to the begining of the StaticHashTable
+        //- const_iterator set to the beginning of the StaticHashTable
+        inline const_iterator cbegin() const;
+
+        //- const_iterator set to beyond the end of the StaticHashTable
+        inline const const_iterator& cend() const;
+
+        //- const_iterator set to the beginning of the StaticHashTable
         inline const_iterator begin() const;
 
         //- const_iterator set to beyond the end of the StaticHashTable
         inline const const_iterator& end() const;
 
-
     // IOstream Operator
 
         friend Istream& operator>> <T, Key, Hash>
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index d9bfaae0b8..329437a07a 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -355,7 +355,7 @@ Foam::StaticHashTable<T, Key, Hash>::end()
 
 template<class T, class Key, class Hash>
 inline typename Foam::StaticHashTable<T, Key, Hash>::const_iterator
-Foam::StaticHashTable<T, Key, Hash>::begin() const
+Foam::StaticHashTable<T, Key, Hash>::cbegin() const
 {
     // Find first non-empty entry
     forAll(keys_, hashIdx)
@@ -377,6 +377,22 @@ Foam::StaticHashTable<T, Key, Hash>::begin() const
 }
 
 
+template<class T, class Key, class Hash>
+inline const typename Foam::StaticHashTable<T, Key, Hash>::const_iterator&
+Foam::StaticHashTable<T, Key, Hash>::cend() const
+{
+    return StaticHashTable<T, Key, Hash>::endConstIter_;
+}
+
+
+template<class T, class Key, class Hash>
+inline typename Foam::StaticHashTable<T, Key, Hash>::const_iterator
+Foam::StaticHashTable<T, Key, Hash>::begin() const
+{
+    return this->cbegin();
+}
+
+
 template<class T, class Key, class Hash>
 inline const typename Foam::StaticHashTable<T, Key, Hash>::const_iterator&
 Foam::StaticHashTable<T, Key, Hash>::end() const
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
index 5c21dfe58e..78a4313a90 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
@@ -30,14 +30,14 @@ License
 #include "IOstreams.H"
 #include "long.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-Foam::DLListBase::iterator Foam::DLListBase::endIter
+Foam::DLListBase::iterator Foam::DLListBase::endIter_
 (
     const_cast<DLListBase&>(static_cast<const DLListBase&>(DLListBase()))
 );
 
-Foam::DLListBase::const_iterator Foam::DLListBase::endConstIter
+Foam::DLListBase::const_iterator Foam::DLListBase::endConstIter_
 (
     static_cast<const DLListBase&>(DLListBase()),
     reinterpret_cast<const link*>(0)
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 475109cc77..ba3423c8e2 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -176,7 +176,7 @@ public:
 
     // STL iterator
 
-        //- An STL iterator
+        //- An STL-conforming iterator
         class iterator
         {
             friend class DLListBase;
@@ -193,16 +193,17 @@ public:
                 //- Copy of the link
                 link curLink_;
 
+            // Private Member Functions
+
+            //- Construct for a given SLListBase with NULL element and link.
+            //  Only used to create endIter
+            inline iterator(DLListBase&);
+
         public:
 
             //- Construct for a given DLListBase and link
             inline iterator(DLListBase&, link*);
 
-            //- Construct for a given DLListBase
-            //  setting element and link to NULL.
-            //  Only used to create endIter
-            inline iterator(DLListBase&);
-
             // Member operators
 
                 inline void operator=(const iterator&);
@@ -217,16 +218,12 @@ public:
         };
 
         inline iterator begin();
-
-        //- iterator returned by end()
-        static iterator endIter;
-
         inline const iterator& end();
 
 
     // STL const_iterator
 
-        //- An STL const_iterator
+        //- An STL-conforming const_iterator
         class const_iterator
         {
             // Private data
@@ -258,12 +255,20 @@ public:
                 inline const_iterator operator++(int);
         };
 
+        inline const_iterator cbegin() const;
+        inline const const_iterator& cend() const;
+
         inline const_iterator begin() const;
+        inline const const_iterator& end() const;
+
+private:
+
+        //- iterator returned by end()
+        static iterator endIter_;
 
         //- const_iterator returned by end()
-        static const_iterator endConstIter;
+        static const_iterator endConstIter_;
 
-        inline const const_iterator& end() const;
 };
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
index 6692ce5c52..9b80941bf9 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
@@ -259,14 +259,14 @@ Foam::DLListBase::begin()
     }
     else
     {
-        return endIter;
+        return endIter_;
     }
 }
 
 
 inline const Foam::DLListBase::iterator& Foam::DLListBase::end()
 {
-    return endIter;
+    return endIter_;
 }
 
 
@@ -350,7 +350,7 @@ Foam::DLListBase::const_iterator::operator++(int)
 
 
 inline Foam::DLListBase::const_iterator
-Foam::DLListBase::begin() const
+Foam::DLListBase::cbegin() const
 {
     if (size())
     {
@@ -358,15 +358,29 @@ Foam::DLListBase::begin() const
     }
     else
     {
-        return endConstIter;
+        return endConstIter_;
     }
 }
 
 
+inline const Foam::DLListBase::const_iterator&
+Foam::DLListBase::cend() const
+{
+    return endConstIter_;
+}
+
+
+inline Foam::DLListBase::const_iterator
+Foam::DLListBase::begin() const
+{
+    return this->cbegin();
+}
+
+
 inline const Foam::DLListBase::const_iterator&
 Foam::DLListBase::end() const
 {
-    return endConstIter;
+    return endConstIter_;
 }
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
index 75dca644d9..f0fb24baac 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
@@ -29,12 +29,12 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::SLListBase::iterator Foam::SLListBase::endIter
+Foam::SLListBase::iterator Foam::SLListBase::endIter_
 (
     const_cast<SLListBase&>(static_cast<const SLListBase&>(SLListBase()))
 );
 
-Foam::SLListBase::const_iterator Foam::SLListBase::endConstIter
+Foam::SLListBase::const_iterator Foam::SLListBase::endConstIter_
 (
     static_cast<const SLListBase&>(SLListBase()),
     reinterpret_cast<const link*>(0)
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index 06f5960fae..4f660a1e4d 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -178,17 +178,17 @@ public:
                 //- Copy of the link
                 link curLink_;
 
+            // Private Member Functions
+
+            //- Construct for a given SLListBase with NULL element and link.
+            //  Only used to create endIter
+            inline iterator(SLListBase&);
+
         public:
 
             //- Construct for a given SLListBase and link
             inline iterator(SLListBase&, link*);
 
-            //- Construct for a given SLListBase
-            //  setting element and link to NULL.
-            //  Only used to create endIter
-            inline iterator(SLListBase&);
-
-
             // Member operators
 
                 inline void operator=(const iterator&);
@@ -203,10 +203,6 @@ public:
         };
 
         inline iterator begin();
-
-        //- iterator returned by end()
-        static iterator endIter;
-
         inline const iterator& end();
 
 
@@ -245,12 +241,20 @@ public:
                 inline const_iterator operator++(int);
         };
 
+        inline const_iterator cbegin() const;
+        inline const const_iterator& cend() const;
+
         inline const_iterator begin() const;
+        inline const const_iterator& end() const;
+
+private:
+
+        //- iterator returned by end()
+        static iterator endIter_;
 
         //- const_iterator returned by end()
-        static const_iterator endConstIter;
+        static const_iterator endConstIter_;
 
-        inline const const_iterator& end() const;
 };
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
index ca069a239d..de34257d34 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
@@ -231,7 +231,7 @@ Foam::SLListBase::begin()
     }
     else
     {
-        return endIter;
+        return endIter_;
     }
 }
 
@@ -239,7 +239,7 @@ Foam::SLListBase::begin()
 inline const Foam::SLListBase::iterator&
 Foam::SLListBase::end()
 {
-    return endIter;
+    return endIter_;
 }
 
 
@@ -323,7 +323,7 @@ Foam::SLListBase::const_iterator::operator++(int)
 
 
 inline Foam::SLListBase::const_iterator
-Foam::SLListBase::begin() const
+Foam::SLListBase::cbegin() const
 {
     if (size())
     {
@@ -331,15 +331,29 @@ Foam::SLListBase::begin() const
     }
     else
     {
-        return endConstIter;
+        return endConstIter_;
     }
 }
 
 
+inline const Foam::SLListBase::const_iterator&
+Foam::SLListBase::cend() const
+{
+    return endConstIter_;
+}
+
+
+inline Foam::SLListBase::const_iterator
+Foam::SLListBase::begin() const
+{
+    return this->cbegin();
+}
+
+
 inline const Foam::SLListBase::const_iterator&
 Foam::SLListBase::end() const
 {
-    return endConstIter;
+    return endConstIter_;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 2602eea95a..8e802fe48e 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -142,12 +142,17 @@ void Foam::CompactListList<T>::setSize(const label nRows)
 
 
 template<class T>
-void Foam::CompactListList<T>::setSize(const label nRows, const label nData)
+void Foam::CompactListList<T>::setSize
+(
+    const label nRows,
+    const label nData
+)
 {
     offsets_.setSize(nRows);
     m_.setSize(nData);
 }
 
+
 template<class T>
 void Foam::CompactListList<T>::setSize
 (
@@ -160,19 +165,6 @@ void Foam::CompactListList<T>::setSize
     m_.setSize(nData, t);
 }
 
-template<class T>
-Foam::labelList Foam::CompactListList<T>::sizes() const
-{
-    labelList rowSizes(offsets_.size());
-
-    label prevOffset = 0;
-    forAll(offsets_, i)
-    {
-        rowSizes[i] = offsets_[i]-prevOffset;
-        prevOffset = offsets_[i];
-    }
-    return rowSizes;
-}
 
 template<class T>
 void Foam::CompactListList<T>::setSize(const UList<label>& rowSizes)
@@ -189,6 +181,22 @@ void Foam::CompactListList<T>::setSize(const UList<label>& rowSizes)
     m_.setSize(sumSize);
 }
 
+
+template<class T>
+Foam::labelList Foam::CompactListList<T>::sizes() const
+{
+    labelList rowSizes(offsets_.size());
+
+    label prevOffset = 0;
+    forAll(offsets_, i)
+    {
+        rowSizes[i] = offsets_[i]-prevOffset;
+        prevOffset = offsets_[i];
+    }
+    return rowSizes;
+}
+
+
 template<class T>
 void Foam::CompactListList<T>::clear()
 {
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 18943d268f..f0a80cc1bd 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -156,15 +156,28 @@ public:
             //- Reset sizes of CompactListList and value for new elements.
             void setSize(const label nRows, const label nData, const T&);
 
-            //- Return sizes (to be used e.g. for construction)
-            labelList sizes() const;
-
             //- Reset size of CompactListList.
             void setSize(const UList<label>& rowSizes);
 
+            //- Reset size of CompactListList.
+            //  This form only allows contraction of the CompactListList.
+            inline void resize(const label nRows);
+
+            //- Reset size of CompactListList.
+            inline void resize(const label nRows, const label nData);
+
+            //- Reset sizes of CompactListList and value for new elements.
+            inline void resize(const label nRows, const label nData, const T&);
+
+            //- Reset size of CompactListList.
+            inline void resize(const UList<label>& rowSizes);
+
             //- Clear the CompactListList, i.e. set sizes to zero.
             void clear();
 
+            //- Return sizes (to be used e.g. for construction)
+            labelList sizes() const;
+
             //- Transfer the contents of the argument CompactListList
             //  into this CompactListList and annull the argument list.
             void transfer(CompactListList<T>&);
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index 58e9590199..dc57627911 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -176,6 +176,43 @@ inline Foam::Xfer<Foam::CompactListList<T> > Foam::CompactListList<T>::xfer()
 }
 
 
+template<class T>
+inline void Foam::CompactListList<T>::resize(const label nRows)
+{
+    this->setSize(nRows);
+}
+
+
+template<class T>
+inline void Foam::CompactListList<T>::resize
+(
+    const label nRows,
+    const label nData
+)
+{
+    this->setSize(nRows, nData);
+}
+
+
+template<class T>
+inline void Foam::CompactListList<T>::resize
+(
+    const label nRows,
+    const label nData,
+    const T& t
+)
+{
+    this->setSize(nRows, nData, t);
+}
+
+
+template<class T>
+inline void Foam::CompactListList<T>::resize(const UList<label>& rowSizes)
+{
+    this->setSize(rowSizes);
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 1e62ceb96c..47e7c4b200 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -142,6 +142,15 @@ public:
         //- Alter the addressed list size and fill new space with a constant.
         inline void setSize(const label, const T&);
 
+        //- Alter the addressed list size.
+        //  New space will be allocated if required.
+        //  Use this to resize the list prior to using the operator[] for
+        //  setting values (as per List usage).
+        inline void resize(const label);
+
+        //- Alter the addressed list size and fill new space with a constant.
+        inline void resize(const label, const T&);
+
         //- Reserve allocation space for at least this size.
         //  Never shrinks the allocated size, use setCapacity() for that.
         inline void reserve(const label);
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 5f65f0e665..5fe561e0f2 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -207,6 +207,27 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::setSize
 }
 
 
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::resize
+(
+    const label nElem
+)
+{
+    this->setSize(nElem);
+}
+
+
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::resize
+(
+    const label nElem,
+    const T& t
+)
+{
+    this->setSize(nElem, t);
+}
+
+
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::clear()
 {
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 40f0bb24f0..2e3ddf408b 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -153,6 +153,10 @@ public:
 
         // Edit
 
+            //- Dummy resize function
+            //  needed to make FixedList consistent with List
+            inline void resize(const label);
+
             //- Dummy setSize function
             //  needed to make FixedList consistent with List
             inline void setSize(const label);
@@ -227,12 +231,16 @@ public:
         //- Random access iterator for traversing FixedList.
         typedef const T* const_iterator;
 
-        //- Return a const_iterator to begin traversing the
-        //  constant FixedList.
+        //- Return const_iterator to begin traversing the constant FixedList.
+        inline const_iterator cbegin() const;
+
+        //- Return const_iterator to end traversing the constant FixedList.
+        inline const_iterator cend() const;
+
+        //- Return const_iterator to begin traversing the constant FixedList.
         inline const_iterator begin() const;
 
-        //- Return a const_iterator to end traversing the
-        //  constant FixedList.
+        //- Return const_iterator to end traversing the constant FixedList.
         inline const_iterator end() const;
 
 
@@ -241,12 +249,10 @@ public:
         //- Reverse iterator for reverse traversal of FixedList.
         typedef T* reverse_iterator;
 
-        //- Return a reverse_iterator to begin reverse traversing the
-        //  FixedList.
+        //- Return reverse_iterator to begin reverse traversing the FixedList.
         inline reverse_iterator rbegin();
 
-        //- Return a reverse_iterator to end reverse traversing the
-        //  FixedList.
+        //- Return reverse_iterator to end reverse traversing the FixedList.
         inline reverse_iterator rend();
 
 
@@ -255,12 +261,16 @@ public:
         //- Reverse iterator for reverse traversal of constant FixedList.
         typedef const T* const_reverse_iterator;
 
-        //- Return a const_reverse_iterator to begin reverse traversing the
-        //  FixedList.
+        //- Return const_reverse_iterator to begin reverse traversing FixedList.
+        inline const_reverse_iterator crbegin() const;
+
+        //- Return const_reverse_iterator to end reverse traversing FixedList.
+        inline const_reverse_iterator crend() const;
+
+        //- Return const_reverse_iterator to begin reverse traversing FixedList.
         inline const_reverse_iterator rbegin() const;
 
-        //- Return a const_reverse_iterator to end reverse traversing the
-        //  FixedList.
+        //- Return const_reverse_iterator to end reverse traversing FixedList.
         inline const_reverse_iterator rend() const;
 
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index e58d500ffd..d618cb6e38 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -170,6 +170,14 @@ inline void Foam::FixedList<T, Size>::checkIndex(const label i) const
 }
 
 
+template<class T, Foam::label Size>
+inline void Foam::FixedList<T, Size>::resize(const label s)
+{
+#   ifdef FULLDEBUG
+    checkSize(s);
+#   endif
+}
+
 template<class T, Foam::label Size>
 inline void Foam::FixedList<T, Size>::setSize(const label s)
 {
@@ -276,6 +284,14 @@ Foam::FixedList<T, Size>::begin() const
 }
 
 
+template<class T, Foam::label Size>
+inline typename Foam::FixedList<T, Size>::const_iterator
+Foam::FixedList<T, Size>::cbegin() const
+{
+    return v_;
+}
+
+
 template<class T, Foam::label Size>
 inline typename Foam::FixedList<T, Size>::iterator
 Foam::FixedList<T, Size>::end()
@@ -291,6 +307,15 @@ Foam::FixedList<T, Size>::end() const
     return &v_[Size];
 }
 
+
+template<class T, Foam::label Size>
+inline typename Foam::FixedList<T, Size>::const_iterator
+Foam::FixedList<T, Size>::cend() const
+{
+    return &v_[Size];
+}
+
+
 template<class T, Foam::label Size>
 inline typename Foam::FixedList<T, Size>::iterator
 Foam::FixedList<T, Size>::rbegin()
@@ -307,6 +332,14 @@ Foam::FixedList<T, Size>::rbegin() const
 }
 
 
+template<class T, Foam::label Size>
+inline typename Foam::FixedList<T, Size>::const_iterator
+Foam::FixedList<T, Size>::crbegin() const
+{
+    return &v_[Size-1];
+}
+
+
 template<class T, Foam::label Size>
 inline typename Foam::FixedList<T, Size>::iterator
 Foam::FixedList<T, Size>::rend()
@@ -323,6 +356,14 @@ Foam::FixedList<T, Size>::rend() const
 }
 
 
+template<class T, Foam::label Size>
+inline typename Foam::FixedList<T, Size>::const_iterator
+Foam::FixedList<T, Size>::crend() const
+{
+    return &v_[-1];
+}
+
+
 template<class T, Foam::label Size>
 inline Foam::label Foam::FixedList<T, Size>::size() const
 {
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 11431b4daf..983b2be008 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -158,6 +158,12 @@ public:
 
         // Edit
 
+            //- Reset size of List.
+            inline void resize(const label);
+
+            //- Reset size of List and value for new elements.
+            inline void resize(const label, const T&);
+
             //- Reset size of List.
             void setSize(const label);
 
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index a0b7286708..c3c6ebe4fb 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -47,6 +47,20 @@ inline const Foam::List<T>& Foam::List<T>::null()
 }
 
 
+template<class T>
+inline void Foam::List<T>::resize(const label newSize)
+{
+    this->setSize(newSize);
+}
+
+
+template<class T>
+inline void Foam::List<T>::resize(const label newSize, const T& a)
+{
+    this->setSize(newSize, a);
+}
+
+
 template<class T>
 inline T& Foam::List<T>::newElmt(const label i)
 {
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index d2d015ad56..92493d557d 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -150,6 +150,9 @@ public:
             //- Reset size of List.
             void setSize(const label);
 
+            //- Reset size of List.
+            inline void resize(const label);
+
             //- Clear the list, i.e. set size to zero.
             void clear();
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index dc5f18786e..3ccd257813 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -110,6 +110,13 @@ inline Foam::PackedList<nBits>::PackedList(const label size)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<int nBits>
+inline void Foam::PackedList<nBits>::resize(const label size)
+{
+    this->setSize(size);
+}
+
+
 template<int nBits>
 inline Foam::label Foam::PackedList<nBits>::size() const
 {
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index 86c7ea8f4d..5de1345f10 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -170,6 +170,12 @@ public:
             //  deleted.
             void setSize(const label);
 
+            //- Reset size of PtrList.  This can only be used to set the size
+            //  of an empty PtrList, extend a PtrList, remove entries from
+            //  the end of a PtrList. If the entries are non-empty they are
+            //  deleted.
+            inline void resize(const label);
+
             //- Clear the PtrList, i.e. set size to zero deleting all the
             //  allocated entries.
             void clear();
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
index 8dfbe2686a..d450cdd09f 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrListI.H
@@ -45,6 +45,13 @@ inline bool Foam::PtrList<T>::empty() const
 }
 
 
+template<class T>
+inline void Foam::PtrList<T>::resize(const label newSize)
+{
+    this->setSize(newSize);
+}
+
+
 template<class T>
 inline bool Foam::PtrList<T>::set(const label i) const
 {
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index bf3dc84802..83c0913a5f 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -215,12 +215,16 @@ public:
         //- Random access iterator for traversing UList.
         typedef const T* const_iterator;
 
-        //- Return a const_iterator to begin traversing the
-        //  constant UList.
+        //- Return const_iterator to begin traversing the constant UList.
+        inline const_iterator cbegin() const;
+
+        //- Return const_iterator to end traversing the constant UList.
+        inline const_iterator cend() const;
+
+        //- Return const_iterator to begin traversing the constant UList.
         inline const_iterator begin() const;
 
-        //- Return a const_iterator to end traversing the
-        //  constant UList.
+        //- Return const_iterator to end traversing the constant UList.
         inline const_iterator end() const;
 
 
@@ -229,12 +233,10 @@ public:
         //- Reverse iterator for reverse traversal of UList.
         typedef T* reverse_iterator;
 
-        //- Return a reverse_iterator to begin reverse traversing the
-        //  UList.
+        //- Return reverse_iterator to begin reverse traversing the UList.
         inline reverse_iterator rbegin();
 
-        //- Return a reverse_iterator to end reverse traversing the
-        //  UList.
+        //- Return reverse_iterator to end reverse traversing the UList.
         inline reverse_iterator rend();
 
 
@@ -243,12 +245,16 @@ public:
         //- Reverse iterator for reverse traversal of constant UList.
         typedef const T* const_reverse_iterator;
 
-        //- Return a const_reverse_iterator to begin reverse traversing the
-        //  UList.
+        //- Return const_reverse_iterator to begin reverse traversing the UList.
+        inline const_reverse_iterator crbegin() const;
+
+        //- Return const_reverse_iterator to end reverse traversing the UList.
+        inline const_reverse_iterator crend() const;
+
+        //- Return const_reverse_iterator to begin reverse traversing the UList.
         inline const_reverse_iterator rbegin() const;
 
-        //- Return a const_reverse_iterator to end reverse traversing the
-        //  UList.
+        //- Return const_reverse_iterator to end reverse traversing the UList.
         inline const_reverse_iterator rend() const;
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index e6fbb5230b..7d8d87006c 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -161,6 +161,13 @@ Foam::UList<T>::begin() const
     return v_;
 }
 
+template<class T>
+inline typename Foam::UList<T>::const_iterator
+Foam::UList<T>::cbegin() const
+{
+    return v_;
+}
+
 template<class T>
 inline typename Foam::UList<T>::iterator
 Foam::UList<T>::end()
@@ -175,6 +182,13 @@ Foam::UList<T>::end() const
     return &v_[size_];
 }
 
+template<class T>
+inline typename Foam::UList<T>::const_iterator
+Foam::UList<T>::cend() const
+{
+    return &v_[size_];
+}
+
 template<class T>
 inline typename Foam::UList<T>::iterator
 Foam::UList<T>::rbegin()
@@ -189,6 +203,13 @@ Foam::UList<T>::rbegin() const
     return &v_[size_-1];
 }
 
+template<class T>
+inline typename Foam::UList<T>::const_iterator
+Foam::UList<T>::crbegin() const
+{
+    return &v_[size_-1];
+}
+
 template<class T>
 inline typename Foam::UList<T>::iterator
 Foam::UList<T>::rend()
@@ -203,6 +224,13 @@ Foam::UList<T>::rend() const
     return &v_[-1];
 }
 
+template<class T>
+inline typename Foam::UList<T>::const_iterator
+Foam::UList<T>::crend() const
+{
+    return &v_[-1];
+}
+
 template<class T>
 inline Foam::label Foam::UList<T>::size() const
 {
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index 05e0078701..cfcae36718 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -124,6 +124,9 @@ public:
             //- Return the number of elements in the UPtrList
             inline label size() const;
 
+            //- Return true if the UPtrList is empty (i.e., if size() == 0).
+            inline bool empty() const;
+
 
         // Edit
 
@@ -132,6 +135,11 @@ public:
             //  the end of a UPtrList.
             void setSize(const label);
 
+            //- Reset size of UPtrList.  This can only be used to set the size
+            //  of an empty UPtrList, extend a UPtrList, remove entries from
+            //  the end of a UPtrList.
+            inline void resize(const label);
+
             //- Clear the UPtrList, i.e. set size to zero
             void clear();
 
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
index 73663843d8..859f54fce5 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrListI.H
@@ -35,13 +35,26 @@ inline Foam::label Foam::UPtrList<T>::size() const
 }
 
 
+template<class T>
+inline bool Foam::UPtrList<T>::empty() const
+{
+    return ptrs_.empty();
+}
+
+
+template<class T>
+inline void Foam::UPtrList<T>::resize(const label newSize)
+{
+    this->setSize(newSize);
+}
+
+
 template<class T>
 inline bool Foam::UPtrList<T>::set(const label i) const
 {
     return ptrs_[i] != NULL;
 }
 
-
 template<class T>
 inline T* Foam::UPtrList<T>::set(const label i, T* ptr)
 {
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index ca74393cab..684ceb979e 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -189,11 +189,21 @@ public:
                 return IDLList<ParticleType>::begin();
             };
 
+            const const_iterator cbegin() const
+            {
+                return IDLList<ParticleType>::cbegin();
+            };
+
             const const_iterator end() const
             {
                 return IDLList<ParticleType>::end();
             };
 
+            const const_iterator cend() const
+            {
+                return IDLList<ParticleType>::cend();
+            };
+
             iterator begin()
             {
                 return IDLList<ParticleType>::begin();
diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H
index a2a5ec7abe..644b0e84a0 100644
--- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H
+++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.H
@@ -192,9 +192,11 @@ public:
         //  the current face. For boundary edges this is the first boundary face
         //  reached from walking back (i.e. in opposite direction to ++)
         inline edgeFaceCirculator begin() const;
+        inline edgeFaceCirculator cbegin() const;
 
         //- iterator set to beyond the end of the walk.
         inline const edgeFaceCirculator& end() const;
+        inline const edgeFaceCirculator& cend() const;
 };
 
 
diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H b/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
index 558d0c7526..d8511c4fb6 100644
--- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
+++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculatorI.H
@@ -419,10 +419,34 @@ Foam::edgeFaceCirculator Foam::edgeFaceCirculator::begin() const
 }
 
 
+Foam::edgeFaceCirculator Foam::edgeFaceCirculator::cbegin() const
+{
+    edgeFaceCirculator iter
+    (
+        mesh_,
+        faceLabel_,
+        ownerSide_,
+        index_,
+        isBoundaryEdge_
+    );
+
+    if (isBoundaryEdge_)
+    {
+        iter.setCanonical();
+    }
+    return iter;
+}
+
+
 const Foam::edgeFaceCirculator& Foam::edgeFaceCirculator::end() const
 {
     return endConstIter;
 }
 
+const Foam::edgeFaceCirculator& Foam::edgeFaceCirculator::cend() const
+{
+    return endConstIter;
+}
+
 
 // ************************************************************************* //
diff --git a/src/meshTools/octree/octree.C b/src/meshTools/octree/octree.C
index 554af3ad5a..fa180fd9c1 100644
--- a/src/meshTools/octree/octree.C
+++ b/src/meshTools/octree/octree.C
@@ -879,6 +879,14 @@ Foam::octree<Type>::begin() const
 }
 
 
+template <class Type>
+typename Foam::octree<Type>::const_iterator
+Foam::octree<Type>::cbegin() const
+{
+    return const_iterator(*this, 0);
+}
+
+
 template <class Type>
 const typename Foam::octree<Type>::const_iterator&
 Foam::octree<Type>::end() const
@@ -887,6 +895,14 @@ Foam::octree<Type>::end() const
 }
 
 
+template <class Type>
+const typename Foam::octree<Type>::const_iterator&
+Foam::octree<Type>::cend() const
+{
+    return octree<Type>::endConstIter_;
+}
+
+
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 template <class Type>
diff --git a/src/meshTools/octree/octree.H b/src/meshTools/octree/octree.H
index 33c62def01..8f79723242 100644
--- a/src/meshTools/octree/octree.H
+++ b/src/meshTools/octree/octree.H
@@ -445,10 +445,6 @@ public:
             //- Construct for a given octree and index
             const_iterator(const octree&, label);
 
-            // Member functions
-
-                const_iterator begin() const;
-
             // Member operators
 
                 void operator=(const const_iterator&);
@@ -465,9 +461,11 @@ public:
 
         //- const_iterator set to the begining of the octree
         inline const_iterator begin() const;
+        inline const_iterator cbegin() const;
 
         //- const_iterator set to beyond the end of the octree
         inline const const_iterator& end() const;
+        inline const const_iterator& cend() const;
 
 
     // IOstream Operators
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index a2fb0c7d1f..bd692647ab 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -102,6 +102,9 @@ private:
 
     // Private member functions
 
+        //- Disable resize with value
+        void resize(const label, const Face&);
+
         //- Disable setSize with value
         void setSize(const label, const Face&);
 

From d9096c1e476198f8da64dcc8978cfd1eb2512af6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 20 Jan 2009 17:14:53 +0100
Subject: [PATCH 15/32] cosmetics

---
 applications/test/dictionary/testDictRegex    | 14 ++++++------
 .../mesh/manipulation/cellSet/cellSetDict     | 22 +++++++++----------
 .../mesh/manipulation/faceSet/faceSetDict     |  4 ++--
 .../mesh/manipulation/pointSet/pointSetDict   | 14 ++++++------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex
index 01d4274ba8..ee4bf298e0 100644
--- a/applications/test/dictionary/testDictRegex
+++ b/applications/test/dictionary/testDictRegex
@@ -15,21 +15,21 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #inputMode  merge
 
-".*"        parentValue1;
-"[n-z].*"   parentValue2;
-"f.*"       parentValue3;
+'.*'        parentValue1;
+'[n-z].*'   parentValue2;
+'f.*'       parentValue3;
 keyX        parentValue4;
 keyY        parentValue5;
 
-"(.*)Dict"
+'(.*)Dict'
 {
     foo         subdictValue0;
     bar         $f.*;         // should this really match 'foo'?
 
     // result is dependent on insert order!
-    "a.*c"      subdictValue3;
-    "ab.*"      subdictValue2;
-    "a.*"       subdictValue1;
+    'a.*c'      subdictValue3;
+    'ab.*'      subdictValue2;
+    'a.*'       subdictValue1;
     abcd        \1;
 }
 
diff --git a/applications/utilities/mesh/manipulation/cellSet/cellSetDict b/applications/utilities/mesh/manipulation/cellSet/cellSetDict
index 9589b484eb..61f8ed4432 100644
--- a/applications/utilities/mesh/manipulation/cellSet/cellSetDict
+++ b/applications/utilities/mesh/manipulation/cellSet/cellSetDict
@@ -82,7 +82,7 @@ topoSetSources
     // Cells in cell zone
     zoneToCell
     {
-        name ".*Zone";      // name of cellZone, wildcards allowed.
+        name '.*Zone';      // Name of cellZone, regular expressions allowed
     }
 
     // values of field within certain range
@@ -102,16 +102,16 @@ topoSetSources
     // Select based on surface
     surfaceToCell
     {
-        file                "www.avl.com-geometry.stl";
-        outsidePoints       ((-99 -99 -59));    // definition of outside
-        includeCut          false;              // cells cut by surface
-        includeInside       false;              // cells not on outside of surf
-        includeOutside      false;              // cells on outside of surf
-        nearDistance        -1;                 // cells with centre near surf
-                                                // (set to -1 if not used)
-        curvature           0.9;                // cells within nearDistance
-                                                // and near surf curvature
-                                                // (set to -100 if not used)
+        file            "www.avl.com-geometry.stl";
+        outsidePoints   ((-99 -99 -59));    // definition of outside
+        includeCut      false;              // cells cut by surface
+        includeInside   false;              // cells not on outside of surf
+        includeOutside  false;              // cells on outside of surf
+        nearDistance    -1;                 // cells with centre near surf
+                                            // (set to -1 if not used)
+        curvature       0.9;                // cells within nearDistance
+                                            // and near surf curvature
+                                            // (set to -100 if not used)
     }
 );
 
diff --git a/applications/utilities/mesh/manipulation/faceSet/faceSetDict b/applications/utilities/mesh/manipulation/faceSet/faceSetDict
index 4d5abe2a5e..04c0ee2837 100644
--- a/applications/utilities/mesh/manipulation/faceSet/faceSetDict
+++ b/applications/utilities/mesh/manipulation/faceSet/faceSetDict
@@ -56,13 +56,13 @@ topoSetSources
     // All faces of patch
     patchToFace
     {
-        name ".*Wall";      // Name of patch, regular expressions allowed
+        name '.*Wall';      // Name of patch, regular expressions allowed
     }
 
     // All faces of faceZone
     zoneToFace
     {
-        name ".*Zone1";     // Name of faceZone, regular expressions allowed
+        name '.*Zone1';     // Name of faceZone, regular expressions allowed
     }
 
     // Faces with face centre within box
diff --git a/applications/utilities/mesh/manipulation/pointSet/pointSetDict b/applications/utilities/mesh/manipulation/pointSet/pointSetDict
index 5c19ea60fe..b7215c64e6 100644
--- a/applications/utilities/mesh/manipulation/pointSet/pointSetDict
+++ b/applications/utilities/mesh/manipulation/pointSet/pointSetDict
@@ -60,18 +60,18 @@ topoSetSources
     // All points in pointzone
     zoneToPoint
     {
-        name ".*Zone";      // name of pointZone, wildcards allowed.
+        name '.*Zone';      // name of pointZone, regular expressions allowed
     }
 
     // Select based on surface
     surfaceToPoint
     {
-        file                "www.avl.com-geometry.stl";
-        nearDistance        0.1;    // points near to surface
-        includeInside       false;  // points on inside of surface
-                                    // (requires closed surface with consistent
-                                    //  normals)
-        includeOutside      false;  //   ,,    outside  ,,
+        file            "www.avl.com-geometry.stl";
+        nearDistance    0.1;    // points near to surface
+        includeInside   false;  // points on inside of surface
+                                // (requires closed surface with consistent
+                                //  normals)
+        includeOutside  false;  //   ,,    outside  ,,
     }
 );
 

From 0690c64d31691004963e92b7098f89783e62971c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 21 Jan 2009 01:19:31 +0100
Subject: [PATCH 16/32] PrimitivePatchExtra orientation fixed and improved
 face::edgeDirection()

---
 .../surfaceMeshConvert/surfaceMeshConvert.C   | 32 +++++++++++++
 src/OpenFOAM/meshes/meshShapes/face/face.C    | 46 +++++++++---------
 .../PrimitivePatchExtra/PrimitivePatchExtra.H |  7 +--
 .../PrimitivePatchExtraAddressing.C           | 21 ++++----
 .../PrimitivePatchExtraCleanup.C              | 48 +++++++++++--------
 5 files changed, 96 insertions(+), 58 deletions(-)

diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 235c812bff..65d62f4b67 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -34,6 +34,9 @@ Usage
     @param -clean \n
     Perform some surface checking/cleanup on the input surface
 
+    @param -orient \n
+    Check face orientation on the input surface
+
     @param -scale \<scale\> \n
     Specify a scaling factor for writing the files
 
@@ -68,6 +71,7 @@ int main(int argc, char *argv[])
     argList::validArgs.append("inputFile");
     argList::validArgs.append("outputFile");
     argList::validOptions.insert("clean", "");
+    argList::validOptions.insert("orient", "");
     argList::validOptions.insert("scale", "scale");
     argList::validOptions.insert("triSurface", "");
     argList::validOptions.insert("unsorted", "");
@@ -108,6 +112,13 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
+        if (args.options().found("orient"))
+        {
+            Info<< "Checking surface orientation" << endl;
+            surf.checkOrientation(true);
+            Info<< endl;
+        }
+
         if (args.options().found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
@@ -140,6 +151,13 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
+        if (args.options().found("orient"))
+        {
+            Info<< "Checking surface orientation" << endl;
+            surf.checkOrientation(true);
+            Info<< endl;
+        }
+
         if (args.options().found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
@@ -171,6 +189,13 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
+        if (args.options().found("orient"))
+        {
+            Info<< "Checking surface orientation" << endl;
+            surf.checkOrientation(true);
+            Info<< endl;
+        }
+
         if (args.options().found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
@@ -202,6 +227,13 @@ int main(int argc, char *argv[])
         surf.writeStats(Info);
         Info<< endl;
 
+        if (args.options().found("orient"))
+        {
+            Info<< "Checking surface orientation" << endl;
+            surf.checkOrientation(true);
+            Info<< endl;
+        }
+
         if (args.options().found("clean"))
         {
             Info<< "Cleaning up surface" << endl;
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index b6c8370f77..f371e697a1 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -713,41 +713,43 @@ Foam::edgeList Foam::face::edges() const
 
 int Foam::face::edgeDirection(const edge& e) const
 {
-    if (size() > 2)
+    forAll (*this, i)
     {
-        edge found(-1,-1);
-
-        // find start/end points - this breaks down for degenerate faces
-        forAll (*this, i)
+        if (operator[](i) == e.start())
         {
-            if (operator[](i) == e.start())
+            if (operator[](rcIndex(i)) == e.end())
             {
-                found.start() = i;
+                // reverse direction
+                return -1;
             }
-            else if (operator[](i) == e.end())
+            else if (operator[](fcIndex(i)) == e.end())
             {
-                found.end() = i;
+                // forward direction
+                return 1;
             }
-        }
 
-        label diff = found.end() - found.start();
-        if (!diff || found.start() < 0 || found.end() < 0)
-        {
+            // no match
             return 0;
         }
+        else if (operator[](i) == e.end())
+        {
+            if (operator[](rcIndex(i)) == e.start())
+            {
+                // forward direction
+                return 1;
+            }
+            else if (operator[](fcIndex(i)) == e.start())
+            {
+                // reverse direction
+                return -1;
+            }
 
-        // forward direction
-        if (diff == 1 || diff == 1 - size())
-        {
-            return 1;
-        }
-        // reverse direction
-        if (diff ==  -1 || diff == -1 + size())
-        {
-            return -1;
+            // no match
+            return 0;
         }
     }
 
+    // not found
     return 0;
 }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtra.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtra.H
index 2a132d914c..3818fcbfb5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtra.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtra.H
@@ -125,11 +125,8 @@ public:
 
     // Topological data; no mesh required.
 
-        //- Return edge-face addressing sorted
-        //  (for edges with more than 2 faces) according to the
-        //  angle around the edge.
-        //  Orientation is anticlockwise looking from
-        //  edge.vec(localPoints())
+        //- Return edge-face addressing sorted by angle around the edge.
+        //  Orientation is anticlockwise looking from edge.vec(localPoints())
         const labelListList& sortedEdgeFaces() const;
 
         //- If 2 face neighbours: label of face where ordering of edge
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraAddressing.C
index 8d33ad2762..98782ea40b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraAddressing.C
@@ -171,26 +171,25 @@ calcEdgeOwner() const
     forAll(edgeLst, edgeI)
     {
         const edge& e = edgeLst[edgeI];
+        const labelList& neighbouringFaces = eFaces[edgeI];
 
-        const labelList& myFaces = eFaces[edgeI];
-
-        if (myFaces.size() == 1)
+        if (neighbouringFaces.size() == 1)
         {
-            edgeOwner[edgeI] = myFaces[0];
+            edgeOwner[edgeI] = neighbouringFaces[0];
         }
         else
         {
             // Find the first face whose vertices are aligned with the edge.
-            // (in case of multiply connected edge the best we can do)
+            // with multiply connected edges, this is the best we can do
             edgeOwner[edgeI] = -1;
 
-            forAll(myFaces, i)
+            forAll(neighbouringFaces, i)
             {
-                const Face& f = locFaceLst[myFaces[i]];
+                const Face& f = locFaceLst[neighbouringFaces[i]];
 
-                if (f.findEdge(e) > 0)
+                if (f.edgeDirection(e) > 0)
                 {
-                    edgeOwner[edgeI] = myFaces[i];
+                    edgeOwner[edgeI] = neighbouringFaces[i];
                     break;
                 }
             }
@@ -203,9 +202,9 @@ calcEdgeOwner() const
                     "calcEdgeOwner()"
                 )
                     << "Edge " << edgeI << " vertices:" << e
-                    << " is used by faces " << myFaces
+                    << " is used by faces " << neighbouringFaces
                     << " vertices:"
-                    << IndirectList<Face>(locFaceLst, myFaces)()
+                    << IndirectList<Face>(locFaceLst, neighbouringFaces)()
                     << " none of which use the edge vertices in the same order"
                     << nl << "I give up" << abort(FatalError);
             }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
index e34b2a2a44..c825f44a0e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
@@ -99,6 +99,11 @@ checkOrientation
     const Field<PointType>& pointLst = this->points();
     const vectorField& normLst = this->faceNormals();
 
+    if (ParentType::debug)
+    {
+        Info<<"checkOrientation:::checkOrientation(bool)" << endl;
+    }
+
     // Check edge normals, face normals, point normals.
     forAll(faceEs, faceI)
     {
@@ -153,8 +158,8 @@ checkOrientation
             (
                 "PrimitivePatchExtra::checkOrientation(bool)"
             )
-                << "Normal calculated from points not consistent with "
-                << "faceNormal" << nl
+                << "Normal calculated from points inconsistent with faceNormal"
+                << nl
                 << "face: " << f << nl
                 << "points: " << p0 << ' ' << p1 << ' ' << p2 << nl
                 << "pointNormal:" << pointNormal << nl
@@ -174,21 +179,18 @@ checkOrientation
     forAll(edgeLst, edgeI)
     {
         const edge& e = edgeLst[edgeI];
-        const labelList& neighbours = eFaces[edgeI];
+        const labelList& neighbouringFaces = eFaces[edgeI];
 
-        if (neighbours.size() == 2)
+        if (neighbouringFaces.size() == 2)
         {
-            const Face& faceA = faceLst[neighbours[0]];
-            const Face& faceB = faceLst[neighbours[1]];
+            // we use localFaces() since edges() are LOCAL
+            // these are both already available
+            const Face& faceA = this->localFaces()[neighbouringFaces[0]];
+            const Face& faceB = this->localFaces()[neighbouringFaces[1]];
 
-            // The edge cannot be going in the same direction if both faces
-            // are oriented counterclockwise.
-            // Thus the next face point *must* different between the faces.
-            if
-            (
-                faceA[faceA.fcIndex(findIndex(faceA, e.start()))]
-             == faceB[faceB.fcIndex(findIndex(faceB, e.start()))]
-            )
+            // If the faces are correctly oriented, the edges must go in
+            // different directions on connected faces.
+            if (faceA.edgeDirection(e) == faceB.edgeDirection(e))
             {
                 borderEdge[edgeI] = true;
                 if (verbose)
@@ -198,14 +200,20 @@ checkOrientation
                         "PrimitivePatchExtra::checkOrientation(bool)"
                     )
                         << "face orientation incorrect." << nl
-                        << "edge[" << edgeI << "] " << e
-                        << " between faces " << neighbours << ":" << nl
-                        << "face[" << neighbours[0] << "] " << faceA << nl
-                        << "face[" << neighbours[1] << "] " << faceB << endl;
+                        << "localEdge[" << edgeI << "] " << e
+                        << " between faces:" << nl
+                        << "  face[" << neighbouringFaces[0] << "] "
+                        << faceLst[neighbouringFaces[0]]
+                        << "   localFace: " << faceA
+                        << nl
+                        << "  face[" << neighbouringFaces[1] << "] "
+                        << faceLst[neighbouringFaces[1]]
+                        << "   localFace: " << faceB
+                        << endl;
                 }
             }
         }
-        else if (neighbours.size() != 1)
+        else if (neighbouringFaces.size() != 1)
         {
             if (verbose)
             {
@@ -217,7 +225,7 @@ checkOrientation
                     << "edge[" << edgeI << "] " << e
                     << " with points:" << locPointsLst[e.start()]
                     << ' ' << locPointsLst[e.end()]
-                    << " has neighbours:" << neighbours << endl;
+                    << " has neighbouringFaces:" << neighbouringFaces << endl;
             }
             borderEdge[edgeI] = true;
         }

From 6d57bb4e7ba216118d18cbe79ac30de3e5ac52bc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 21 Jan 2009 11:30:10 +0100
Subject: [PATCH 17/32] added PackedBoolList typedef (used everywhere) and
 improved PackedList

- new members:  capacity(), two-argument resize()/setSize(), const storage()
- new static members: max_value(), packing(), etc.
---
 .../combustion/PDRFoam/PDRFoamAutoRefine.C    |   2 +-
 applications/test/PackedList/Make/files       |   3 +
 applications/test/PackedList/Make/options     |   0
 applications/test/PackedList/PackedListTest.C | 106 +++++++++++
 .../advanced/collapseEdges/collapseEdges.C    |  12 +-
 .../polyDualMesh/makePolyDualMesh.C           |   6 +-
 .../conversion/polyDualMesh/meshDualiser.C    |   6 +-
 .../conversion/polyDualMesh/meshDualiser.H    |   6 +-
 .../containers/Lists/PackedList/PackedList.C  |  36 +++-
 .../containers/Lists/PackedList/PackedList.H  | 131 +++++++++-----
 .../containers/Lists/PackedList/PackedListI.H | 171 ++++++++++--------
 .../meshes/polyMesh/syncTools/syncTools.C     |  18 +-
 .../meshes/polyMesh/syncTools/syncTools.H     |  10 +-
 .../polyMesh/syncTools/syncToolsTemplates.C   |   6 +-
 .../primitives/Lists/PackedBoolList.H         |  50 +++++
 .../autoHexMeshDriver/autoLayerDriver.H       |  12 +-
 .../autoHexMeshDriver/autoLayerDriverShrink.C |  16 +-
 .../autoLayerDriverTemplates.C                |   2 +-
 .../autoHexMeshDriver/autoSnapDriver.C        |  10 +-
 .../autoHexMeshDriver/autoSnapDriver.H        |   2 +-
 .../meshRefinement/meshRefinement.C           |   6 +-
 .../meshRefinementProblemCells.C              |   4 +-
 .../meshRefinement/meshRefinementRefine.C     |   6 +-
 .../refinementSurfaces/refinementSurfaces.H   |   2 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C |  22 +--
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.H |  20 +-
 .../motionSmoother/motionSmoother.C           |  18 +-
 .../motionSmoother/motionSmoother.H           |  12 +-
 .../polyTopoChange/addPatchCellLayer.C        |   2 +-
 .../polyTopoChange/polyTopoChange/hexRef8.C   |  18 +-
 .../polyTopoChange/polyTopoChange/hexRef8.H   |   4 +-
 .../polyTopoChange/polyTopoChange.C           |   2 +-
 .../polyTopoChange/polyTopoChange.H           |   2 +-
 src/meshTools/indexedOctree/treeDataFace.H    |   4 +-
 .../distributedTriSurfaceMesh.C               |   4 +-
 .../sampledSurface/isoSurface/isoSurface.C    |   4 +-
 .../sampledSurface/isoSurface/isoSurface.H    |   6 +-
 .../isoSurface/isoSurfaceCell.C               |  14 +-
 .../isoSurface/isoSurfaceCell.H               |  12 +-
 src/triSurface/triSurface/triSurface.C        |   5 +-
 40 files changed, 513 insertions(+), 259 deletions(-)
 create mode 100644 applications/test/PackedList/Make/files
 create mode 100644 applications/test/PackedList/Make/options
 create mode 100644 applications/test/PackedList/PackedListTest.C
 create mode 100644 src/OpenFOAM/primitives/Lists/PackedBoolList.H

diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 7573b8f537..53ae8af8be 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -119,7 +119,7 @@ scalar StCoNum = 0.0;
             fvc::makeAbsolute(phi, rho, U);
 
             // Test : disable refinement for some cells
-            PackedList<1>& protectedCell =
+            PackedBoolList& protectedCell =
                 refCast<dynamicRefineFvMesh>(mesh).protectedCell();
 
             if (protectedCell.empty())
diff --git a/applications/test/PackedList/Make/files b/applications/test/PackedList/Make/files
new file mode 100644
index 0000000000..e06685c8b3
--- /dev/null
+++ b/applications/test/PackedList/Make/files
@@ -0,0 +1,3 @@
+PackedListTest.C
+
+EXE = $(FOAM_USER_APPBIN)/PackedListTest
diff --git a/applications/test/PackedList/Make/options b/applications/test/PackedList/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/PackedList/PackedListTest.C b/applications/test/PackedList/PackedListTest.C
new file mode 100644
index 0000000000..a3767e8680
--- /dev/null
+++ b/applications/test/PackedList/PackedListTest.C
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "OSspecific.H"
+
+#include "IOstreams.H"
+#include "IStringStream.H"
+#include "scalar.H"
+#include "vector.H"
+#include "ListOps.H"
+#include "List.H"
+#include "PackedBoolList.H"
+#include <bitset>
+
+using namespace Foam;
+
+template <int nBits>
+void printPackedList(const PackedList<nBits>& L)
+{
+    const List<unsigned int>& stor = L.storage();
+
+    cout<< "PackedList<" << nBits << ">"
+        << " max_bits:"  << L.max_bits()
+        << " max_value:" << L.max_value()
+        << " packing:"   << L.packing() << nl;
+
+    cout<< "values:  " << L.size() << "/" << L.capacity() << " ( ";
+    forAll(L, i)
+    {
+        cout<< L[i] << ' ';
+    }
+    cout<< ")\n\n";
+
+    cout<< "storage: " << stor.size() << "( ";
+    forAll(stor, i)
+    {
+        cout<< std::bitset<32>(stor[i]) << ' ';
+    }
+    cout<< ")\n" << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{    
+    cout<< "PackedList::max_bits() = " << PackedList<0>::max_bits() << nl;
+
+    PackedList<3> list1(5,1);
+
+    printPackedList(list1);
+
+    list1 = 2;
+    printPackedList(list1);
+
+    list1.resize(6, 3);
+    printPackedList(list1);
+
+    list1 = false;
+    printPackedList(list1);
+
+    list1 = true;
+    printPackedList(list1);
+
+    list1.resize(12);
+    printPackedList(list1);
+
+    list1.resize(25, list1.max_value());
+    printPackedList(list1);
+
+    list1.resize(8);
+    printPackedList(list1);
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
index e2eb989905..c92418dc80 100644
--- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
+++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
@@ -48,7 +48,7 @@ Description
 #include "polyMesh.H"
 #include "mapPolyMesh.H"
 #include "mathematicalConstants.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 #include "SortableList.H"
 
 using namespace Foam;
@@ -177,7 +177,7 @@ label mergeEdges
 
 
 // Return master point edge needs to be collapsed to (or -1)
-label edgeMaster(const PackedList<1>& boundaryPoint, const edge& e)
+label edgeMaster(const PackedBoolList& boundaryPoint, const edge& e)
 {
     label masterPoint = -1;
 
@@ -215,7 +215,7 @@ label edgeMaster(const PackedList<1>& boundaryPoint, const edge& e)
 label collapseSmallEdges
 (
     const polyMesh& mesh,
-    const PackedList<1>& boundaryPoint,
+    const PackedBoolList& boundaryPoint,
     const scalar minLen,
     edgeCollapser& collapser
 )
@@ -254,7 +254,7 @@ label collapseSmallEdges
 label collapseHighAspectFaces
 (
     const polyMesh& mesh,
-    const PackedList<1>& boundaryPoint,
+    const PackedBoolList& boundaryPoint,
     const scalar areaFac,
     const scalar edgeRatio,
     edgeCollapser& collapser
@@ -346,7 +346,7 @@ void set(const labelList& elems, const bool val, boolList& status)
 label simplifyFaces
 (
     const polyMesh& mesh,
-    const PackedList<1>& boundaryPoint,
+    const PackedBoolList& boundaryPoint,
     const label minSize,
     const scalar lenGap,
     edgeCollapser& collapser
@@ -485,7 +485,7 @@ int main(int argc, char *argv[])
         const faceList& faces = mesh.faces();
 
         // Get all points on the boundary
-        PackedList<1> boundaryPoint(mesh.nPoints(), false);
+        PackedBoolList boundaryPoint(mesh.nPoints());
 
         label nIntFaces = mesh.nInternalFaces();
         for (label faceI = nIntFaces; faceI < mesh.nFaces(); faceI++)
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
index 3470fd71cc..b647ec8d13 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
@@ -49,7 +49,7 @@ Description
 #include "mathematicalConstants.H"
 #include "polyTopoChange.H"
 #include "mapPolyMesh.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 #include "meshTools.H"
 #include "OFstream.H"
 #include "meshDualiser.H"
@@ -67,7 +67,7 @@ using namespace Foam;
 void simpleMarkFeatures
 (
     const polyMesh& mesh,
-    const PackedList<1>& isBoundaryEdge,
+    const PackedBoolList& isBoundaryEdge,
     const scalar featureAngle,
     const bool doNotPreserveFaceZones,
 
@@ -358,7 +358,7 @@ int main(int argc, char *argv[])
     // Mark boundary edges and points.
     // (Note: in 1.4.2 we can use the built-in mesh point ordering
     //  facility instead)
-    PackedList<1> isBoundaryEdge(mesh.nEdges());
+    PackedBoolList isBoundaryEdge(mesh.nEdges());
     for (label faceI = mesh.nInternalFaces(); faceI < mesh.nFaces(); faceI++)
     {
         const labelList& fEdges = mesh.faceEdges()[faceI];
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
index 2a307e5df2..08b7d7c9b8 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
@@ -155,7 +155,7 @@ Foam::label Foam::meshDualiser::findDualCell
 // from (boundary & feature) point
 void Foam::meshDualiser::generateDualBoundaryEdges
 (
-    const PackedList<1>& isBoundaryEdge,
+    const PackedBoolList& isBoundaryEdge,
     const label pointI,
     polyTopoChange& meshMod
 )
@@ -388,7 +388,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
 void Foam::meshDualiser::createFacesAroundEdge
 (
     const bool splitFace,
-    const PackedList<1>& isBoundaryEdge,
+    const PackedBoolList& isBoundaryEdge,
     const label edgeI,
     const label startFaceI,
     polyTopoChange& meshMod,
@@ -907,7 +907,7 @@ void Foam::meshDualiser::setRefinement
     // Mark boundary edges and points.
     // (Note: in 1.4.2 we can use the built-in mesh point ordering
     //  facility instead)
-    PackedList<1> isBoundaryEdge(mesh_.nEdges());
+    PackedBoolList isBoundaryEdge(mesh_.nEdges());
     for (label faceI = mesh_.nInternalFaces(); faceI < mesh_.nFaces(); faceI++)
     {
         const labelList& fEdges = mesh_.faceEdges()[faceI];
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
index ee5599816c..dafcd0a74d 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
@@ -49,7 +49,7 @@ SourceFiles
 #define meshDualiser_H
 
 #include "DynamicList.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 #include "boolList.H"
 #include "typeInfo.H"
 
@@ -101,7 +101,7 @@ class meshDualiser
         //  emanating from (boundary & feature) point
         void generateDualBoundaryEdges
         (
-            const PackedList<1>&,
+            const PackedBoolList&,
             const label pointI,
             polyTopoChange&
         );
@@ -144,7 +144,7 @@ class meshDualiser
         void createFacesAroundEdge
         (
             const bool splitFace,
-            const PackedList<1>&,
+            const PackedBoolList&,
             const label edgeI,
             const label startFaceI,
             polyTopoChange&,
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 252b369067..ff006523fc 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -31,7 +31,7 @@ License
 template<int nBits>
 Foam::PackedList<nBits>::PackedList(const label size, const unsigned int val)
 :
-    List<unsigned int>(intSize(size)),
+    List<unsigned int>(storageSize(size)),
     size_(size)
 {
     operator=(val);
@@ -56,7 +56,7 @@ Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
 template<int nBits>
 Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
 :
-    List<unsigned int>(intSize(lst.size()), 0),
+    List<unsigned int>(storageSize(lst.size()), 0),
     size_(lst.size())
 {
     forAll(lst, i)
@@ -76,10 +76,36 @@ Foam::autoPtr<Foam::PackedList<nBits> > Foam::PackedList<nBits>::clone() const
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int nBits>
-void Foam::PackedList<nBits>::setSize(const label size)
+void Foam::PackedList<nBits>::setSize(const label newSize)
 {
-    List<unsigned int>::setSize(intSize(size));
-    size_ = size;
+    List<unsigned int>::setSize(storageSize(newSize), 0);
+    size_ = newSize;
+}
+
+
+template<int nBits>
+void Foam::PackedList<nBits>::setSize
+(
+    const label newSize,
+    const unsigned int& val
+)
+{
+#   ifdef DEBUGList
+    checkValue(val);
+#   endif
+
+    List<unsigned int>::setSize(storageSize(newSize), 0);
+
+    if (val && newSize > size_)
+    {
+        // fill new elements
+        for (label i = size_; i < newSize; i++)
+        {
+            set(i, val);
+        }
+    }
+    
+    size_ = newSize;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 92493d557d..a6544b59a4 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -27,8 +27,14 @@ Class
 
 Description
     List of packed unsigned ints.
+
     Gets given the number of bits per item.
 
+ToDo
+    Add checks for bad template parameters (ie, nBits=0, nBits too large).
+    Could make PackedBitRef an iterator and use for traversing as well.
+    It could be useful to make PackedList behave a bit like DynamicList.
+
 SourceFiles
     PackedListI.H
     PackedList.C
@@ -54,45 +60,55 @@ TemplateName(PackedList);
 
 
 /*---------------------------------------------------------------------------*\
-                        Class PackedList Declaration
+                        Class PackedBitRef Declaration
 \*---------------------------------------------------------------------------*/
 
-//- For PackedList
-class reference
+//- The PackedBitRef is used for PackedList
+class PackedBitRef
 {
+private:
+
     // private data
     unsigned int& elem_;
 
-    unsigned int mask_;
+    const label startBit_;
 
-    label startBit_;
+    const unsigned int mask_;
 
 public:
 
-    inline reference(unsigned int& elem, unsigned int mask, label startBit)
+    inline PackedBitRef(unsigned int& elem, label startBit, unsigned int mask)
     :
         elem_(elem),
-        mask_(mask),
-        startBit_(startBit)
+        startBit_(startBit),
+        mask_(mask)
     {}
 
     inline void operator=(const unsigned int val)
     {
         unsigned int shiftedMask = mask_ << startBit_;
-
-        unsigned int shiftedVal = val << startBit_;
+        unsigned int shiftedVal  = (val & mask_) << startBit_;
 
         elem_ = (elem_ & ~shiftedMask) | shiftedVal;
     }
 
     inline operator unsigned int () const
     {
-        return (elem_ >> startBit_) & mask_;
+        return ((elem_ >> startBit_) & mask_);
+    }
+
+    inline operator bool() const
+    {
+        return !!((elem_ >> startBit_) & mask_);
     }
 
 };
 
 
+/*---------------------------------------------------------------------------*\
+                         Class PackedList Declaration
+\*---------------------------------------------------------------------------*/
+
 template <int nBits>
 class PackedList
 :
@@ -103,23 +119,36 @@ class PackedList
         //- Number of nBits entries
         label size_;
 
-
     // Private Member Functions
 
         //- Calculate underlying list size
-        inline static label intSize(const label sz);
+        inline static label storageSize(const label);
 
-        //- Calculate index into underlying List.
-        inline static label intIndex(const label i);
+        //- Calculate element index and offset (start) bit within storage
+        inline static label location(const label, label& offset);
+
+        //- Check if value is representable in nBits
+        inline static void checkValue(const unsigned int);
 
         //- Check index i is within valid range (0 ... size-1).
-        inline void checkIndex(const label i) const;
-
-        //- Check value is representable in nBits
-        inline void checkValue(const unsigned int val) const;
+        inline void checkIndex(const label) const;
 
 public:
 
+    // Public data
+
+        //- The max. number of bits that can be templated.
+        //  Might someday be useful for a template assert.
+        inline static unsigned int max_bits();
+
+        //- The max. value for an entry, can also be used as the mask
+        //  eg, ((1 << 2) - 1) yields 0b0011
+        inline static unsigned int max_value();
+
+        //- The number of entries per storage entry
+        inline static unsigned int packing();
+
+
     // Constructors
 
         //- Null constructor
@@ -129,7 +158,7 @@ public:
         inline PackedList(const label size);
 
         //- Construct with given size and value for all elements.
-        PackedList(const label size, const unsigned int val);
+        PackedList(const label size, const unsigned val);
 
         //- Copy constructor.
         PackedList(const PackedList<nBits>& PList);
@@ -145,27 +174,11 @@ public:
 
     // Member Functions
 
-        // Edit
-
-            //- Reset size of List.
-            void setSize(const label);
-
-            //- Reset size of List.
-            inline void resize(const label);
-
-            //- Clear the list, i.e. set size to zero.
-            void clear();
-
-            //- Transfer the contents of the argument List into this List
-            //  and annull the argument list.
-            void transfer(PackedList<nBits>&);
-
-            //- Transfer contents to the Xfer container
-            inline Xfer<PackedList<nBits> > xfer();
-
-
         // Access
 
+            //- The number of elements that can be stored before resizing
+            inline label capacity() const;
+
             //- Number of packed elements
             inline label size() const;
 
@@ -181,20 +194,51 @@ public:
             //- Underlying storage
             inline List<unsigned int>& storage();
 
+            //- Underlying storage
+            inline const List<unsigned int>& storage() const;
+
+
+        // Edit
+
+            //- Reset size of List, setting zero for any new elements.
+            void setSize(const label);
+
+            //- Reset size of List and value for new elements.
+            void setSize(const label, const unsigned int& val);
+
+            //- Reset size of List, setting zero for any new elements.
+            inline void resize(const label);
+
+            //- Reset size of List and value for new elements.
+            inline void resize(const label, const unsigned int& val);
+
+        //- Construct with given size and value for all elements.
+
+            //- Clear the list, i.e. set size to zero.
+            void clear();
+
+            //- Transfer the contents of the argument List into this List
+            //  and annull the argument list.
+            void transfer(PackedList<nBits>&);
+
+            //- Transfer contents to the Xfer container
+            inline Xfer<PackedList<nBits> > xfer();
+
 
     // Member operators
 
             //- Get value at index i
             inline unsigned int operator[](const label i) const;
 
-            //- Set value at index i. Returns proxy which does actual operation
-            inline ::Foam::reference operator[](const label i);
+            //- Set value at index i.
+            //  Returns proxy to perform the actual operation
+            inline ::Foam::PackedBitRef operator[](const label i);
 
             //- Assignment operator. Takes linear time.
             void operator=(const PackedList<nBits>&);
 
-            //- Assignment of all entries to the given value. Does set on all
-            //  elements.
+            //- Assignment of all entries to the given value.
+            //  Does set on all elements.
             inline void operator=(const unsigned int val);
 
             //- Return as labelList
@@ -207,7 +251,6 @@ public:
    //  friend Ostream& operator<< <nBits> (Ostream&, const PackedList<nBits>&);
 };
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 3ccd257813..d753a89426 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -25,33 +25,67 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PackedList_I
-#define PackedList_I
+#ifndef PackedListI_H
+#define PackedListI_H
 
 #include "IOstreams.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Calculate underlying list size
 template<int nBits>
-inline Foam::label Foam::PackedList<nBits>::intSize(const label sz)
+inline unsigned int Foam::PackedList<nBits>::max_bits()
 {
-    const label nElemsPerLabel = sizeof(unsigned int)*8/nBits;
-
-    return (sz+nElemsPerLabel-1)/nElemsPerLabel;
+    return sizeof(unsigned int)*8 - 1;
 }
 
 
-// Convert index into index in integer array
 template<int nBits>
-inline Foam::label Foam::PackedList<nBits>::intIndex(const label i)
+inline unsigned int Foam::PackedList<nBits>::max_value()
 {
-    const label nElemsPerLabel = sizeof(unsigned int)*8/nBits;
+    return ((1u << nBits) - 1);
+}
 
-    // Index in underlying int array
-    label elemI = i/nElemsPerLabel;
 
-    return elemI;
+template<int nBits>
+inline unsigned int Foam::PackedList<nBits>::packing()
+{
+    return sizeof(unsigned int)*8 / nBits;
+}
+
+
+// Calculate underlying list size
+template<int nBits>
+inline Foam::label Foam::PackedList<nBits>::storageSize(const label sz)
+{
+    return (sz + packing() - 1) / packing();
+}
+
+
+template<int nBits>
+inline Foam::label Foam::PackedList<nBits>::location
+(
+    const label i,
+    label& offset
+)
+{
+    // the offset is the start bit within the storage element
+    offset = nBits * (i % packing());
+    return i / packing();
+}
+
+
+// Check value is representable in nBits
+template<int nBits>
+inline void Foam::PackedList<nBits>::checkValue(const unsigned int val)
+{
+    if (val > max_value())
+    {
+        FatalErrorIn("PackedList<T>::checkValue(const unsigned int)")
+            << "value " << label(val) << " out of range 0 ... "
+            << label(max_value())
+            << " representable by " << nBits << " bits"
+            << abort(FatalError);
+    }
 }
 
 
@@ -62,10 +96,10 @@ inline void Foam::PackedList<nBits>::checkIndex(const label i) const
     if (!size_)
     {
         FatalErrorIn("PackedList<nBits>::checkIndex(const label)")
-            << "attempt to access element from zero sized list"
+            << "attempt to access element from zero-sized list"
             << abort(FatalError);
     }
-    else if (i<0 || i>=size_)
+    else if (i < 0 || i >= size_)
     {
         FatalErrorIn("PackedList<nBits>::checkIndex(const label)")
             << "index " << i << " out of range 0 ... " << size_-1
@@ -74,20 +108,6 @@ inline void Foam::PackedList<nBits>::checkIndex(const label i) const
 }
 
 
-// Check value is representable in nBits
-template<int nBits>
-inline void Foam::PackedList<nBits>::checkValue(const unsigned int val) const
-{
-    if (val>=(1u << nBits))
-    {
-        FatalErrorIn("PackedList<T>::checkValue(const unsigned int)")
-            << "value " << label(val) << " out of range 0 ... "
-            << label((1u << nBits)-1)
-            << " representable by " << nBits << " bits"
-            << abort(FatalError);
-    }
-}
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Null constructor
@@ -103,7 +123,7 @@ inline Foam::PackedList<nBits>::PackedList()
 template<int nBits>
 inline Foam::PackedList<nBits>::PackedList(const label size)
 :
-    List<unsigned int>(intSize(size), 0u),
+    List<unsigned int>(storageSize(size), 0u),
     size_(size)
 {}
 
@@ -111,9 +131,27 @@ inline Foam::PackedList<nBits>::PackedList(const label size)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int nBits>
-inline void Foam::PackedList<nBits>::resize(const label size)
+inline void Foam::PackedList<nBits>::resize(const label newSize)
 {
-    this->setSize(size);
+    setSize(newSize);
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::resize
+(
+    const label newSize,
+    const unsigned int& val
+)
+{
+    setSize(newSize, val);
+}
+
+
+template<int nBits>
+inline Foam::label Foam::PackedList<nBits>::capacity() const
+{
+    return packing() * List<unsigned int>::size();
 }
 
 
@@ -127,7 +165,7 @@ inline Foam::label Foam::PackedList<nBits>::size() const
 template<int nBits>
 inline bool Foam::PackedList<nBits>::empty() const
 {
-    return (size_ == 0);
+    return !size_;
 }
 
 
@@ -139,17 +177,13 @@ inline unsigned int Foam::PackedList<nBits>::get(const label i) const
     checkIndex(i);
 #   endif
 
-    // Constant: number of elements that fit in an unsigned int
-    const label nElemsPerLabel = sizeof(unsigned int)*8/nBits;
+    label startBit;
+    const unsigned int& elem = List<unsigned int>::operator[]
+    (
+        location(i, startBit)
+    );
 
-    unsigned int mask = ((1u << nBits) - 1);
-
-    label indexInLabel = i % nElemsPerLabel;
-
-    // Starting bit in int.
-    label startBit = nBits*indexInLabel;
-
-    return (List<unsigned int>::operator[](intIndex(i)) >> startBit) & mask;
+    return (elem >> startBit) & max_value();
 }
 
 
@@ -169,24 +203,17 @@ inline bool Foam::PackedList<nBits>::set(const label i, const unsigned int val)
     checkValue(val);
 #   endif
 
-    // Constant: number of elements that fit in an unsigned int
-    const label nElemsPerLabel = sizeof(unsigned int)*8/nBits;
-
-    unsigned int mask = ((1u << nBits) - 1);
-
-    label indexInLabel = i % nElemsPerLabel;
-
-    // Starting bit in int.
-    label startBit = nBits*indexInLabel;
-
-
-    unsigned int shiftedMask = mask << startBit;
-    unsigned int shiftedVal  = val  << startBit;
-
-    unsigned int& elem = List<unsigned int>::operator[](intIndex(i));
+    label startBit;
+    unsigned int& elem = List<unsigned int>::operator[]
+    (
+        location(i, startBit)
+    );
 
     unsigned int oldElem = elem;
 
+    unsigned int shiftedMask = max_value() << startBit;
+    unsigned int shiftedVal  = (val & max_value()) << startBit;
+
     elem = (elem & ~shiftedMask) | shiftedVal;
 
     return elem != oldElem;
@@ -200,6 +227,13 @@ inline Foam::List<unsigned int>& Foam::PackedList<nBits>::storage()
 }
 
 
+template<int nBits>
+inline const Foam::List<unsigned int>& Foam::PackedList<nBits>::storage() const
+{
+    return static_cast<const List<unsigned int>&>(*this);
+}
+
+
 template<int nBits>
 inline Foam::Xfer<Foam::PackedList<nBits> >
 Foam::PackedList<nBits>::xfer()
@@ -210,25 +244,20 @@ Foam::PackedList<nBits>::xfer()
 
 
 template<int nBits>
-inline Foam::reference Foam::PackedList<nBits>::operator[](const label i)
+inline Foam::PackedBitRef
+Foam::PackedList<nBits>::operator[](const label i)
 {
 #   ifdef DEBUGList
     checkIndex(i);
 #   endif
 
-    // Constant: number of elements that fit in an unsigned int
-    const label nElemsPerLabel = sizeof(unsigned int)*8/nBits;
+    label startBit;
+    unsigned int& elem = List<unsigned int>::operator[]
+    (
+        location(i, startBit)
+    );
 
-    unsigned int mask = ((1u << nBits) - 1);
-
-    label indexInLabel = i % nElemsPerLabel;
-
-    // Starting bit in int.
-    label startBit = nBits*indexInLabel;
-
-    unsigned int& elem = List<unsigned int>::operator[](intIndex(i));
-
-    return ::Foam::reference(elem, mask, startBit);
+    return ::Foam::PackedBitRef(elem, startBit, max_value());
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
index e8d9099d8d..4cf3d54ebb 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
@@ -73,11 +73,10 @@ void Foam::syncTools::checkTransform
 
 
 // Determines for every point whether it is coupled and if so sets only one.
-Foam::PackedList<1> Foam::syncTools::getMasterPoints(const polyMesh& mesh)
+Foam::PackedBoolList Foam::syncTools::getMasterPoints(const polyMesh& mesh)
 {
-    PackedList<1> isMasterPoint(mesh.nPoints(), 0);
-
-    PackedList<1> donePoint(mesh.nPoints(), 0);
+    PackedBoolList isMasterPoint(mesh.nPoints(), 0);
+    PackedBoolList donePoint(mesh.nPoints(), 0);
 
 
     // Do multiple shared points. Min. proc is master
@@ -194,11 +193,10 @@ Foam::PackedList<1> Foam::syncTools::getMasterPoints(const polyMesh& mesh)
 
 
 // Determines for every edge whether it is coupled and if so sets only one.
-Foam::PackedList<1> Foam::syncTools::getMasterEdges(const polyMesh& mesh)
+Foam::PackedBoolList Foam::syncTools::getMasterEdges(const polyMesh& mesh)
 {
-    PackedList<1> isMasterEdge(mesh.nEdges(), 0);
-
-    PackedList<1> doneEdge(mesh.nEdges(), 0);
+    PackedBoolList isMasterEdge(mesh.nEdges(), 0);
+    PackedBoolList doneEdge(mesh.nEdges(), 0);
 
 
     // Do multiple shared edges. Min. proc is master
@@ -315,9 +313,9 @@ Foam::PackedList<1> Foam::syncTools::getMasterEdges(const polyMesh& mesh)
 
 
 // Determines for every face whether it is coupled and if so sets only one.
-Foam::PackedList<1> Foam::syncTools::getMasterFaces(const polyMesh& mesh)
+Foam::PackedBoolList Foam::syncTools::getMasterFaces(const polyMesh& mesh)
 {
-    PackedList<1> isMasterFace(mesh.nFaces(), 1);
+    PackedBoolList isMasterFace(mesh.nFaces(), 1);
 
     const polyBoundaryMesh& patches = mesh.boundaryMesh();
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index cd8c9ba348..8841fe9870 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -28,7 +28,7 @@ Class
 Description
     Various tools to aid synchronizing lists across coupled patches.
 
-    Require 
+    Require
     - combineOperator (e.g. sumEqOp - not sumOp!) that is defined for the
       type and combineReduce(UList\<T\>, combineOperator) should be defined.
     - null value which gets overridden by any valid value.
@@ -51,7 +51,7 @@ SourceFiles
 #include "transformList.H"
 #include "Map.H"
 #include "EdgeMap.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -259,13 +259,13 @@ public:
         // Other
 
             //- Get per point whether is it master (of a coupled set of points)
-            static PackedList<1> getMasterPoints(const polyMesh&);
+            static PackedBoolList getMasterPoints(const polyMesh&);
 
             //- Get per edge whether is it master (of a coupled set of edges)
-            static PackedList<1> getMasterEdges(const polyMesh&);
+            static PackedBoolList getMasterEdges(const polyMesh&);
 
             //- Get per face whether is it master (of a coupled set of faces)
-            static PackedList<1> getMasterFaces(const polyMesh&);
+            static PackedBoolList getMasterFaces(const polyMesh&);
 
 };
 
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index eac0ba0240..acca055b61 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -1203,7 +1203,7 @@ void Foam::syncTools::syncEdgeList
                 const labelList& meshEdges = procPatch.meshEdges();
 
                 // Receive from neighbour. Is per patch edge the region of the
-                // neighbouring patch edge. 
+                // neighbouring patch edge.
                 List<T> nbrPatchInfo(procPatch.nEdges());
 
                 {
@@ -1402,7 +1402,7 @@ void Foam::syncTools::syncBoundaryFaceList
                 else
                 {
                     OPstream toNbr(Pstream::blocking, procPatch.neighbProcNo());
-                    toNbr << 
+                    toNbr <<
                         SubList<T>(faceValues, procPatch.size(), patchStart);
                 }
             }
@@ -1683,7 +1683,7 @@ void Foam::syncTools::syncFaceList
                 cop(t, val1);
                 faceValues.set(meshFace0, t);
 
-                cop(val1, val0);                
+                cop(val1, val0);
                 faceValues.set(meshFace1, val1);
             }
         }
diff --git a/src/OpenFOAM/primitives/Lists/PackedBoolList.H b/src/OpenFOAM/primitives/Lists/PackedBoolList.H
new file mode 100644
index 0000000000..84d9956136
--- /dev/null
+++ b/src/OpenFOAM/primitives/Lists/PackedBoolList.H
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Typedef
+    Foam::PackedBoolList
+
+Description
+    A bit-packed bool list
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PackedBoolList_H
+#define PackedBoolList_H
+
+#include "bool.H"
+#include "PackedList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef PackedList<1> PackedBoolList;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
index 1aae76626c..41662df8c9 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.H
@@ -370,7 +370,7 @@ class autoLayerDriver
                 static void averageNeighbours
                 (
                     const polyMesh& mesh,
-                    const PackedList<1>& isMasterEdge,
+                    const PackedBoolList& isMasterEdge,
                     const labelList& meshEdges,
                     const labelList& meshPoints,
                     const edgeList& edges,
@@ -382,7 +382,7 @@ class autoLayerDriver
                 //- Calculate inverse sum of edge weights (currently always 1.0)
                 void sumWeights
                 (
-                    const PackedList<1>& isMasterEdge,
+                    const PackedBoolList& isMasterEdge,
                     const labelList& meshEdges,
                     const labelList& meshPoints,
                     const edgeList& edges,
@@ -393,7 +393,7 @@ class autoLayerDriver
                 void smoothField
                 (
                     const motionSmoother& meshMover,
-                    const PackedList<1>& isMasterEdge,
+                    const PackedBoolList& isMasterEdge,
                     const labelList& meshEdges,
                     const scalarField& fieldMin,
                     const label& nSmoothDisp,
@@ -404,7 +404,7 @@ class autoLayerDriver
                 void smoothPatchNormals
                 (
                     const motionSmoother& meshMover,
-                    const PackedList<1>& isMasterEdge,
+                    const PackedBoolList& isMasterEdge,
                     const labelList& meshEdges,
                     const label nSmoothDisp,
                     pointField& normals
@@ -414,7 +414,7 @@ class autoLayerDriver
                 void smoothNormals
                 (
                     const label nSmoothDisp,
-                    const PackedList<1>& isMasterEdge,
+                    const PackedBoolList& isMasterEdge,
                     const labelList& fixedPoints,
                     pointVectorField& normals
                 ) const;
@@ -444,7 +444,7 @@ class autoLayerDriver
                 void findIsolatedRegions
                 (
                     const indirectPrimitivePatch& pp,
-                    const PackedList<1>& isMasterEdge,
+                    const PackedBoolList& isMasterEdge,
                     const labelList& meshEdges,
                     const scalar minCosLayerTermination,
                     scalarField& field,
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
index 81524c71fa..615978a308 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C
@@ -43,7 +43,7 @@ Description
 // Calculate inverse sum of edge weights (currently always 1.0)
 void Foam::autoLayerDriver::sumWeights
 (
-    const PackedList<1>& isMasterEdge,
+    const PackedBoolList& isMasterEdge,
     const labelList& meshEdges,
     const labelList& meshPoints,
     const edgeList& edges,
@@ -91,7 +91,7 @@ void Foam::autoLayerDriver::sumWeights
 void Foam::autoLayerDriver::smoothField
 (
     const motionSmoother& meshMover,
-    const PackedList<1>& isMasterEdge,
+    const PackedBoolList& isMasterEdge,
     const labelList& meshEdges,
     const scalarField& fieldMin,
     const label& nSmoothDisp,
@@ -163,7 +163,7 @@ void Foam::autoLayerDriver::smoothField
 void Foam::autoLayerDriver::smoothPatchNormals
 (
     const motionSmoother& meshMover,
-    const PackedList<1>& isMasterEdge,
+    const PackedBoolList& isMasterEdge,
     const labelList& meshEdges,
     const label nSmoothDisp,
     pointField& normals
@@ -228,7 +228,7 @@ void Foam::autoLayerDriver::smoothPatchNormals
 void Foam::autoLayerDriver::smoothNormals
 (
     const label nSmoothDisp,
-    const PackedList<1>& isMasterEdge,
+    const PackedBoolList& isMasterEdge,
     const labelList& fixedPoints,
     pointVectorField& normals
 ) const
@@ -240,7 +240,7 @@ void Foam::autoLayerDriver::smoothNormals
     const edgeList& edges = mesh.edges();
 
     // Points that do not change.
-    PackedList<1> isFixedPoint(mesh.nPoints(), 0);
+    PackedBoolList isFixedPoint(mesh.nPoints(), 0);
 
     // Internal points that are fixed
     forAll(fixedPoints, i)
@@ -452,7 +452,7 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
 void Foam::autoLayerDriver::findIsolatedRegions
 (
     const indirectPrimitivePatch& pp,
-    const PackedList<1>& isMasterEdge,
+    const PackedBoolList& isMasterEdge,
     const labelList& meshEdges,
     const scalar minCosLayerTermination,
     scalarField& field,
@@ -684,7 +684,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
     // ~~~~~~~~~~~~~~~~~~~~~~~
 
     // Precalulate master edge (only relevant for shared edges)
-    PackedList<1> isMasterEdge(syncTools::getMasterEdges(mesh));
+    PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
     // Precalculate meshEdge per pp edge
     labelList meshEdges(pp.nEdges());
 
@@ -979,7 +979,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
     const labelList& meshPoints = pp.meshPoints();
 
     // Precalulate master edge (only relevant for shared edges)
-    PackedList<1> isMasterEdge(syncTools::getMasterEdges(mesh));
+    PackedBoolList isMasterEdge(syncTools::getMasterEdges(mesh));
     // Precalculate meshEdge per pp edge
     labelList meshEdges(pp.nEdges());
 
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
index 88fa627eac..7c4e8386fb 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C
@@ -33,7 +33,7 @@ template<class Type>
 void Foam::autoLayerDriver::averageNeighbours
 (
     const polyMesh& mesh,
-    const PackedList<1>& isMasterEdge,
+    const PackedBoolList& isMasterEdge,
     const labelList& meshEdges,
     const labelList& meshPoints,
     const edgeList& edges,
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index a4cd0a504d..0c6655862c 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -153,12 +153,12 @@ Foam::Map<Foam::label> Foam::autoSnapDriver::getZoneBafflePatches
 
 
 // Calculate geometrically collocated points, Requires PackedList to be
-// sizes and initalised!
+// sized and initalised!
 Foam::label Foam::autoSnapDriver::getCollocatedPoints
 (
     const scalar tol,
     const pointField& points,
-    PackedList<1>& isCollocatedPoint
+    PackedBoolList& isCollocatedPoint
 )
 {
     labelList pointMap;
@@ -225,7 +225,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
     const indirectPrimitivePatch& pp = meshMover.patch();
 
     // Calculate geometrically non-manifold points on the patch to be moved.
-    PackedList<1> nonManifoldPoint(pp.nPoints());
+    PackedBoolList nonManifoldPoint(pp.nPoints());
     label nNonManifoldPoints = getCollocatedPoints
     (
         SMALL,
@@ -255,7 +255,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
     const polyMesh& mesh = meshMover.mesh();
 
     // Get labels of faces to count (master of coupled faces and baffle pairs)
-    PackedList<1> isMasterFace(syncTools::getMasterFaces(mesh));
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh));
 
     {
         forAll(baffles, i)
@@ -1374,7 +1374,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
 
 
     // Faces that do not move
-    PackedList<1> isZonedFace(mesh.nFaces(), 0);
+    PackedBoolList isZonedFace(mesh.nFaces(), 0);
     {
         // 1. All faces on zoned surfaces
         const wordList& faceZoneNames = surfaces.faceZoneNames();
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
index 18afdc46d3..b2d0f28911 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.H
@@ -95,7 +95,7 @@ class autoSnapDriver
             (
                 const scalar tol,
                 const pointField&,
-                PackedList<1>&
+                PackedBoolList&
             );
 
             //- Calculate displacement per patch point to smooth out patch.
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 4b10b84763..6a021f9e8a 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -126,7 +126,7 @@ void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
     const pointField& cellCentres = mesh_.cellCentres();
 
     // Stats on edges to test. Count proc faces only once.
-    PackedList<1> isMasterFace(syncTools::getMasterFaces(mesh_));
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
 
     {
         label nMasterFaces = 0;
@@ -865,7 +865,7 @@ Foam::meshRefinement::meshRefinement
 Foam::label Foam::meshRefinement::countHits() const
 {
     // Stats on edges to test. Count proc faces only once.
-    PackedList<1> isMasterFace(syncTools::getMasterFaces(mesh_));
+    PackedBoolList isMasterFace(syncTools::getMasterFaces(mesh_));
 
     label nHits = 0;
 
@@ -1201,7 +1201,7 @@ Foam::labelList Foam::meshRefinement::intersectedPoints
     const faceList& faces = mesh_.faces();
 
     // Mark all points on faces that will become baffles
-    PackedList<1> isBoundaryPoint(mesh_.nPoints(), 0u);
+    PackedBoolList isBoundaryPoint(mesh_.nPoints(), 0u);
     label nBoundaryPoints = 0;
 
     forAll(surfaceIndex_, faceI)
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
index fd5a7bdffa..859c76020c 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -431,7 +431,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
     //     point will only have 4 cells connected to it)
 
     // Does cell have exactly 7 of its 8 anchor points on the boundary?
-    PackedList<1> hasSevenBoundaryAnchorPoints(mesh_.nCells(), 0u);
+    PackedBoolList hasSevenBoundaryAnchorPoints(mesh_.nCells());
     // If so what is the remaining non-boundary anchor point?
     labelHashSet nonBoundaryAnchors(mesh_.nCells()/10000);
 
@@ -727,7 +727,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
             hitSurface,
             hitInfo
         );
-    
+
         forAll(hitInfo, i)
         {
             if (hitInfo[i].hit())
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index 446da0956d..24c7819d8d 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -68,7 +68,7 @@ Foam::labelList Foam::meshRefinement::getChangedFaces
         const label nInternalFaces = mesh.nInternalFaces();
 
         // Mark refined cells on old mesh
-        PackedList<1> oldRefineCell(map.nOldCells(), 0u);
+        PackedBoolList oldRefineCell(map.nOldCells());
 
         forAll(oldCellsToRefine, i)
         {
@@ -76,7 +76,7 @@ Foam::labelList Foam::meshRefinement::getChangedFaces
         }
 
         // Mark refined faces
-        PackedList<1> refinedInternalFace(nInternalFaces, 0u);
+        PackedBoolList refinedInternalFace(nInternalFaces);
 
         // 1. Internal faces
 
@@ -335,7 +335,7 @@ Foam::label Foam::meshRefinement::markFeatureRefinement
     maxFeatureLevel = -1;
 
     // Whether edge has been visited.
-    List<PackedList<1> > featureEdgeVisited(featureMeshes.size());
+    List<PackedBoolList> featureEdgeVisited(featureMeshes.size());
 
     forAll(featureMeshes, featI)
     {
diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
index e9adef8e5f..2c6fbbe8f2 100644
--- a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
+++ b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.H
@@ -38,7 +38,7 @@ SourceFiles
 #ifndef refinementSurfaces_H
 #define refinementSurfaces_H
 
-#include "PackedList.H"
+#include "PackedBoolList.H"
 #include "triSurfaceGeoMesh.H"
 #include "triSurfaceFields.H"
 #include "vectorList.H"
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 2cb639cb63..1eee295db0 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -47,7 +47,7 @@ addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-label dynamicRefineFvMesh::count(const PackedList<1>& l, const unsigned int val)
+label dynamicRefineFvMesh::count(const PackedBoolList& l, const unsigned int val)
 {
     label n = 0;
     forAll(l, i)
@@ -63,7 +63,7 @@ label dynamicRefineFvMesh::count(const PackedList<1>& l, const unsigned int val)
 
 void dynamicRefineFvMesh::calculateProtectedCells
 (
-    PackedList<1>& unrefineableCell
+    PackedBoolList& unrefineableCell
 ) const
 {
     if (protectedCell_.empty())
@@ -385,7 +385,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
     // Update numbering of protectedCell_
     if (protectedCell_.size())
     {
-        PackedList<1> newProtectedCell(nCells(), 0);
+        PackedBoolList newProtectedCell(nCells());
 
         forAll(newProtectedCell, cellI)
         {
@@ -538,7 +538,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::unrefine
     // Update numbering of protectedCell_
     if (protectedCell_.size())
     {
-        PackedList<1> newProtectedCell(nCells(), 0);
+        PackedBoolList newProtectedCell(nCells());
 
         forAll(newProtectedCell, cellI)
         {
@@ -642,7 +642,7 @@ void dynamicRefineFvMesh::selectRefineCandidates
     const scalar lowerRefineLevel,
     const scalar upperRefineLevel,
     const scalarField& vFld,
-    PackedList<1>& candidateCell
+    PackedBoolList& candidateCell
 ) const
 {
     // Get error per cell. Is -1 (not to be refined) to >0 (to be refined,
@@ -675,7 +675,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
 (
     const label maxCells,
     const label maxRefinement,
-    const PackedList<1>& candidateCell
+    const PackedBoolList& candidateCell
 ) const
 {
     // Every refined cell causes 7 extra cells
@@ -685,7 +685,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
 
     // Mark cells that cannot be refined since they would trigger refinement
     // of protected cells (since 2:1 cascade)
-    PackedList<1> unrefineableCell;
+    PackedBoolList unrefineableCell;
     calculateProtectedCells(unrefineableCell);
 
     // Count current selection
@@ -761,7 +761,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
 labelList dynamicRefineFvMesh::selectUnrefinePoints
 (
     const scalar unrefineLevel,
-    const PackedList<1>& markedCell,
+    const PackedBoolList& markedCell,
     const scalarField& pFld
 ) const
 {
@@ -818,7 +818,7 @@ labelList dynamicRefineFvMesh::selectUnrefinePoints
 }
 
 
-void dynamicRefineFvMesh::extendMarkedCells(PackedList<1>& markedCell) const
+void dynamicRefineFvMesh::extendMarkedCells(PackedBoolList& markedCell) const
 {
     // Mark faces using any marked cell
     boolList markedFace(nFaces(), false);
@@ -1078,7 +1078,7 @@ bool dynamicRefineFvMesh::update()
             readLabel(refineDict.lookup("nBufferLayers"));
 
         // Cells marked for refinement or otherwise protected from unrefinement.
-        PackedList<1> refineCell(nCells(), 0);
+        PackedBoolList refineCell(nCells());
 
         if (globalData().nTotalCells() < maxCells)
         {
@@ -1119,7 +1119,7 @@ bool dynamicRefineFvMesh::update()
                     const labelList& cellMap = map().cellMap();
                     const labelList& reverseCellMap = map().reverseCellMap();
 
-                    PackedList<1> newRefineCell(cellMap.size());
+                    PackedBoolList newRefineCell(cellMap.size());
 
                     forAll(cellMap, cellI)
                     {
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
index fbde240a0c..f8bf0ec3e9 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -40,7 +40,7 @@ SourceFiles
 
 #include "dynamicFvMesh.H"
 #include "hexRef8.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 #include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,17 +71,17 @@ protected:
         label nRefinementIterations_;
 
         //- Protected cells (usually since not hexes)
-        PackedList<1> protectedCell_;
+        PackedBoolList protectedCell_;
 
 
     // Private Member Functions
 
         //- Count set/unset elements in packedlist.
-        static label count(const PackedList<1>&, const unsigned int);
+        static label count(const PackedBoolList&, const unsigned int);
 
         //- Calculate cells that cannot be refined since would trigger
         //  refinement of protectedCell_ (since 2:1 refinement cascade)
-        void calculateProtectedCells(PackedList<1>& unrefineableCell) const;
+        void calculateProtectedCells(PackedBoolList& unrefineableCell) const;
 
         //- Read the projection parameters from dictionary
         void readDict();
@@ -127,7 +127,7 @@ protected:
                 const scalar lowerRefineLevel,
                 const scalar upperRefineLevel,
                 const scalarField& vFld,
-                PackedList<1>& candidateCell
+                PackedBoolList& candidateCell
             ) const;
 
             //- Subset candidate cells for refinement
@@ -135,19 +135,19 @@ protected:
             (
                 const label maxCells,
                 const label maxRefinement,
-                const PackedList<1>& candidateCell
+                const PackedBoolList& candidateCell
             ) const;
 
             //- Select points that can be unrefined.
             virtual labelList selectUnrefinePoints
             (
                 const scalar unrefineLevel,
-                const PackedList<1>& markedCell,
+                const PackedBoolList& markedCell,
                 const scalarField& pFld
             ) const;
 
             //- Extend markedCell with cell-face-cell.
-            void extendMarkedCells(PackedList<1>& markedCell) const;
+            void extendMarkedCells(PackedBoolList& markedCell) const;
 
 
 private:
@@ -184,13 +184,13 @@ public:
         }
 
         //- Cells which should not be refined/unrefined
-        const PackedList<1>& protectedCell() const
+        const PackedBoolList& protectedCell() const
         {
             return protectedCell_;
         }
 
         //- Cells which should not be refined/unrefined
-        PackedList<1>& protectedCell()
+        PackedBoolList& protectedCell()
         {
             return protectedCell_;
         }
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index 5307352302..18f5c85478 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -130,10 +130,10 @@ void Foam::motionSmoother::makePatchPatchAddressing()
     {
         if (patchPatchPointConstraints[i].first() != 0)
         {
-            patchPatchPointConstraintPoints_[nConstraints] = 
+            patchPatchPointConstraintPoints_[nConstraints] =
                 patchPatchPoints[i];
 
-            patchPatchPointConstraintTensors_[nConstraints] = 
+            patchPatchPointConstraintTensors_[nConstraints] =
                 patchPatchPointConstraints[i].constraintTransformation();
 
             nConstraints++;
@@ -206,7 +206,7 @@ Foam::labelHashSet Foam::motionSmoother::getPoints
 // Smooth on selected points (usually patch points)
 void Foam::motionSmoother::minSmooth
 (
-    const PackedList<1>& isAffectedPoint,
+    const PackedBoolList& isAffectedPoint,
     const labelList& meshPoints,
     const pointScalarField& fld,
     pointScalarField& newFld
@@ -241,7 +241,7 @@ void Foam::motionSmoother::minSmooth
 // Smooth on all internal points
 void Foam::motionSmoother::minSmooth
 (
-    const PackedList<1>& isAffectedPoint,
+    const PackedBoolList& isAffectedPoint,
     const pointScalarField& fld,
     pointScalarField& newFld
 ) const
@@ -324,7 +324,7 @@ void Foam::motionSmoother::getAffectedFacesAndPoints
     const faceSet& wrongFaces,
 
     labelList& affectedFaces,
-    PackedList<1>& isAffectedPoint
+    PackedBoolList& isAffectedPoint
 ) const
 {
     isAffectedPoint.setSize(mesh_.nPoints());
@@ -763,7 +763,7 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::movePoints
         // Correct tangentially
         twoDCorrector_.correctPoints(newPoints);
         Info<< " ...done" << endl;
-    }    
+    }
 
     if (debug)
     {
@@ -846,7 +846,7 @@ bool Foam::motionSmoother::scaleMesh
         {
             if (patches[patchI].coupled())
             {
-                const coupledPolyPatch& pp = 
+                const coupledPolyPatch& pp =
                     refCast<const coupledPolyPatch>(patches[patchI]);
 
                 Pout<< '\t' << patchI << '\t' << pp.name()
@@ -976,7 +976,7 @@ bool Foam::motionSmoother::scaleMesh
         // Grow a few layers to determine
         // - points to be smoothed
         // - faces to be checked in next iteration
-        PackedList<1> isAffectedPoint(mesh_.nPoints(), 0);
+        PackedBoolList isAffectedPoint(mesh_.nPoints());
         getAffectedFacesAndPoints
         (
             nSmoothScale,       // smoothing iterations
@@ -1035,7 +1035,7 @@ bool Foam::motionSmoother::scaleMesh
             -GREAT,             // null value
             false               // no separation
         );
-        
+
 
         if (debug)
         {
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.H b/src/dynamicMesh/motionSmoother/motionSmoother.H
index e5b35040ac..e5777a3664 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.H
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.H
@@ -76,7 +76,7 @@ SourceFiles
 
 #include "pointFields.H"
 #include "HashSet.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 #include "indirectPrimitivePatch.H"
 #include "className.H"
 #include "twoDPointCorrector.H"
@@ -159,11 +159,11 @@ class motionSmoother
         pointField oldPoints_;
 
         //- Is mesh point on boundary or not
-        PackedList<1> isInternalPoint_;
+        PackedBoolList isInternalPoint_;
 
         //- Is edge master (always except if on coupled boundary and on
         //  lower processor)
-        PackedList<1> isMasterEdge_;
+        PackedBoolList isMasterEdge_;
 
         //- 2-D motion corrector
         twoDPointCorrector twoDCorrector_;
@@ -220,7 +220,7 @@ class motionSmoother
         //- explicit smoothing and min on all affected internal points
         void minSmooth
         (
-            const PackedList<1>& isAffectedPoint,
+            const PackedBoolList& isAffectedPoint,
             const pointScalarField& fld,
             pointScalarField& newFld
         ) const;
@@ -228,7 +228,7 @@ class motionSmoother
         //- same but only on selected points (usually patch points)
         void minSmooth
         (
-            const PackedList<1>& isAffectedPoint,
+            const PackedBoolList& isAffectedPoint,
             const labelList& meshPoints,
             const pointScalarField& fld,
             pointScalarField& newFld
@@ -264,7 +264,7 @@ class motionSmoother
             const faceSet& wrongFaces,
 
             labelList& affectedFaces,
-            PackedList<1>& isAffectedPoint
+            PackedBoolList& isAffectedPoint
         ) const;
 
         //- Disallow default bitwise copy construct
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 6015f1b64a..b3902762ef 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -56,7 +56,7 @@ Foam::labelListList Foam::addPatchCellLayer::calcGlobalEdgeFaces
     //// Determine coupled edges just so we don't have to have storage
     //// for all non-coupled edges.
     //
-    //PackedList<1> isCoupledEdge(mesh.nEdges(), 0);
+    //PackedBoolList isCoupledEdge(mesh.nEdges());
     //
     //const polyBoundaryMesh& patches = mesh.boundaryMesh();
     //
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index fa5ae3ae9d..8b00bb93d6 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -1554,7 +1554,7 @@ void Foam::hexRef8::walkFaceFromMid
 Foam::label Foam::hexRef8::faceConsistentRefinement
 (
     const bool maxSet,
-    PackedList<1>& refineCell
+    PackedBoolList& refineCell
 ) const
 {
     label nChanged = 0;
@@ -1643,7 +1643,7 @@ void Foam::hexRef8::checkWantedRefinementLevels
     const labelList& cellsToRefine
 ) const
 {
-    PackedList<1> refineCell(mesh_.nCells(), 0);
+    PackedBoolList refineCell(mesh_.nCells());
     forAll(cellsToRefine, i)
     {
         refineCell.set(cellsToRefine[i], 1);
@@ -2028,7 +2028,7 @@ Foam::labelList Foam::hexRef8::consistentRefinement
     // maxSet = true  : select cells to refine
 
     // Go to straight boolList.
-    PackedList<1> refineCell(mesh_.nCells(), 0);
+    PackedBoolList refineCell(mesh_.nCells());
     forAll(cellsToRefine, i)
     {
         refineCell.set(cellsToRefine[i], 1);
@@ -2876,7 +2876,7 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
     // 2. Extend to 2:1. I don't understand yet why this is not done
     // 2. Extend to 2:1. For non-cube cells the scalar distance does not work
     // so make sure it at least provides 2:1.
-    PackedList<1> refineCell(mesh_.nCells(), 0);
+    PackedBoolList refineCell(mesh_.nCells());
     forAll(allCellInfo, cellI)
     {
         label wanted = allCellInfo[cellI].wantedLevel(cc[cellI]);
@@ -2953,12 +2953,12 @@ Foam::labelList Foam::hexRef8::consistentSlowRefinement2
         }
 
         // Extend to 2:1
-        PackedList<1> refineCell(mesh_.nCells(), 0);
+        PackedBoolList refineCell(mesh_.nCells());
         forAll(newCellsToRefine, i)
         {
             refineCell.set(newCellsToRefine[i], 1);
         }
-        const PackedList<1> savedRefineCell(refineCell);
+        const PackedBoolList savedRefineCell(refineCell);
 
         label nChanged = faceConsistentRefinement(true, refineCell);
 
@@ -3583,7 +3583,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
     }
 
     // Get all affected faces.
-    PackedList<1> affectedFace(mesh_.nFaces(), 0);
+    PackedBoolList affectedFace(mesh_.nFaces());
 
     {
         forAll(cellMidPoint, cellI)
@@ -5084,7 +5084,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
     // maxSet = true: select points to refine
 
     // Maintain boolList for pointsToUnrefine and cellsToUnrefine
-    PackedList<1> unrefinePoint(mesh_.nPoints(), 0);
+    PackedBoolList unrefinePoint(mesh_.nPoints());
 
     forAll(pointsToUnrefine, i)
     {
@@ -5099,7 +5099,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
         // Construct cells to unrefine
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        PackedList<1> unrefineCell(mesh_.nCells(), 0);
+        PackedBoolList unrefineCell(mesh_.nCells());
 
         forAll(unrefinePoint, pointI)
         {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
index fff6d1b44a..71bfdbe928 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.H
@@ -43,7 +43,7 @@ SourceFiles
 #include "primitivePatch.H"
 #include "removeFaces.H"
 #include "refinementHistory.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -298,7 +298,7 @@ class hexRef8
         label faceConsistentRefinement
         (
             const bool maxSet,
-            PackedList<1>& refineCell
+            PackedBoolList& refineCell
         ) const;
 
         //- Check wanted refinement for 2:1 consistency
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 05204fb1b0..f317573d8a 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -522,7 +522,7 @@ Foam::label Foam::polyTopoChange::getCellOrder
     SLList<label> nextCell;
 
     // Whether cell has been done already
-    PackedList<1> visited(cellCellAddressing.size(), 0);
+    PackedBoolList visited(cellCellAddressing.size());
 
     label cellInOrder = 0;
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
index 819b39fa9d..9d0dce468c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
@@ -76,7 +76,7 @@ SourceFiles
 #include "HashSet.H"
 #include "mapPolyMesh.H"
 #include "CompactListList.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/indexedOctree/treeDataFace.H b/src/meshTools/indexedOctree/treeDataFace.H
index 49bffea01d..7db10513e4 100644
--- a/src/meshTools/indexedOctree/treeDataFace.H
+++ b/src/meshTools/indexedOctree/treeDataFace.H
@@ -39,7 +39,7 @@ SourceFiles
 #include "face.H"
 #include "indexedOctree.H"
 #include "treeBoundBoxList.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,7 +72,7 @@ class treeDataFace
         const labelList faceLabels_;
 
         //- Inverse of faceLabels. For every mesh whether face is in faceLabels.
-        PackedList<1> isTreeFace_;
+        PackedBoolList isTreeFace_;
 
         //- Whether to precalculate and store face bounding box
         const bool cacheBb_;
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index 4b14609efa..0f44333b6e 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -31,6 +31,7 @@ License
 #include "triangleFuncs.H"
 #include "matchPoints.H"
 #include "globalIndex.H"
+#include "PackedBoolList.H"
 #include "Time.H"
 
 
@@ -774,8 +775,7 @@ void Foam::distributedTriSurfaceMesh::calcBounds
     // Unfortunately nPoints constructs meshPoints() so do compact version
     // ourselves
 
-    PackedList<1> pointIsUsed(points().size());
-    pointIsUsed = 0U;
+    PackedBoolList pointIsUsed(points().size());
 
     nPoints = 0;
     bb = boundBox::invertedBox;
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index 3571df4a49..e146c90f7a 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -537,7 +537,7 @@ void Foam::isoSurface::calcSnappedCc
 // to a single point
 void Foam::isoSurface::calcSnappedPoint
 (
-    const PackedList<1>& isBoundaryPoint,
+    const PackedBoolList& isBoundaryPoint,
     const labelList& boundaryRegion,
     const volScalarField& cVals,
     const scalarField& pVals,
@@ -1382,7 +1382,7 @@ Foam::isoSurface::isoSurface
 
     // Determine if point is on boundary. Points on boundaries are never
     // snapped. Coupled boundaries are handled explicitly so not marked here.
-    PackedList<1> isBoundaryPoint(mesh_.nPoints());
+    PackedBoolList isBoundaryPoint(mesh_.nPoints());
 
     labelList boundaryRegion(mesh_.nFaces()-mesh_.nInternalFaces());
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index abe3d51b56..7dc0588a1c 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -32,7 +32,7 @@ Description
 
     Note:
     - not possible on patches of type 'empty'. There are no values on
-    'empty' patch fields so even the api would have to change 
+    'empty' patch fields so even the api would have to change
      (no volScalarField as argument). Too messy.
     - in parallel the regularisation (coarsening) always takes place
     and slightly different surfaces will be created compared to non-parallel.
@@ -56,7 +56,7 @@ SourceFiles
 #include "triSurface.H"
 #include "labelPair.H"
 #include "pointIndexHit.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 #include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -181,7 +181,7 @@ class isoSurface
         //  point.
         void calcSnappedPoint
         (
-            const PackedList<1>& isBoundaryPoint,
+            const PackedBoolList& isBoundaryPoint,
             const labelList& boundaryRegion,
             const volScalarField& cVals,
             const scalarField& pVals,
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index 52398eafa4..542d31a376 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -81,7 +81,7 @@ Foam::scalar Foam::isoSurfaceCell::isoFraction
 
 Foam::isoSurfaceCell::cellCutType Foam::isoSurfaceCell::calcCutType
 (
-    const PackedList<1>& isTet,
+    const PackedBoolList& isTet,
     const scalarField& cellValues,
     const scalarField& pointValues,
     const label cellI
@@ -203,7 +203,7 @@ Foam::isoSurfaceCell::cellCutType Foam::isoSurfaceCell::calcCutType
 
 void Foam::isoSurfaceCell::calcCutTypes
 (
-    const PackedList<1>& isTet,
+    const PackedBoolList& isTet,
     const scalarField& cVals,
     const scalarField& pVals
 )
@@ -348,7 +348,7 @@ Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
 
 void Foam::isoSurfaceCell::calcSnappedCc
 (
-    const PackedList<1>& isTet,
+    const PackedBoolList& isTet,
     const scalarField& cVals,
     const scalarField& pVals,
 
@@ -621,8 +621,8 @@ void Foam::isoSurfaceCell::genPointTris
 
 void Foam::isoSurfaceCell::calcSnappedPoint
 (
-    const PackedList<1>& isBoundaryPoint,
-    const PackedList<1>& isTet,
+    const PackedBoolList& isBoundaryPoint,
+    const PackedBoolList& isTet,
     const scalarField& cVals,
     const scalarField& pVals,
 
@@ -1402,7 +1402,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
     mergeDistance_(mergeTol*mesh.bounds().mag())
 {
     // Determine if cell is tet
-    PackedList<1> isTet(mesh_.nCells());
+    PackedBoolList isTet(mesh_.nCells());
     {
         tetMatcher tet;
 
@@ -1417,7 +1417,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
 
     // Determine if point is on boundary. Points on boundaries are never
     // snapped. Coupled boundaries are handled explicitly so not marked here.
-    PackedList<1> isBoundaryPoint(mesh_.nPoints());
+    PackedBoolList isBoundaryPoint(mesh_.nPoints());
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
     forAll(patches, patchI)
     {
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 5acd468473..ea96b42b3a 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -48,7 +48,7 @@ SourceFiles
 #include "triSurface.H"
 #include "labelPair.H"
 #include "pointIndexHit.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -118,7 +118,7 @@ class isoSurfaceCell
         //- Determine whether cell is cut
         cellCutType calcCutType
         (
-            const PackedList<1>&,
+            const PackedBoolList&,
             const scalarField& cellValues,
             const scalarField& pointValues,
             const label
@@ -126,7 +126,7 @@ class isoSurfaceCell
 
         void calcCutTypes
         (
-            const PackedList<1>&,
+            const PackedBoolList&,
             const scalarField& cellValues,
             const scalarField& pointValues
         );
@@ -149,7 +149,7 @@ class isoSurfaceCell
         //  point.
         void calcSnappedCc
         (
-            const PackedList<1>& isTet,
+            const PackedBoolList& isTet,
             const scalarField& cVals,
             const scalarField& pVals,
             DynamicList<point>& triPoints,
@@ -180,8 +180,8 @@ class isoSurfaceCell
         //  point.
         void calcSnappedPoint
         (
-            const PackedList<1>& isBoundaryPoint,
-            const PackedList<1>& isTet,
+            const PackedBoolList& isBoundaryPoint,
+            const PackedBoolList& isTet,
             const scalarField& cVals,
             const scalarField& pVals,
             DynamicList<point>& triPoints,
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index c7a49263d7..e589ec6158 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -31,7 +31,7 @@ License
 #include "Time.H"
 #include "boundBox.H"
 #include "SortableList.H"
-#include "PackedList.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -1207,8 +1207,7 @@ void Foam::triSurface::writeStats(Ostream& os) const
 {
     // Unfortunately nPoints constructs meshPoints() so do compact version
     // ourselves.
-    PackedList<1> pointIsUsed(points().size());
-    pointIsUsed = 0U;
+    PackedBoolList pointIsUsed(points().size());
 
     label nPoints = 0;
     boundBox bb = boundBox::invertedBox;

From 7fe6fca4dfce4e94b7ec9c96cfca67c8da00c057 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 21 Jan 2009 16:55:25 +0000
Subject: [PATCH 18/32] added helper function for writing entries if not
 default

---
 .../fvPatchFields/fvPatchField/fvPatchField.C   | 17 +++++++++++++++++
 .../fvPatchFields/fvPatchField/fvPatchField.H   | 17 +++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
index 4e01c64d74..637cf8037a 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C
@@ -244,6 +244,23 @@ void Foam::fvPatchField<Type>::write(Ostream& os) const
 }
 
 
+template<class Type>
+template<class EntryType>
+void Foam::fvPatchField<Type>::writeEntryIfDifferent
+(
+    Ostream& os,
+    const word& entryName,
+    const EntryType& value1,
+    const EntryType& value2
+) const
+{
+    if (value1 != value2)
+    {
+        os.writeKeyword(entryName) << value2 << token::END_STATEMENT << nl;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 701dd9fb4e..851d9d33ae 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -414,8 +414,21 @@ public:
             virtual void manipulateMatrix(fvMatrix<Type>& matrix);
 
 
-        //- Write
-        virtual void write(Ostream&) const;
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+
+            //- Helper function to write the keyword and entry only if the
+            //  values are not equal. The value is then output as value2
+            template<class EntryType>
+            void writeEntryIfDifferent
+            (
+                Ostream& os,
+                const word& entryName,
+                const EntryType& value1,
+                const EntryType& value2
+            ) const;
 
 
         // Check

From c48d6279a5731b342157b4066b4135ad1432cbe8 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 21 Jan 2009 16:58:54 +0000
Subject: [PATCH 19/32] updated compressible models so that fields that are
 looked-up can be optionally specified

---
 .../alphatWallFunctionFvPatchScalarField.C    | 18 ++++--
 .../alphatWallFunctionFvPatchScalarField.H    |  5 ++
 .../epsilonWallFunctionFvPatchScalarField.C   | 60 +++++++++++++----
 .../epsilonWallFunctionFvPatchScalarField.H   | 20 ++++++
 .../mutRoughWallFunctionFvPatchScalarField.C  | 40 ++++++++----
 .../mutRoughWallFunctionFvPatchScalarField.H  |  9 +++
 ...ndardRoughWallFunctionFvPatchScalarField.C | 48 +++++++++-----
 ...ndardRoughWallFunctionFvPatchScalarField.H | 36 ++++++++---
 ...asStandardWallFunctionFvPatchScalarField.C | 48 +++++++++++---
 ...asStandardWallFunctionFvPatchScalarField.H | 14 ++++
 ...rtAllmarasWallFunctionFvPatchScalarField.C | 48 +++++++++++---
 ...rtAllmarasWallFunctionFvPatchScalarField.H | 15 +++++
 .../mutWallFunctionFvPatchScalarField.C       | 38 ++++++++---
 .../mutWallFunctionFvPatchScalarField.H       | 13 +++-
 .../omegaWallFunctionFvPatchScalarField.C     | 64 +++++++++++++++----
 .../omegaWallFunctionFvPatchScalarField.H     | 20 ++++++
 16 files changed, 397 insertions(+), 99 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
index 6ee5c45fea..6b2974b04f 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -48,7 +48,8 @@ alphatWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    mutName_("mut")
 {}
 
 
@@ -61,7 +62,8 @@ alphatWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    mutName_(ptf.mutName_)
 {}
 
 
@@ -73,7 +75,8 @@ alphatWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    mutName_(dict.lookupOrDefault<word>("mut", "mut"))
 {}
 
 
@@ -83,7 +86,8 @@ alphatWallFunctionFvPatchScalarField
     const alphatWallFunctionFvPatchScalarField& awfpsf
 )
 :
-    fixedValueFvPatchScalarField(awfpsf)
+    fixedValueFvPatchScalarField(awfpsf),
+    mutName_(awfpsf.mutName_)
 {}
 
 
@@ -94,7 +98,8 @@ alphatWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(awfpsf, iF)
+    fixedValueFvPatchScalarField(awfpsf, iF),
+    mutName_(awfpsf.mutName_)
 {}
 
 
@@ -106,7 +111,7 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
     const scalar Prt = ras.Prt().value();
 
     const scalarField& mutw =
-        patch().lookupPatchField<volScalarField, scalar>("mut");
+        patch().lookupPatchField<volScalarField, scalar>(mutName_);
 
     operator==(mutw/Prt);
 }
@@ -115,6 +120,7 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs()
 void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index 1d8ebc436c..da71e80a2f 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -57,6 +57,11 @@ class alphatWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
+    // Private data
+
+        //- Name of turbulent viscosity field
+        word mutName_;
+
 
 public:
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index b22c101340..387f54df33 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -64,7 +64,13 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF)
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    kName_("k"),
+    GName_("G"),
+    rhoName_("rho"),
+    muName_("mu"),
+    mutName_("mut")
 {
     checkType();
 }
@@ -78,7 +84,13 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper)
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_),
+    mutName_(ptf.mutName_)
 {
     checkType();
 }
@@ -91,7 +103,13 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF, dict)
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "G")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
+    mutName_(dict.lookupOrDefault<word>("mut", "mut"))
 {
     checkType();
 }
@@ -102,7 +120,13 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const epsilonWallFunctionFvPatchScalarField& ewfpsf
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf)
+    fixedInternalValueFvPatchField<scalar>(ewfpsf),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    rhoName_(ewfpsf.rhoName_),
+    muName_(ewfpsf.muName_),
+    mutName_(ewfpsf.mutName_)
 {
     checkType();
 }
@@ -114,7 +138,13 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF)
+    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    rhoName_(ewfpsf.rhoName_),
+    muName_(ewfpsf.muName_),
+    mutName_(ewfpsf.mutName_)
 {
     checkType();
 }
@@ -135,24 +165,24 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
     const scalarField& y = ras.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("G"));
+        (db().lookupObject<volScalarField>(GName_));
 
     volScalarField& epsilon = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("epsilon"));
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
 
-    const volScalarField& k = db().lookupObject<volScalarField>("k");
+    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
 
     const scalarField& mutw =
-        patch().lookupPatchField<volScalarField, scalar>("mut");
+        patch().lookupPatchField<volScalarField, scalar>(mutName_);
 
     const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -197,6 +227,12 @@ void epsilonWallFunctionFvPatchScalarField::evaluate
 void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "G", GName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
index 2cb6b336bf..42bdeea681 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -57,6 +57,26 @@ class epsilonWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        //- Name of turbulent viscosity field
+        word mutName_;
+
 
     // Private member functions
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
index d224109c20..c772d95bff 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
@@ -77,6 +77,9 @@ mutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
+    rhoName_("rho"),
+    muName_("mu"),
+    kName_("k"),
     Ks_(p.size(), 0.0),
     Cs_(p.size(), 0.0)
 {}
@@ -92,6 +95,9 @@ mutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_),
+    kName_(ptf.kName_),
     Ks_(ptf.Ks_, mapper),
     Cs_(ptf.Cs_, mapper)
 {}
@@ -106,6 +112,9 @@ mutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
     Ks_("Ks", dict, p.size()),
     Cs_("Cs", dict, p.size())
 {}
@@ -114,25 +123,31 @@ mutRoughWallFunctionFvPatchScalarField
 mutRoughWallFunctionFvPatchScalarField::
 mutRoughWallFunctionFvPatchScalarField
 (
-    const mutRoughWallFunctionFvPatchScalarField& nrwfpsf
+    const mutRoughWallFunctionFvPatchScalarField& rwfpsf
 )
 :
-    fixedValueFvPatchScalarField(nrwfpsf),
-    Ks_(nrwfpsf.Ks_),
-    Cs_(nrwfpsf.Cs_)
+    fixedValueFvPatchScalarField(rwfpsf),
+    rhoName_(rwfpsf.rhoName_),
+    muName_(rwfpsf.muName_),
+    kName_(rwfpsf.kName_),
+    Ks_(rwfpsf.Ks_),
+    Cs_(rwfpsf.Cs_)
 {}
 
 
 mutRoughWallFunctionFvPatchScalarField::
 mutRoughWallFunctionFvPatchScalarField
 (
-    const mutRoughWallFunctionFvPatchScalarField& nrwfpsf,
+    const mutRoughWallFunctionFvPatchScalarField& rwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(nrwfpsf, iF),
-    Ks_(nrwfpsf.Ks_),
-    Cs_(nrwfpsf.Cs_)
+    fixedValueFvPatchScalarField(rwfpsf, iF),
+    rhoName_(rwfpsf.rhoName_),
+    muName_(rwfpsf.muName_),
+    kName_(rwfpsf.kName_),
+    Ks_(rwfpsf.Ks_),
+    Cs_(rwfpsf.Cs_)
 {}
 
 
@@ -178,12 +193,12 @@ void mutRoughWallFunctionFvPatchScalarField::updateCoeffs()
     const scalarField& y = ras.y()[patch().index()];
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
-    const scalarField& k = db().lookupObject<volScalarField>("k");
+    const scalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
 
     scalarField& mutw = *this;
 
@@ -229,6 +244,9 @@ void mutRoughWallFunctionFvPatchScalarField::updateCoeffs()
 void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
     Cs_.writeEntry("Cs", os);
     Ks_.writeEntry("Ks", os);
     writeEntry("value", os);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H
index c1bddbc360..88209f4184 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H
@@ -64,6 +64,15 @@ class mutRoughWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
         //- Roughness height
         scalarField Ks_;
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index 041bc46847..a480ba072b 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -49,6 +49,9 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    rhoName_("rho"),
+    muName_("mu"),
     roughnessHeight_(pTraits<scalar>::zero),
     roughnessConstant_(pTraits<scalar>::zero),
     roughnessFudgeFactor_(pTraits<scalar>::zero)
@@ -65,6 +68,9 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_),
     roughnessHeight_(ptf.roughnessHeight_),
     roughnessConstant_(ptf.roughnessConstant_),
     roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
@@ -80,6 +86,9 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
     roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
     roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
     roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
@@ -89,27 +98,33 @@ mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
 mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& tppsf
+    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf),
-    roughnessHeight_(tppsf.roughnessHeight_),
-    roughnessConstant_(tppsf.roughnessConstant_),
-    roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
+    fixedValueFvPatchScalarField(rwfpsf),
+    UName_(rwfpsf.UName_),
+    rhoName_(rwfpsf.rhoName_),
+    muName_(rwfpsf.muName_),
+    roughnessHeight_(rwfpsf.roughnessHeight_),
+    roughnessConstant_(rwfpsf.roughnessConstant_),
+    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
 {}
 
 
 mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
 mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& tppsf,
+    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF),
-    roughnessHeight_(tppsf.roughnessHeight_),
-    roughnessConstant_(tppsf.roughnessConstant_),
-    roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
+    fixedValueFvPatchScalarField(rwfpsf, iF),
+    UName_(rwfpsf.UName_),
+    rhoName_(rwfpsf.rhoName_),
+    muName_(rwfpsf.muName_),
+    roughnessHeight_(rwfpsf.roughnessHeight_),
+    roughnessConstant_(rwfpsf.roughnessConstant_),
+    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
 {}
 
 
@@ -131,16 +146,16 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     const fvPatchScalarField& rho =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
     // The flow velocity at the adjacent cell centre.
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
     scalarField& mutw = *this;
 
     scalarField magFaceGradU = mag(U.snGrad());
@@ -172,7 +187,7 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
 
                 // Enforce the roughnessHeight to be less than the distance to
                 // the first cell centre.
-                if(dKsPlusdYPlus > 1)
+                if (dKsPlusdYPlus > 1)
                 {
                     dKsPlusdYPlus = 1;
                 }
@@ -211,7 +226,7 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
                     }
 
                     scalar denom = 1.0 + log(E* yPlus) - G - yPlusGPrime;
-                    if(mag(denom) > VSMALL)
+                    if (mag(denom) > VSMALL)
                     {
                         yPlus = (kappaRe + yPlus*(1 - yPlusGPrime))/denom;
                         if( yPlus < 0 )
@@ -288,6 +303,9 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
 ) const
 {
     fixedValueFvPatchScalarField::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
     os.writeKeyword("roughnessHeight")
         << roughnessHeight_ << token::END_STATEMENT << nl;
     os.writeKeyword("roughnessConstant")
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
index 86cff3403f..16aa54faa1 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
@@ -58,9 +58,25 @@ class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 {
     // Private data
 
-        scalar roughnessHeight_;
-        scalar roughnessConstant_;
-        scalar roughnessFudgeFactor_;
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        // Roughness parameters
+
+            //- Height
+            scalar roughnessHeight_;
+
+            //- Constant
+            scalar roughnessConstant_;
+
+            //- Scale factor
+            scalar roughnessFudgeFactor_;
 
 
 public:
@@ -143,38 +159,38 @@ public:
 
         // Access
 
-            //- Return the fluctuation scale
+            //- Return the roughness height scale
             const scalar& roughnessHeight() const
             {
                 return roughnessHeight_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness height to allow adjustment
             scalar& roughnessHeight()
             {
                 return roughnessHeight_;
             }
 
-
-            //- Return the fluctuation scale
+            //- Return the roughness constant scale
             const scalar& roughnessConstant() const
             {
                 return roughnessConstant_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness constant to allow adjustment
             scalar& roughnessConstant()
             {
                 return roughnessConstant_;
             }
 
-            //- Return the fluctuation scale
+            //- Return the roughness scale factor
             const scalar& roughnessFudgeFactor() const
             {
                 return roughnessFudgeFactor_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness scale factor to allow
+            //  adjustment
             scalar& roughnessFudgeFactor()
             {
                 return roughnessFudgeFactor_;
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
index f284fd13ba..0501a266a9 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -48,7 +48,10 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    rhoName_("rho"),
+    muName_("mu")
 {}
 
 
@@ -61,7 +64,10 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_)
 {}
 
 
@@ -73,28 +79,37 @@ mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu"))
 {}
 
 
 mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
 mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& tppsf
+    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& rwfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(rwfpsf),
+    UName_(rwfpsf.UName_),
+    rhoName_(rwfpsf.rhoName_),
+    muName_(rwfpsf.muName_)
 {}
 
 
 mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
 mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& tppsf,
+    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& rwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(rwfpsf, iF),
+    UName_(rwfpsf.UName_),
+    rhoName_(rwfpsf.rhoName_),
+    muName_(rwfpsf.muName_)
 {}
 
 
@@ -114,15 +129,15 @@ void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
     scalarField& mutw = *this;
 
     scalarField magFaceGradU = mag(U.snGrad());
@@ -158,6 +173,19 @@ void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
 }
 
 
+void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntry("value", os);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePatchTypeField
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
index e417d5ed39..45f88e4c04 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
@@ -56,6 +56,17 @@ class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
 
 public:
 
@@ -142,6 +153,9 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+        //- Write
+        virtual void write(Ostream& os) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
index c814a1b827..88d087dc9c 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -48,7 +48,10 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    rhoName_("rho"),
+    muName_("mu")
 {}
 
 
@@ -61,7 +64,10 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_)
 {}
 
 
@@ -73,28 +79,37 @@ mutSpalartAllmarasWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu"))
 {}
 
 
 mutSpalartAllmarasWallFunctionFvPatchScalarField::
 mutSpalartAllmarasWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
+    const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(wfpsf),
+    UName_(wfpsf.UName_),
+    rhoName_(wfpsf.rhoName_),
+    muName_(wfpsf.muName_)
 {}
 
 
 mutSpalartAllmarasWallFunctionFvPatchScalarField::
 mutSpalartAllmarasWallFunctionFvPatchScalarField
 (
-    const mutSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
+    const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(wfpsf, iF),
+    UName_(wfpsf.UName_),
+    rhoName_(wfpsf.rhoName_),
+    muName_(wfpsf.muName_)
 {}
 
 
@@ -113,15 +128,15 @@ void mutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
 
     scalarField& mutw = *this;
 
@@ -174,6 +189,19 @@ void mutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
 }
 
 
+void mutSpalartAllmarasWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntry("value", os);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePatchTypeField(fvPatchScalarField, mutSpalartAllmarasWallFunctionFvPatchScalarField);
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H
index b0f3fa0e02..dc7b241b8d 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H
@@ -56,6 +56,18 @@ class mutSpalartAllmarasWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+
 public:
 
     //- Runtime type information
@@ -134,6 +146,9 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+        //- Write
+        virtual void write(Ostream& os) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
index 3f0faddd86..f57f52cdc1 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
@@ -48,7 +48,10 @@ mutWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    rhoName_("rho"),
+    muName_("mu"),
+    kName_("k")
 {}
 
 
@@ -61,7 +64,10 @@ mutWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_),
+    kName_(ptf.kName_)
 {}
 
 
@@ -73,28 +79,37 @@ mutWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
+    kName_(dict.lookupOrDefault<word>("k", "k"))
 {}
 
 
 mutWallFunctionFvPatchScalarField::
 mutWallFunctionFvPatchScalarField
 (
-    const mutWallFunctionFvPatchScalarField& tppsf
+    const mutWallFunctionFvPatchScalarField& wfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(wfpsf),
+    rhoName_(wfpsf.rhoName_),
+    muName_(wfpsf.muName_),
+    kName_(wfpsf.kName_)
 {}
 
 
 mutWallFunctionFvPatchScalarField::
 mutWallFunctionFvPatchScalarField
 (
-    const mutWallFunctionFvPatchScalarField& tppsf,
+    const mutWallFunctionFvPatchScalarField& wfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(wfpsf, iF),
+    rhoName_(wfpsf.rhoName_),
+    muName_(wfpsf.muName_),
+    kName_(wfpsf.kName_)
 {}
 
 
@@ -113,12 +128,12 @@ void mutWallFunctionFvPatchScalarField::updateCoeffs()
     const scalarField& y = ras.y()[patch().index()];
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
-    const volScalarField& k = db().lookupObject<volScalarField>("k");
+    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
 
     scalarField& mutw = *this;
 
@@ -145,6 +160,9 @@ void mutWallFunctionFvPatchScalarField::updateCoeffs()
 void mutWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
index 244dec844b..ec00de9763 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
@@ -57,6 +57,17 @@ class mutWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
+    // Private data
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
 
 public:
 
@@ -138,7 +149,7 @@ public:
         // I-O
 
             //- Write
-            void write(Ostream&) const;
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 5b0ee67630..eacf26b1d4 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -64,7 +64,13 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF)
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    rhoName_("rho"),
+    kName_("k"),
+    GName_("G"),
+    muName_("mu"),
+    mutName_("mut")
 {
     checkType();
 }
@@ -78,7 +84,13 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper)
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    rhoName_(ptf.rhoName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    muName_(ptf.muName_),
+    mutName_(ptf.mutName_)
 {
     checkType();
 }
@@ -91,7 +103,13 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF, dict)
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "G")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
+    mutName_(dict.lookupOrDefault<word>("mut", "mut"))
 {
     checkType();
 }
@@ -99,10 +117,16 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 (
-    const omegaWallFunctionFvPatchScalarField& ewfpsf
+    const omegaWallFunctionFvPatchScalarField& owfpsf
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf)
+    fixedInternalValueFvPatchField<scalar>(owfpsf),
+    UName_(owfpsf.UName_),
+    rhoName_(owfpsf.rhoName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    muName_(owfpsf.muName_),
+    mutName_(owfpsf.mutName_)
 {
     checkType();
 }
@@ -110,11 +134,17 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 (
-    const omegaWallFunctionFvPatchScalarField& ewfpsf,
+    const omegaWallFunctionFvPatchScalarField& owfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF)
+    fixedInternalValueFvPatchField<scalar>(owfpsf, iF),
+    UName_(owfpsf.UName_),
+    rhoName_(owfpsf.rhoName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    muName_(owfpsf.muName_),
+    mutName_(owfpsf.mutName_)
 {
     checkType();
 }
@@ -135,24 +165,24 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
     const scalarField& y = ras.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("G"));
+        (db().lookupObject<volScalarField>(GName_));
 
     volScalarField& omega = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("omega"));
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
 
-    const scalarField& k = db().lookupObject<volScalarField>("k");
+    const scalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
 
     const scalarField& mutw =
-        patch().lookupPatchField<volScalarField, scalar>("mut");
+        patch().lookupPatchField<volScalarField, scalar>(mutName_);
 
     const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -188,6 +218,12 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "G", GName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
index 266e7987d5..6dfe7a772b 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -55,6 +55,26 @@ class omegaWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        //- Name of turbulent viscosity field
+        word mutName_;
+
 
     // Private member functions
 

From 0b859cba7d114b681c205cba6e34b97ce73b1591 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Wed, 21 Jan 2009 17:00:04 +0000
Subject: [PATCH 20/32] updated incompressible models so that fields that are
 looked-up can be optionally specified

---
 .../epsilonWallFunctionFvPatchScalarField.C   | 52 +++++++++++++----
 .../epsilonWallFunctionFvPatchScalarField.H   | 17 ++++++
 .../nutRoughWallFunctionFvPatchScalarField.C  | 16 +++++-
 .../nutRoughWallFunctionFvPatchScalarField.H  |  6 ++
 ...ndardRoughWallFunctionFvPatchScalarField.C | 16 +++++-
 ...ndardRoughWallFunctionFvPatchScalarField.H | 32 ++++++++---
 ...asStandardWallFunctionFvPatchScalarField.C | 35 +++++++++---
 ...asStandardWallFunctionFvPatchScalarField.H |  9 +++
 ...rtAllmarasWallFunctionFvPatchScalarField.C | 35 +++++++++---
 ...rtAllmarasWallFunctionFvPatchScalarField.H |  9 +++
 .../nutWallFunctionFvPatchScalarField.C       | 30 +++++++---
 .../nutWallFunctionFvPatchScalarField.H       |  8 +++
 .../omegaWallFunctionFvPatchScalarField.C     | 56 ++++++++++++++-----
 .../omegaWallFunctionFvPatchScalarField.H     | 17 ++++++
 14 files changed, 278 insertions(+), 60 deletions(-)

diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index a4f0bd13f7..ae8a57c303 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -64,7 +64,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF)
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    kName_("k"),
+    GName_("G"),
+    nuName_("nu"),
+    nutName_("nut")
 {
     checkType();
 }
@@ -78,7 +83,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper)
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    nuName_(ptf.nuName_),
+    nutName_(ptf.nutName_)
 {
     checkType();
 }
@@ -91,7 +101,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF, dict)
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "G")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+    nutName_(dict.lookupOrDefault<word>("nut", "nut"))
 {
     checkType();
 }
@@ -102,7 +117,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const epsilonWallFunctionFvPatchScalarField& ewfpsf
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf)
+    fixedInternalValueFvPatchField<scalar>(ewfpsf),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    nuName_(ewfpsf.nuName_),
+    nutName_(ewfpsf.nutName_)
 {
     checkType();
 }
@@ -114,7 +134,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF)
+    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    nuName_(ewfpsf.nuName_),
+    nutName_(ewfpsf.nutName_)
 {
     checkType();
 }
@@ -135,21 +160,21 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
     const scalarField& y = ras.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("G"));
+        (db().lookupObject<volScalarField>(GName_));
 
     volScalarField& epsilon = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("epsilon"));
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
 
-    const volScalarField& k = db().lookupObject<volScalarField>("k");
+    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
 
     const scalarField& nutw =
-        patch().lookupPatchField<volScalarField, scalar>("nut");
+        patch().lookupPatchField<volScalarField, scalar>(nutName_);
 
     const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -192,6 +217,11 @@ void epsilonWallFunctionFvPatchScalarField::evaluate
 void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "G", GName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
index 7e81a50a34..4dbdf40d16 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -57,6 +57,23 @@ class epsilonWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
+        //- Name of turbulent viscosity field
+        word nutName_;
+
 
     // Private member functions
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
index a62e333f1f..138e783333 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
@@ -77,6 +77,8 @@ nutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
+    kName_("k"),
+    nuName_("nu"),
     Ks_(p.size(), 0.0),
     Cs_(p.size(), 0.0)
 {}
@@ -92,6 +94,8 @@ nutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    kName_(ptf.kName_),
+    nuName_(ptf.nuName_),
     Ks_(ptf.Ks_, mapper),
     Cs_(ptf.Cs_, mapper)
 {}
@@ -106,6 +110,8 @@ nutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
     Ks_("Ks", dict, p.size()),
     Cs_("Cs", dict, p.size())
 {}
@@ -118,6 +124,8 @@ nutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(nrwfpsf),
+    kName_(nrwfpsf.kName_),
+    nuName_(nrwfpsf.nuName_),
     Ks_(nrwfpsf.Ks_),
     Cs_(nrwfpsf.Cs_)
 {}
@@ -131,6 +139,8 @@ nutRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(nrwfpsf, iF),
+    kName_(nrwfpsf.kName_),
+    nuName_(nrwfpsf.nuName_),
     Ks_(nrwfpsf.Ks_),
     Cs_(nrwfpsf.Cs_)
 {}
@@ -177,10 +187,10 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
 
     const scalarField& y = ras.y()[patch().index()];
 
-    const scalarField& k = db().lookupObject<volScalarField>("k");
+    const scalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
 
     scalarField& nutw = *this;
 
@@ -226,6 +236,8 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
 void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
     Cs_.writeEntry("Cs", os);
     Ks_.writeEntry("Ks", os);
     writeEntry("value", os);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
index 0263c145d0..968c5c3f8f 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
@@ -64,6 +64,12 @@ class nutRoughWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
         //- Roughness height
         scalarField Ks_;
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index a7bd44016d..2d7bfc9cd2 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -49,6 +49,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    nuName_("nu"),
     roughnessHeight_(pTraits<scalar>::zero),
     roughnessConstant_(pTraits<scalar>::zero),
     roughnessFudgeFactor_(pTraits<scalar>::zero)
@@ -65,6 +67,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    nuName_(ptf.nuName_),
     roughnessHeight_(ptf.roughnessHeight_),
     roughnessConstant_(ptf.roughnessConstant_),
     roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
@@ -80,6 +84,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
     roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
     roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
     roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
@@ -93,6 +99,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(tppsf),
+    UName_(tppsf.UName_),
+    nuName_(tppsf.nuName_),
     roughnessHeight_(tppsf.roughnessHeight_),
     roughnessConstant_(tppsf.roughnessConstant_),
     roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
@@ -107,6 +115,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(tppsf, iF),
+    UName_(tppsf.UName_),
+    nuName_(tppsf.nuName_),
     roughnessHeight_(tppsf.roughnessHeight_),
     roughnessConstant_(tppsf.roughnessConstant_),
     roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
@@ -130,13 +140,13 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     // The flow velocity at the adjacent cell centre.
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
     scalarField& nutw = *this;
 
     scalarField magFaceGradU = mag(U.snGrad());
@@ -276,6 +286,8 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
 ) const
 {
     fixedValueFvPatchScalarField::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
     os.writeKeyword("roughnessHeight")
         << roughnessHeight_ << token::END_STATEMENT << nl;
     os.writeKeyword("roughnessConstant")
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
index 53a0478cff..f8c65f434c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
@@ -58,9 +58,22 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 {
     // Private data
 
-        scalar roughnessHeight_;
-        scalar roughnessConstant_;
-        scalar roughnessFudgeFactor_;
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
+        // Roughness model parameters
+
+            //- Height
+            scalar roughnessHeight_;
+
+            //- Constant
+            scalar roughnessConstant_;
+
+            //- Scale factor
+            scalar roughnessFudgeFactor_;
 
 
 public:
@@ -143,38 +156,39 @@ public:
 
         // Access
 
-            //- Return the fluctuation scale
+            //- Return the roughness height
             const scalar& roughnessHeight() const
             {
                 return roughnessHeight_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness height to allow adjustment
             scalar& roughnessHeight()
             {
                 return roughnessHeight_;
             }
 
 
-            //- Return the fluctuation scale
+            //- Return the roughness constant scale
             const scalar& roughnessConstant() const
             {
                 return roughnessConstant_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness constant to allow adjustment
             scalar& roughnessConstant()
             {
                 return roughnessConstant_;
             }
 
-            //- Return the fluctuation scale
+            //- Return the roughness scale factor
             const scalar& roughnessFudgeFactor() const
             {
                 return roughnessFudgeFactor_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness scale factor to allow
+            //  adjustment
             scalar& roughnessFudgeFactor()
             {
                 return roughnessFudgeFactor_;
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
index 8e181f439b..394c1ce7cf 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -48,7 +48,9 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    nuName_("nu")
 {}
 
 
@@ -61,7 +63,9 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    nuName_(ptf.nuName_)
 {}
 
 
@@ -73,7 +77,9 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu"))
 {}
 
 
@@ -83,7 +89,9 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& tppsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(tppsf),
+    UName_(tppsf.UName_),
+    nuName_(tppsf.nuName_)
 {}
 
 
@@ -94,7 +102,9 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(tppsf, iF),
+    UName_(tppsf.UName_),
+    nuName_(tppsf.nuName_)
 {}
 
 
@@ -114,12 +124,12 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
     scalarField& nutw = *this;
 
     scalarField magFaceGradU = mag(U.snGrad());
@@ -155,6 +165,17 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
 }
 
 
+void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fixedValueFvPatchScalarField::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePatchTypeField
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
index f96f7d927a..0ab4a7671a 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
@@ -58,6 +58,12 @@ class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
 
 public:
 
@@ -144,6 +150,9 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+        //- Write
+        virtual void write(Ostream& os) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
index 420f7cd31c..112ae23025 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -48,7 +48,9 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    nuName_("nu")
 {}
 
 
@@ -61,7 +63,9 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    nuName_(ptf.nuName_)
 {}
 
 
@@ -73,7 +77,9 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu"))
 {}
 
 
@@ -83,7 +89,9 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
     const nutSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(tppsf),
+    UName_(tppsf.UName_),
+    nuName_(tppsf.nuName_)
 {}
 
 
@@ -94,7 +102,9 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(tppsf, iF),
+    UName_(tppsf.UName_),
+    nuName_(tppsf.nuName_)
 {}
 
 
@@ -113,12 +123,12 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
 
     scalarField& nutw = *this;
 
@@ -167,6 +177,17 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
 }
 
 
+void nutSpalartAllmarasWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fixedValueFvPatchScalarField::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 makePatchTypeField(fvPatchScalarField, nutSpalartAllmarasWallFunctionFvPatchScalarField);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
index b085c95346..5679a2c565 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
@@ -58,6 +58,12 @@ class nutSpalartAllmarasWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
 
 public:
 
@@ -137,6 +143,9 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+        //- Write
+        virtual void write(Ostream& os) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index 4498e25e26..8e89f18d96 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -48,7 +48,9 @@ nutWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    kName_("k"),
+    nuName_("nu")
 {}
 
 
@@ -61,7 +63,9 @@ nutWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    kName_(ptf.kName_),
+    nuName_(ptf.nuName_)
 {}
 
 
@@ -73,28 +77,34 @@ nutWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu"))
 {}
 
 
 nutWallFunctionFvPatchScalarField::
 nutWallFunctionFvPatchScalarField
 (
-    const nutWallFunctionFvPatchScalarField& tppsf
+    const nutWallFunctionFvPatchScalarField& nwfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(nwfpsf),
+    kName_(nwfpsf.kName_),
+    nuName_(nwfpsf.nuName_)
 {}
 
 
 nutWallFunctionFvPatchScalarField::
 nutWallFunctionFvPatchScalarField
 (
-    const nutWallFunctionFvPatchScalarField& tppsf,
+    const nutWallFunctionFvPatchScalarField& nwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(nwfpsf, iF),
+    kName_(nwfpsf.kName_),
+    nuName_(nwfpsf.nuName_)
 {}
 
 
@@ -112,10 +122,10 @@ void nutWallFunctionFvPatchScalarField::updateCoeffs()
 
     const scalarField& y = ras.y()[patch().index()];
 
-    const volScalarField& k = db().lookupObject<volScalarField>("k");
+    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
 
     scalarField& nutw = *this;
 
@@ -140,6 +150,8 @@ void nutWallFunctionFvPatchScalarField::updateCoeffs()
 void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
index 149ebdf321..6f77f7cbb1 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
@@ -57,6 +57,14 @@ class nutWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
+    //Private data
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
 
 public:
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index 84793a2c42..f6a3b6a191 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -64,7 +64,12 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF)
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    kName_("k"),
+    GName_("G"),
+    nuName_("nu"),
+    nutName_("nut")
 {
     checkType();
 }
@@ -78,7 +83,12 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper)
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    nuName_(ptf.nuName_),
+    nutName_(ptf.nutName_)
 {
     checkType();
 }
@@ -91,7 +101,12 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedInternalValueFvPatchField<scalar>(p, iF, dict)
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "G")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+    nutName_(dict.lookupOrDefault<word>("nut", "nut"))
 {
     checkType();
 }
@@ -99,10 +114,15 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 (
-    const omegaWallFunctionFvPatchScalarField& ewfpsf
+    const omegaWallFunctionFvPatchScalarField& owfpsf
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf)
+    fixedInternalValueFvPatchField<scalar>(owfpsf),
+    UName_(owfpsf.UName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    nuName_(owfpsf.nuName_),
+    nutName_(owfpsf.nutName_)
 {
     checkType();
 }
@@ -110,11 +130,16 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 
 omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
 (
-    const omegaWallFunctionFvPatchScalarField& ewfpsf,
+    const omegaWallFunctionFvPatchScalarField& owfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF)
+    fixedInternalValueFvPatchField<scalar>(owfpsf, iF),
+    UName_(owfpsf.UName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    nuName_(owfpsf.nuName_),
+    nutName_(owfpsf.nutName_)
 {
     checkType();
 }
@@ -135,21 +160,21 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
     const scalarField& y = ras.y()[patch().index()];
 
     volScalarField& G = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("G"));
+        (db().lookupObject<volScalarField>(GName_));
 
     volScalarField& omega = const_cast<volScalarField&>
-        (db().lookupObject<volScalarField>("omega"));
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
 
-    const scalarField& k = db().lookupObject<volScalarField>("k");
+    const scalarField& k = db().lookupObject<volScalarField>(kName_);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
 
     const scalarField& nutw =
-        patch().lookupPatchField<volScalarField, scalar>("nut");
+        patch().lookupPatchField<volScalarField, scalar>(nutName_);
 
     const fvPatchVectorField& Uw =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     const scalarField magGradUw = mag(Uw.snGrad());
 
@@ -183,6 +208,11 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
 void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
 {
     fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "G", GName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
index 37c8d90188..8f9e123ccf 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -55,6 +55,23 @@ class omegaWallFunctionFvPatchScalarField
 :
     public fixedInternalValueFvPatchField<scalar>
 {
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
+        //- Name of turbulent viscosity field
+        word nutName_;
+
 
     // Private member functions
 

From 8ccd361f56679f23a0b4d133b378acba3900cd24 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 22 Jan 2009 10:42:48 +0000
Subject: [PATCH 21/32] promoted omega0 and omegaSmall to RASModel to be
 consistent with epsilon0 and epsilon0

- removed Cmu from kOmegaSST models - not used
- general tidying up
---
 .../compressible/RAS/RASModel/RASModel.C      |  4 ++
 .../compressible/RAS/RASModel/RASModel.H      | 59 +++++++++++++++++--
 .../compressible/RAS/kOmegaSST/kOmegaSST.C    | 14 -----
 .../compressible/RAS/kOmegaSST/kOmegaSST.H    | 43 +++++++-------
 .../incompressible/RAS/RASModel/RASModel.C    |  4 ++
 .../incompressible/RAS/RASModel/RASModel.H    | 58 ++++++++++++++++--
 .../incompressible/RAS/kOmega/kOmega.C        |  5 +-
 .../incompressible/RAS/kOmega/kOmega.H        |  4 --
 .../incompressible/RAS/kOmegaSST/kOmegaSST.C  | 14 -----
 .../incompressible/RAS/kOmegaSST/kOmegaSST.H  | 39 ++++++------
 10 files changed, 158 insertions(+), 86 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 26b1a214d5..60d3dc3e84 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -125,6 +125,8 @@ RASModel::RASModel
     k0_("k0", dimVelocity*dimVelocity, SMALL),
     epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
     epsilonSmall_("epsilonSmall", epsilon0_.dimensions(), SMALL),
+    omega0_("omega", dimless/dimTime, SMALL),
+    omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
 {}
@@ -204,6 +206,8 @@ bool RASModel::read()
         k0_.readIfPresent(*this);
         epsilon0_.readIfPresent(*this);
         epsilonSmall_.readIfPresent(*this);
+        omega0_.readIfPresent(*this);
+        omegaSmall_.readIfPresent(*this);
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 7f45f88eed..7479eb4c55 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -80,22 +80,47 @@ protected:
 
     // Protected data
 
+        //- Turbulence on/off flag
         Switch turbulence_;
+
+        //- Flag to print the model coeffs at run-time
         Switch printCoeffs_;
+
+        //- Model coefficients dictionary
         dictionary coeffDict_;
 
-        dictionary wallFunctionDict_;
-        dimensionedScalar kappa_;
-        dimensionedScalar E_;
-        dimensionedScalar Cmu_;
-        dimensionedScalar Prt_;
+        // Wall function properties
 
+            //- Wall function dictionary
+            dictionary wallFunctionDict_;
+
+            dimensionedScalar kappa_;
+
+            dimensionedScalar E_;
+
+            dimensionedScalar Cmu_;
+
+            dimensionedScalar Prt_;
+
+        //- Value of y+ at the edge of the laminar sublayer
         scalar yPlusLam_;
 
+        //- Lower limit of k
         dimensionedScalar k0_;
+
+        //- Lower limit of epsilon
         dimensionedScalar epsilon0_;
+
+        //- Small epsilon value used to avoid divide by zero
         dimensionedScalar epsilonSmall_;
 
+        //- Lower limit for omega
+        dimensionedScalar omega0_;
+
+        //- Small omega value used to avoid divide by zero
+        dimensionedScalar omegaSmall_;
+
+        //- Near wall distance boundary field
         nearWallDist y_;
 
 
@@ -193,6 +218,19 @@ public:
                 return epsilonSmall_;
             }
 
+            //- Return the value of omega0 which epsilon is not allowed to be
+            //  less than
+            const dimensionedScalar& omega0() const
+            {
+                return omega0_;
+            }
+
+            //- Return the value of omegaSmall which is added to epsilon when
+            //  calculating nut
+            const dimensionedScalar& omegaSmall() const
+            {
+                return omegaSmall_;
+            }
 
             //- Allow k0 to be changed
             dimensionedScalar& k0()
@@ -212,6 +250,17 @@ public:
                 return epsilonSmall_;
             }
 
+            //- Allow omega0 to be changed
+            dimensionedScalar& omega0()
+            {
+                return omega0_;
+            }
+
+            //- Allow omegaSmall to be changed
+            dimensionedScalar& omegaSmall()
+            {
+                return omegaSmall_;
+            }
 
             //- Return kappa for use in wall-functions
             dimensionedScalar kappa() const
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index ab941a32a4..52cfaf2df8 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -208,19 +208,6 @@ kOmegaSST::kOmegaSST
         )
     ),
 
-    omega0_("omega0", dimless/dimTime, SMALL),
-    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-
     y_(mesh_),
 
     k_
@@ -350,7 +337,6 @@ bool kOmegaSST::read()
         betaStar_.readIfPresent(coeffDict_);
         a1_.readIfPresent(coeffDict_);
         c1_.readIfPresent(coeffDict_);
-        Cmu_.readIfPresent(coeffDict_);
 
         return true;
     }
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
index a9f668b6ad..8a948a5f77 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
@@ -56,7 +56,6 @@ Description
     @verbatim
         kOmegaSST
         {
-            Cmu         0.09;
             alphaK1     0.85034;
             alphaK2     1.0;
             alphaOmega1 0.5;
@@ -96,7 +95,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class kOmega Declaration
+                          Class kOmegaSST Declaration
 \*---------------------------------------------------------------------------*/
 
 class kOmegaSST
@@ -105,36 +104,38 @@ class kOmegaSST
 {
     // Private data
 
-        dimensionedScalar alphaK1_;
-        dimensionedScalar alphaK2_;
+        // Model coefficients
 
-        dimensionedScalar alphaOmega1_;
-        dimensionedScalar alphaOmega2_;
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
 
-        dimensionedScalar alphah_;
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
 
-        dimensionedScalar gamma1_;
-        dimensionedScalar gamma2_;
+            dimensionedScalar alphah_;
 
-        dimensionedScalar beta1_;
-        dimensionedScalar beta2_;
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
 
-        dimensionedScalar betaStar_;
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
 
-        dimensionedScalar a1_;
-        dimensionedScalar c1_;
+            dimensionedScalar betaStar_;
 
-        dimensionedScalar omega0_;
-        dimensionedScalar omegaSmall_;
+            dimensionedScalar a1_;
+            dimensionedScalar c1_;
 
-        dimensionedScalar Cmu_;
 
+        //- Wall distance
+        //  Note: different to wall distance in parent RASModel
         wallDist y_;
 
-        volScalarField k_;
-        volScalarField omega_;
-        volScalarField mut_;
-        volScalarField alphat_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
     // Private member functions
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index b70be3ad4d..d06bc6652b 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -115,6 +115,8 @@ RASModel::RASModel
     k0_("k0", dimVelocity*dimVelocity, SMALL),
     epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
     epsilonSmall_("epsilonSmall", epsilon0_.dimensions(), SMALL),
+    omega0_("omega0", dimless/dimTime, SMALL),
+    omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
 {}
@@ -250,6 +252,8 @@ bool RASModel::read()
         k0_.readIfPresent(*this);
         epsilon0_.readIfPresent(*this);
         epsilonSmall_.readIfPresent(*this);
+        omega0_.readIfPresent(*this);
+        omegaSmall_.readIfPresent(*this);
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index 50127d8c66..963af37ddd 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -77,21 +77,45 @@ protected:
 
     // Protected data
 
+        //- Turbulence on/off flag
         Switch turbulence_;
+
+        //- Flag to print the model coeffs at run-time
         Switch printCoeffs_;
+
+        //- Model coefficients dictionary
         dictionary coeffDict_;
 
-        dictionary wallFunctionDict_;
-        dimensionedScalar kappa_;
-        dimensionedScalar E_;
-        dimensionedScalar Cmu_;
+        // Wall function properties
 
+            //- Wall function dictionary
+            dictionary wallFunctionDict_;
+
+            dimensionedScalar kappa_;
+
+            dimensionedScalar E_;
+
+            dimensionedScalar Cmu_;
+
+        //- Value of y+ at the edge of the laminar sublayer
         scalar yPlusLam_;
 
+        //- Lower limit of k
         dimensionedScalar k0_;
+
+        //- Lower limit of epsilon
         dimensionedScalar epsilon0_;
+
+        //- Small epsilon value used to avoid divide by zero
         dimensionedScalar epsilonSmall_;
 
+        //- Lower limit for omega
+        dimensionedScalar omega0_;
+
+        //- Small omega value used to avoid divide by zero
+        dimensionedScalar omegaSmall_;
+
+        //- Near wall distance boundary field
         nearWallDist y_;
 
 
@@ -183,6 +207,20 @@ public:
             return epsilonSmall_;
         }
 
+        //- Return the value of omega0 which epsilon is not allowed to be
+        //  less than
+        const dimensionedScalar& omega0() const
+        {
+            return omega0_;
+        }
+
+        //- Return the value of omegaSmall which is added to epsilon when
+        //  calculating nut
+        const dimensionedScalar& omegaSmall() const
+        {
+            return omegaSmall_;
+        }
+
         //- Allow k0 to be changed
         dimensionedScalar& k0()
         {
@@ -201,6 +239,18 @@ public:
             return epsilonSmall_;
         }
 
+        //- Allow omega0 to be changed
+        dimensionedScalar& omega0()
+        {
+            return omega0_;
+        }
+
+        //- Allow omegaSmall to be changed
+        dimensionedScalar& omegaSmall()
+        {
+            return omegaSmall_;
+        }
+
         //- Return kappa for use in wall-functions
         dimensionedScalar kappa() const
         {
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
index ad8d3d14f7..a45ff8c33b 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -101,9 +101,6 @@ kOmega::kOmega
         )
     ),
 
-    omega0_("omega0", dimless/dimTime, SMALL),
-    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
-
     k_
     (
         IOobject
@@ -271,7 +268,7 @@ void kOmega::correct()
 
 
     // Re-calculate viscosity
-    nut_ == k_/omega_;
+    nut_ == k_/(omega_ + omegaSmall_);
     nut_.correctBoundaryConditions();
 }
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
index d07d8a5fcb..649a13abe7 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -90,10 +90,6 @@ class kOmega
             dimensionedScalar alphaOmega_;
 
 
-            dimensionedScalar omega0_;
-            dimensionedScalar omegaSmall_;
-
-
         // Fields
 
             volScalarField k_;
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index a066017a64..6a737fce49 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -198,19 +198,6 @@ kOmegaSST::kOmegaSST
         )
     ),
 
-    omega0_("omega0", dimless/dimTime, SMALL),
-    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-
     y_(mesh_),
 
     k_
@@ -331,7 +318,6 @@ bool kOmegaSST::read()
         betaStar_.readIfPresent(coeffDict_);
         a1_.readIfPresent(coeffDict_);
         c1_.readIfPresent(coeffDict_);
-        Cmu_.readIfPresent(coeffDict_);
 
         return true;
     }
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
index 8994b1ab3a..4563853801 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
@@ -57,7 +57,6 @@ Description
     @verbatim
         kOmegaSST
         {
-            Cmu         0.09;
             alphaK1     0.85034;
             alphaK2     1.0;
             alphaOmega1 0.5;
@@ -103,33 +102,33 @@ class kOmegaSST
 {
     // Private data
 
-        dimensionedScalar alphaK1_;
-        dimensionedScalar alphaK2_;
+        // Model coefficients
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
 
-        dimensionedScalar alphaOmega1_;
-        dimensionedScalar alphaOmega2_;
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
 
-        dimensionedScalar gamma1_;
-        dimensionedScalar gamma2_;
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
 
-        dimensionedScalar beta1_;
-        dimensionedScalar beta2_;
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
 
-        dimensionedScalar betaStar_;
+            dimensionedScalar betaStar_;
 
-        dimensionedScalar a1_;
-        dimensionedScalar c1_;
-
-        dimensionedScalar omega0_;
-        dimensionedScalar omegaSmall_;
-
-        dimensionedScalar Cmu_;
+            dimensionedScalar a1_;
+            dimensionedScalar c1_;
 
+        //- Wall distance field
+        //  Note: different to wall distance in parent RASModel
         wallDist y_;
 
-        volScalarField k_;
-        volScalarField omega_;
-        volScalarField nut_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField nut_;
 
 
     // Private member functions

From 173607fd2d695829d8bc3e4a9a73e575f61c477c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 22 Jan 2009 16:24:05 +0100
Subject: [PATCH 22/32] PackedList gets functionality akin to DynamicList

---
 applications/test/PackedList/PackedListTest.C |  38 +++-
 .../containers/Lists/PackedList/PackedList.C  | 106 +++------
 .../containers/Lists/PackedList/PackedList.H  | 199 +++++++++++------
 .../containers/Lists/PackedList/PackedListI.H | 203 ++++++++++++++----
 4 files changed, 356 insertions(+), 190 deletions(-)

diff --git a/applications/test/PackedList/PackedListTest.C b/applications/test/PackedList/PackedListTest.C
index a3767e8680..6bc951cfa7 100644
--- a/applications/test/PackedList/PackedListTest.C
+++ b/applications/test/PackedList/PackedListTest.C
@@ -56,8 +56,9 @@ void printPackedList(const PackedList<nBits>& L)
     {
         cout<< L[i] << ' ';
     }
-    cout<< ")\n\n";
+    cout<< ")\n";
 
+    // using std:bitset for output works, but annoys valgrind
     cout<< "storage: " << stor.size() << "( ";
     forAll(stor, i)
     {
@@ -99,6 +100,41 @@ int main(int argc, char *argv[])
     list1.resize(8);
     printPackedList(list1);
 
+    list1.append(2);
+    list1.append(3);
+    list1.append(4);
+    printPackedList(list1);
+
+    list1.reserve(32);
+    printPackedList(list1);
+
+    list1.shrink();
+    printPackedList(list1);
+
+    list1.setSize(15);
+    printPackedList(list1);
+
+    list1.setSize(32);
+    printPackedList(list1);
+
+    // test assignment
+    list1[16] = 5;
+    printPackedList(list1);
+
+    // auto-vivify
+    list1[36] = list1.max_value();
+    printPackedList(list1);
+
+    list1.setSize(4);
+    printPackedList(list1);
+
+    PackedList<3> list2(list1);
+    list2.append(4);
+
+    cout << "after copy + append\n";
+    printPackedList(list1);
+    printPackedList(list2);
+
     return 0;
 }
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index ff006523fc..3af810cefa 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -38,21 +38,6 @@ Foam::PackedList<nBits>::PackedList(const label size, const unsigned int val)
 }
 
 
-template<int nBits>
-Foam::PackedList<nBits>::PackedList(const PackedList<nBits>& lst)
-:
-    List<unsigned int>(lst),
-    size_(lst.size())
-{}
-
-
-template<int nBits>
-Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
-{
-    transfer(lst());
-}
-
-
 template<int nBits>
 Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
 :
@@ -66,77 +51,11 @@ Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
 }
 
 
-template<int nBits>
-Foam::autoPtr<Foam::PackedList<nBits> > Foam::PackedList<nBits>::clone() const
-{
-    return autoPtr<PackedList<nBits> >(new PackedList<nBits>(*this));
-}
-
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int nBits>
-void Foam::PackedList<nBits>::setSize(const label newSize)
-{
-    List<unsigned int>::setSize(storageSize(newSize), 0);
-    size_ = newSize;
-}
-
-
-template<int nBits>
-void Foam::PackedList<nBits>::setSize
-(
-    const label newSize,
-    const unsigned int& val
-)
-{
-#   ifdef DEBUGList
-    checkValue(val);
-#   endif
-
-    List<unsigned int>::setSize(storageSize(newSize), 0);
-
-    if (val && newSize > size_)
-    {
-        // fill new elements
-        for (label i = size_; i < newSize; i++)
-        {
-            set(i, val);
-        }
-    }
-    
-    size_ = newSize;
-}
-
-
-template<int nBits>
-void Foam::PackedList<nBits>::clear()
-{
-    List<unsigned int>::clear();
-    size_ = 0;
-}
-
-
-template<int nBits>
-void Foam::PackedList<nBits>::transfer(PackedList<nBits>& lst)
-{
-    size_ = lst.size();
-    List<unsigned int>::transfer(lst);
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<int nBits>
-void Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
-{
-    setSize(lst.size());
-    List<unsigned int>::operator=(lst);
-}
-
-
-template<int nBits>
-Foam::labelList Foam::PackedList<nBits>::operator()() const
+Foam::labelList Foam::PackedList<nBits>::values() const
 {
     labelList elems(size());
 
@@ -148,6 +67,29 @@ Foam::labelList Foam::PackedList<nBits>::operator()() const
 }
 
 
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<int nBits>
+void Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
+{
+    setCapacity(lst.size());
+    List<unsigned int>::operator=(lst);
+}
+
+
+template<int nBits>
+void Foam::PackedList<nBits>::operator=(const UList<label>& lst)
+{
+    setCapacity(lst.size());
+
+    forAll(lst, i)
+    {
+        set(i, lst[i]);
+    }
+}
+
+
+
 // * * * * * * * * * * * * * * * Ostream Operator *  * * * * * * * * * * * * //
 
 //template<int nBits>
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index a6544b59a4..214c5e6f6c 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -26,14 +26,21 @@ Class
     Foam::PackedList
 
 Description
-    List of packed unsigned ints.
+    A Dynamically allocatable list of packed unsigned ints.
 
     Gets given the number of bits per item.
 
+Note
+    The list resizing is similar to DynamicList, thus the methods clear()
+    and setSize() behave like their DynamicList counterparts and the methods
+    reserve() and setCapacity() can be used to influence the allocation.
+
+SeeAlso
+    Foam::DynamicList
+
 ToDo
     Add checks for bad template parameters (ie, nBits=0, nBits too large).
     Could make PackedBitRef an iterator and use for traversing as well.
-    It could be useful to make PackedList behave a bit like DynamicList.
 
 SourceFiles
     PackedListI.H
@@ -52,6 +59,13 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of friend functions and operators
+template<int nBits> class PackedList;
+
+// template<int nBits>
+// Ostream& operator<<(Ostream&, const PackedList<nBits>&);
+
+
 /*---------------------------------------------------------------------------*\
                       Class PackedListName Declaration
 \*---------------------------------------------------------------------------*/
@@ -64,42 +78,73 @@ TemplateName(PackedList);
 \*---------------------------------------------------------------------------*/
 
 //- The PackedBitRef is used for PackedList
+template <int nBits>
 class PackedBitRef
 {
 private:
 
     // private data
+    // const mutable List<unsigned int>& list_;
+
     unsigned int& elem_;
 
     const label startBit_;
 
-    const unsigned int mask_;
-
 public:
 
-    inline PackedBitRef(unsigned int& elem, label startBit, unsigned int mask)
+    // Static Public Members
+
+        //- The max. number of bits that can be templated.
+        //  Might someday be useful for a template assert.
+        inline static unsigned int max_bits();
+
+        //- The max. value for an entry, can also be used as the mask
+        //  eg, ((1 << 2) - 1) yields 0b0011
+        inline static unsigned int max_value();
+
+        //- The number of entries per storage entry
+        inline static unsigned int packing();
+
+
+    // Constructors
+    inline PackedBitRef
+    (
+        // const List<unsigned int>& lst
+        const unsigned int& elem, label startBit)
     :
-        elem_(elem),
-        startBit_(startBit),
-        mask_(mask)
+        // list_(lst),
+        elem_(const_cast<unsigned int&>(elem)),
+        startBit_(startBit)
     {}
 
+
+    // Members
+
+    // Assign value
     inline void operator=(const unsigned int val)
     {
-        unsigned int shiftedMask = mask_ << startBit_;
-        unsigned int shiftedVal  = (val & mask_) << startBit_;
+        unsigned int shiftedMask = max_value() << startBit_;
+        unsigned int shiftedVal  = (val & max_value()) << startBit_;
 
         elem_ = (elem_ & ~shiftedMask) | shiftedVal;
     }
 
-    inline operator unsigned int () const
+    // return value
+    inline unsigned int operator()() const
     {
-        return ((elem_ >> startBit_) & mask_);
+        return ((elem_ >> startBit_) & max_value());
     }
 
+    //- Conversion operator
+    inline operator unsigned int () const
+    {
+        return ((elem_ >> startBit_) & max_value());
+    }
+
+    //- Conversion operator
     inline operator bool() const
     {
-        return !!((elem_ >> startBit_) & mask_);
+        return !!((elem_ >> startBit_) & max_value());
     }
 
 };
@@ -139,14 +184,23 @@ public:
 
         //- The max. number of bits that can be templated.
         //  Might someday be useful for a template assert.
-        inline static unsigned int max_bits();
+        inline static unsigned int max_bits()
+        {
+            return PackedBitRef<nBits>::max_bits();
+        }
 
         //- The max. value for an entry, can also be used as the mask
         //  eg, ((1 << 2) - 1) yields 0b0011
-        inline static unsigned int max_value();
+        inline static unsigned int max_value()
+        {
+            return PackedBitRef<nBits>::max_value();
+        }
 
         //- The number of entries per storage entry
-        inline static unsigned int packing();
+        inline static unsigned int packing()
+        {
+            return PackedBitRef<nBits>::packing();
+        }
 
 
     // Constructors
@@ -154,101 +208,116 @@ public:
         //- Null constructor
         inline PackedList();
 
-        //- Construct with given size. Note: initializes intList to 0.
+        //- Construct with given size. Note: initializes list to 0.
         inline PackedList(const label size);
 
         //- Construct with given size and value for all elements.
         PackedList(const label size, const unsigned val);
 
         //- Copy constructor.
-        PackedList(const PackedList<nBits>& PList);
+        inline PackedList(const PackedList<nBits>&);
 
         //- Construct by transferring the parameter contents
-        PackedList(const Xfer<PackedList<nBits> >&);
+        inline PackedList(const Xfer<PackedList<nBits> >&);
 
         //- Construct from a list of labels
         PackedList(const UList<label>&);
 
         //- Clone
-        inline autoPtr<PackedList<nBits> > clone() const;
+        inline autoPtr< PackedList<nBits> > clone() const;
 
     // Member Functions
 
         // Access
 
-            //- The number of elements that can be stored before resizing
-            inline label capacity() const;
+        //- The number of elements that can be stored before resizing
+        inline label capacity() const;
 
-            //- Number of packed elements
-            inline label size() const;
+        //- Number of packed elements.
+        inline label size() const;
 
-            //- Return true if the list is empty (i.e., if size() == 0).
-            inline bool empty() const;
+        //- Return true if the list is empty (i.e., if size() == 0).
+        inline bool empty() const;
 
-            //- Get value at index I
-            inline unsigned int get(const label i) const;
+        //- Get value at index I.
+        //  Does not auto-vivifies elements.
+        inline unsigned int get(const label i) const;
 
-            //- Set value at index I. Return true if value changed.
-            inline bool set(const label i, const unsigned int val);
+        //- Set value at index I. Return true if value changed.
+        //  Does not auto-vivifies elements.
+        inline bool set(const label i, const unsigned int val);
 
-            //- Underlying storage
-            inline List<unsigned int>& storage();
-
-            //- Underlying storage
-            inline const List<unsigned int>& storage() const;
+        //- Underlying storage
+        inline const List<unsigned int>& storage() const;
 
+        //- Return as labelList
+        labelList values() const;
 
         // Edit
 
-            //- Reset size of List, setting zero for any new elements.
-            void setSize(const label);
+        //- Alter the size of the underlying storage.
+        //  The addressed size will be truncated if needed to fit, but will
+        //  remain otherwise untouched.
+        //  Use this or reserve() in combination with append().
+        inline void setCapacity(const label);
 
-            //- Reset size of List and value for new elements.
-            void setSize(const label, const unsigned int& val);
+        //- Reset size of List, optionally specify a value for new elements.
+        inline void resize(const label, const unsigned int& val = 0);
 
-            //- Reset size of List, setting zero for any new elements.
-            inline void resize(const label);
+        //- Reset size of List, optionally specify a value for new elements.
+        inline void setSize(const label, const unsigned int& val = 0);
 
-            //- Reset size of List and value for new elements.
-            inline void resize(const label, const unsigned int& val);
+        //- Reserve allocation space for at least this size.
+        //  Never shrinks the allocated size.
+        //  Optionally provide an initialization value for new elements.
+        inline void reserve(const label, const unsigned int& val = 0);
 
-        //- Construct with given size and value for all elements.
+        //- Clear the list, i.e. set size to zero.
+        //- Does not adjust the underlying storage
+        inline void clear();
 
-            //- Clear the list, i.e. set size to zero.
-            void clear();
+        //- Clear the list and delete storage.
+        inline void clearStorage();
 
-            //- Transfer the contents of the argument List into this List
-            //  and annull the argument list.
-            void transfer(PackedList<nBits>&);
+        //- Shrink the allocated space to what is used.
+        inline void shrink();
 
-            //- Transfer contents to the Xfer container
-            inline Xfer<PackedList<nBits> > xfer();
+        //- Transfer the contents of the argument List into this List
+        //  and annull the argument list.
+        inline void transfer(PackedList<nBits>&);
 
+        //- Transfer contents to the Xfer container
+        inline Xfer<PackedList<nBits> > xfer();
 
     // Member operators
 
-            //- Get value at index i
-            inline unsigned int operator[](const label i) const;
+        //- Append a value at the end of the list. Return true if value changed.
+        inline bool append(const unsigned int val);
 
-            //- Set value at index i.
-            //  Returns proxy to perform the actual operation
-            inline ::Foam::PackedBitRef operator[](const label i);
+        //- Get value at index I
+        //  Does not auto-vivifies elements.
+        inline unsigned int operator[](const label i) const;
 
-            //- Assignment operator. Takes linear time.
-            void operator=(const PackedList<nBits>&);
+        //- Set value at index I.
+        //  Returns proxy to perform the actual operation.
+        //  Auto-vivifies any new values to zero.
+        inline ::Foam::PackedBitRef<nBits> operator[](const label i);
 
-            //- Assignment of all entries to the given value.
-            //  Does set on all elements.
-            inline void operator=(const unsigned int val);
+        //- Assignment of all entries to the given value.
+        //  Does set on all elements.
+        inline void operator=(const unsigned int val);
 
-            //- Return as labelList
-            labelList operator()() const;
+        //- Assignment operator. Takes linear time.
+        void operator=(const PackedList<nBits>&);
 
+        //- Assignment operator. Takes linear time.
+        void operator=(const UList<label>&);
 
     // Ostream operator
 
-   //  // Write PackedList to Ostream.
-   //  friend Ostream& operator<< <nBits> (Ostream&, const PackedList<nBits>&);
+    //  // Write PackedList to Ostream.
+    //  friend Ostream& operator<< <nBits> (Ostream&, const PackedList<nBits>&);
+
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index d753a89426..5d534e88da 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -33,21 +33,21 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<int nBits>
-inline unsigned int Foam::PackedList<nBits>::max_bits()
+inline unsigned int Foam::PackedBitRef<nBits>::max_bits()
 {
     return sizeof(unsigned int)*8 - 1;
 }
 
 
 template<int nBits>
-inline unsigned int Foam::PackedList<nBits>::max_value()
+inline unsigned int Foam::PackedBitRef<nBits>::max_value()
 {
     return ((1u << nBits) - 1);
 }
 
 
 template<int nBits>
-inline unsigned int Foam::PackedList<nBits>::packing()
+inline unsigned int Foam::PackedBitRef<nBits>::packing()
 {
     return sizeof(unsigned int)*8 / nBits;
 }
@@ -114,7 +114,7 @@ inline void Foam::PackedList<nBits>::checkIndex(const label i) const
 template<int nBits>
 inline Foam::PackedList<nBits>::PackedList()
 :
-    List<unsigned int>(0),
+    List<unsigned int>(),
     size_(0)
 {}
 
@@ -128,33 +128,31 @@ inline Foam::PackedList<nBits>::PackedList(const label size)
 {}
 
 
+template<int nBits>
+inline Foam::PackedList<nBits>::PackedList(const PackedList<nBits>& lst)
+:
+    List<unsigned int>(lst),
+    size_(lst.size())
+{}
+
+
+template<int nBits>
+inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
+{
+    transfer(lst());
+}
+
+
+
+template<int nBits>
+inline Foam::autoPtr<Foam::PackedList<nBits> > Foam::PackedList<nBits>::clone() const
+{
+    return autoPtr<PackedList<nBits> >(new PackedList<nBits>(*this));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<int nBits>
-inline void Foam::PackedList<nBits>::resize(const label newSize)
-{
-    setSize(newSize);
-}
-
-
-template<int nBits>
-inline void Foam::PackedList<nBits>::resize
-(
-    const label newSize,
-    const unsigned int& val
-)
-{
-    setSize(newSize, val);
-}
-
-
-template<int nBits>
-inline Foam::label Foam::PackedList<nBits>::capacity() const
-{
-    return packing() * List<unsigned int>::size();
-}
-
-
 template<int nBits>
 inline Foam::label Foam::PackedList<nBits>::size() const
 {
@@ -169,6 +167,102 @@ inline bool Foam::PackedList<nBits>::empty() const
 }
 
 
+template<int nBits>
+inline void Foam::PackedList<nBits>::resize
+(
+    const label newSize,
+    const unsigned int& val
+)
+{
+    reserve(newSize, val);
+    size_ = newSize;
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::setSize
+(
+    const label newSize,
+    const unsigned int& val
+)
+{
+    resize(newSize, val);
+}
+
+
+
+template<int nBits>
+inline Foam::label Foam::PackedList<nBits>::capacity() const
+{
+    return packing() * List<unsigned int>::size();
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::setCapacity(const label nElem)
+{
+    List<unsigned int>::setSize(storageSize(nElem), 0);
+
+    for (label i = size_; i < nElem; i++)
+    {
+        set(i, 0);
+    }
+
+    size_ = nElem;
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::reserve
+(
+    const label nElem,
+    const unsigned int& val
+)
+{
+    label rawSize = storageSize(nElem);
+
+    // need more capacity?
+    if (rawSize > List<unsigned int>::size())
+    {
+        List<unsigned int>::setSize(rawSize, 0);
+    }
+
+    // fill new elements, don't rely on List::setSize
+    for (label i = size_; i < nElem; i++)
+    {
+        set(i, val);
+    }
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::clear()
+{
+    size_ = 0;
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::clearStorage()
+{
+    List<unsigned int>::clear();
+    size_ = 0;
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::shrink()
+{
+    label rawSize = storageSize(size_);
+
+    // we have unused space?
+    if (rawSize < List<unsigned int>::size())
+    {
+        List<unsigned int>::setSize(rawSize);
+    }
+}
+
+
 // Get value at i
 template<int nBits>
 inline unsigned int Foam::PackedList<nBits>::get(const label i) const
@@ -183,6 +277,10 @@ inline unsigned int Foam::PackedList<nBits>::get(const label i) const
         location(i, startBit)
     );
 
+    // PackedBitRef<nBits> iter(*this, elem, startBit);
+
+    // return PackedBitRef<nBits>(*this, elem, startBit)();
+
     return (elem >> startBit) & max_value();
 }
 
@@ -221,9 +319,13 @@ inline bool Foam::PackedList<nBits>::set(const label i, const unsigned int val)
 
 
 template<int nBits>
-inline Foam::List<unsigned int>& Foam::PackedList<nBits>::storage()
+inline bool Foam::PackedList<nBits>::append(const unsigned int val)
 {
-    return static_cast<List<unsigned int>&>(*this);
+    label elemI = size_;
+    reserve(elemI + 1);
+    size_++;
+
+    return set(elemI, val);
 }
 
 
@@ -234,6 +336,17 @@ inline const Foam::List<unsigned int>& Foam::PackedList<nBits>::storage() const
 }
 
 
+template<int nBits>
+inline void Foam::PackedList<nBits>::transfer(PackedList<nBits>& lst)
+{
+    size_ = lst.size_;
+    lst.size_ = 0;
+
+    List<unsigned int>::transfer(lst);
+}
+
+
+
 template<int nBits>
 inline Foam::Xfer<Foam::PackedList<nBits> >
 Foam::PackedList<nBits>::xfer()
@@ -244,12 +357,13 @@ Foam::PackedList<nBits>::xfer()
 
 
 template<int nBits>
-inline Foam::PackedBitRef
+inline typename Foam::PackedBitRef<nBits>
 Foam::PackedList<nBits>::operator[](const label i)
 {
-#   ifdef DEBUGList
-    checkIndex(i);
-#   endif
+    if (i >= size_)
+    {
+        setSize(i + 1);
+    }
 
     label startBit;
     unsigned int& elem = List<unsigned int>::operator[]
@@ -257,7 +371,12 @@ Foam::PackedList<nBits>::operator[](const label i)
         location(i, startBit)
     );
 
-    return ::Foam::PackedBitRef(elem, startBit, max_value());
+    return ::Foam::PackedBitRef<nBits>
+    (
+        // *this,
+        elem, 
+        startBit
+    );
 }
 
 
@@ -269,17 +388,17 @@ inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
     checkValue(val);
 #   endif
 
-    if (val == 0)
+    if (val)
     {
-        List<unsigned int>::operator=(val);
-    }
-    else
-    {
-        for (label i = 0; i < size_; i++)
+        forAll(*this, i)
         {
             set(i, val);
         }
     }
+    else
+    {
+        List<unsigned int>::operator=(val);
+    }
 }
 
 

From 5140b7c577fc6209d531a06304548e38d1a868d1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Thu, 22 Jan 2009 17:07:49 +0000
Subject: [PATCH 23/32] renamed directory

---
 src/sampling/Make/files                                       | 4 ++--
 .../sampledSurface/{patch => sampledPatch}/sampledPatch.C     | 0
 .../sampledSurface/{patch => sampledPatch}/sampledPatch.H     | 0
 .../{patch => sampledPatch}/sampledPatchTemplates.C           | 0
 .../sampledSurface/{plane => sampledPlane}/sampledPlane.C     | 0
 .../sampledSurface/{plane => sampledPlane}/sampledPlane.H     | 0
 .../{plane => sampledPlane}/sampledPlaneTemplates.C           | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename src/sampling/sampledSurface/{patch => sampledPatch}/sampledPatch.C (100%)
 rename src/sampling/sampledSurface/{patch => sampledPatch}/sampledPatch.H (100%)
 rename src/sampling/sampledSurface/{patch => sampledPatch}/sampledPatchTemplates.C (100%)
 rename src/sampling/sampledSurface/{plane => sampledPlane}/sampledPlane.C (100%)
 rename src/sampling/sampledSurface/{plane => sampledPlane}/sampledPlane.H (100%)
 rename src/sampling/sampledSurface/{plane => sampledPlane}/sampledPlaneTemplates.C (100%)

diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index c20d4aa7a6..43bc910a3c 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -22,8 +22,8 @@ $(setWriters)/xmgrace/xmgraceSetWriterRunTime.C
 
 cuttingPlane/cuttingPlane.C
 
-sampledSurface/patch/sampledPatch.C
-sampledSurface/plane/sampledPlane.C
+sampledSurface/sampledPatch/sampledPatch.C
+sampledSurface/sampledPlane/sampledPlane.C
 sampledSurface/isoSurface/isoSurface.C
 sampledSurface/isoSurface/sampledIsoSurface.C
 sampledSurface/isoSurface/isoSurfaceCell.C
diff --git a/src/sampling/sampledSurface/patch/sampledPatch.C b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
similarity index 100%
rename from src/sampling/sampledSurface/patch/sampledPatch.C
rename to src/sampling/sampledSurface/sampledPatch/sampledPatch.C
diff --git a/src/sampling/sampledSurface/patch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
similarity index 100%
rename from src/sampling/sampledSurface/patch/sampledPatch.H
rename to src/sampling/sampledSurface/sampledPatch/sampledPatch.H
diff --git a/src/sampling/sampledSurface/patch/sampledPatchTemplates.C b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
similarity index 100%
rename from src/sampling/sampledSurface/patch/sampledPatchTemplates.C
rename to src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
diff --git a/src/sampling/sampledSurface/plane/sampledPlane.C b/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
similarity index 100%
rename from src/sampling/sampledSurface/plane/sampledPlane.C
rename to src/sampling/sampledSurface/sampledPlane/sampledPlane.C
diff --git a/src/sampling/sampledSurface/plane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
similarity index 100%
rename from src/sampling/sampledSurface/plane/sampledPlane.H
rename to src/sampling/sampledSurface/sampledPlane/sampledPlane.H
diff --git a/src/sampling/sampledSurface/plane/sampledPlaneTemplates.C b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
similarity index 100%
rename from src/sampling/sampledSurface/plane/sampledPlaneTemplates.C
rename to src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C

From cc4cd0a171c949960e4527229e509b21d4bc65d2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 23 Jan 2009 01:40:55 +0100
Subject: [PATCH 24/32] PackedList: encapsulate calculations in an iterator

- eliminated previous PackedBitRef class, the iterator does all of that and
  can also be used to (forward) traverse the list
- no const_iterator yet

- Note that PackedList is also a bit like DynamicList in terms of storage
  management and the append() method. Since the underlying storage in
  integer, any auto-vivified elements will also flood-fill the gaps with
  zero.
---
 applications/test/PackedList/PackedListTest.C | 156 ++++---
 .../containers/Lists/PackedList/PackedList.C  |  75 +++-
 .../containers/Lists/PackedList/PackedList.H  | 224 +++++-----
 .../containers/Lists/PackedList/PackedListI.H | 421 +++++++++++-------
 4 files changed, 527 insertions(+), 349 deletions(-)

diff --git a/applications/test/PackedList/PackedListTest.C b/applications/test/PackedList/PackedListTest.C
index 6bc951cfa7..b00c703a37 100644
--- a/applications/test/PackedList/PackedListTest.C
+++ b/applications/test/PackedList/PackedListTest.C
@@ -28,112 +28,144 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#include "OSspecific.H"
-
 #include "IOstreams.H"
-#include "IStringStream.H"
-#include "scalar.H"
-#include "vector.H"
-#include "ListOps.H"
-#include "List.H"
 #include "PackedBoolList.H"
-#include <bitset>
 
 using namespace Foam;
 
-template <int nBits>
-void printPackedList(const PackedList<nBits>& L)
-{
-    const List<unsigned int>& stor = L.storage();
-
-    cout<< "PackedList<" << nBits << ">"
-        << " max_bits:"  << L.max_bits()
-        << " max_value:" << L.max_value()
-        << " packing:"   << L.packing() << nl;
-
-    cout<< "values:  " << L.size() << "/" << L.capacity() << " ( ";
-    forAll(L, i)
-    {
-        cout<< L[i] << ' ';
-    }
-    cout<< ")\n";
-
-    // using std:bitset for output works, but annoys valgrind
-    cout<< "storage: " << stor.size() << "( ";
-    forAll(stor, i)
-    {
-        cout<< std::bitset<32>(stor[i]) << ' ';
-    }
-    cout<< ")\n" << nl;
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:
 
 int main(int argc, char *argv[])
-{    
-    cout<< "PackedList::max_bits() = " << PackedList<0>::max_bits() << nl;
+{
+    bool changed;
+    Info<< "PackedList max_bits() = " << PackedList<0>::max_bits() << nl;
 
+    Info<< "\ntest allocation with value\n";
     PackedList<3> list1(5,1);
+    list1.print(Info);
 
-    printPackedList(list1);
-
+    Info<< "\ntest assign uniform value\n";
     list1 = 2;
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest resize with value (without reallocation)\n";
     list1.resize(6, 3);
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest set() function\n";
+    list1.set(1, 5);
+    list1.print(Info);
+
+    Info<< "\ntest assign bool\n";
     list1 = false;
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest assign bool\n";
     list1 = true;
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest resize without value (with reallocation)\n";
     list1.resize(12);
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest resize with value (with reallocation)\n";
     list1.resize(25, list1.max_value());
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest resize smaller (should not touch allocation)\n";
     list1.resize(8);
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest append() operation\n";
     list1.append(2);
     list1.append(3);
     list1.append(4);
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest reserve() operation\n";
     list1.reserve(32);
-    printPackedList(list1);
+    list1.print(Info);
 
+    Info<< "\ntest shrink() operation\n";
     list1.shrink();
-    printPackedList(list1);
+    list1.print(Info);
 
-    list1.setSize(15);
-    printPackedList(list1);
+    Info<< "\ntest setCapacity() operation\n";
+    list1.setCapacity(15);
+    list1.print(Info);
 
-    list1.setSize(32);
-    printPackedList(list1);
+    Info<< "\ntest setCapacity() operation\n";
+    list1.setCapacity(30);
+    list1.print(Info);
 
-    // test assignment
+    Info<< "\ntest operator[] assignment\n";
     list1[16] = 5;
-    printPackedList(list1);
+    list1.print(Info);
 
-    // auto-vivify
+    Info<< "\ntest operator[] assignment with auto-vivify\n";
     list1[36] = list1.max_value();
-    printPackedList(list1);
+    list1.print(Info);
 
-    list1.setSize(4);
-    printPackedList(list1);
+    Info<< "\ntest setCapacity smaller\n";
+    list1.setCapacity(32);
+    list1.print(Info);
 
+    // add in some misc values
+    list1[31] = 1;
+    list1[32] = 2;
+    list1[33] = 3;
+
+    Info<< "\ntest iterator\n";
+    PackedList<3>::iterator iter = list1.begin();
+    Info<< "iterator:" << iter() << "\n";
+    iter.print(Info) << "\n";
+
+    Info<< "\ntest iterator operator=\n";
+    changed = (iter = 5);
+
+    Info<< "iterator:" << iter() << "\n";
+    Info<< "changed:" << changed << "\n";
+    changed = (iter = 5);
+    Info<< "changed:" << changed << "\n";
+    list1.print(Info);
+
+    Info<< "\ntest get() method\n";
+    Info<< "get(10):" << list1.get(10)
+        << " and list[10]:" << unsigned(list1[10]) << "\n";
+    list1.print(Info);
+
+    Info<< "\ntest iterator indexing\n";
+    Info<< "end() ";
+    list1.end().print(Info) << "\n";
+
+    for (iter = list1[31]; iter != list1.end(); ++iter)
+    {
+        iter.print(Info);
+    }
+
+    Info<< "\ntest operator[] auto-vivify\n";
+    const unsigned int val = list1[45];
+
+    Info<< "list[45]:" << val << "\n";
+    list1.print(Info);
+
+
+    Info<< "\ntest copy constructor + append\n";
     PackedList<3> list2(list1);
     list2.append(4);
+    Info<< "source list:\n";
+    list1.print(Info);
+    Info<< "destination list:\n";
+    list2.print(Info);
 
-    cout << "after copy + append\n";
-    printPackedList(list1);
-    printPackedList(list2);
+    Info<< "\ntest pattern that fills all bits\n";
+    PackedList<4> list3(8, 8);
+    list3[list3.size()-2] = 0;
+    list3[list3.size()-1] = list3.max_value();
+    list3.print(Info);
+
+    Info<< "\n\nDone.\n";
 
     return 0;
 }
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 3af810cefa..d4bb3ca826 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -31,7 +31,7 @@ License
 template<int nBits>
 Foam::PackedList<nBits>::PackedList(const label size, const unsigned int val)
 :
-    List<unsigned int>(storageSize(size)),
+    List<PackedStorage>(packedLength(size), 0u),
     size_(size)
 {
     operator=(val);
@@ -41,7 +41,7 @@ Foam::PackedList<nBits>::PackedList(const label size, const unsigned int val)
 template<int nBits>
 Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
 :
-    List<unsigned int>(storageSize(lst.size()), 0),
+    List<PackedStorage>(packedLength(lst.size()), 0u),
     size_(lst.size())
 {
     forAll(lst, i)
@@ -51,7 +51,6 @@ Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
 }
 
 
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int nBits>
@@ -67,13 +66,81 @@ Foam::labelList Foam::PackedList<nBits>::values() const
 }
 
 
+template<int nBits>
+Foam::Ostream& Foam::PackedList<nBits>::iterator::print(Ostream& os) const
+{
+    os  << "iterator<" << nBits << "> [" << position() << "]"
+        << " elem:" << elem_ << " offset:" << offset_
+        << " value:" << unsigned(*this)
+        << nl;
+
+    return os;
+}
+
+
+template<int nBits>
+Foam::Ostream& Foam::PackedList<nBits>::print(Ostream& os) const
+{
+    os  << "PackedList<" << nBits << ">"
+        << " max_value:" << max_value()
+        << " packing:"   << packing() << nl
+        << "values: " << size() << "/" << capacity() << "( ";
+    forAll(*this, i)
+    {
+        os << get(i) << ' ';
+    }
+
+    os  << ")\n"
+        << "storage: " << storage().size() << "( ";
+
+    label count = size();
+
+    forAll(storage(), i)
+    {
+        const PackedStorage& rawBits = storage()[i];
+
+        // create mask for unaddressed bits
+        unsigned int addressed = 0;
+
+        for (unsigned packI = 0; count && packI < packing(); packI++, count--)
+        {
+            addressed <<= nBits;
+            addressed |= max_value();
+        }
+
+        for (unsigned int testBit = 0x1 << max_bits(); testBit; testBit >>= 1)
+        {
+            if (testBit & addressed)
+            {
+                if (rawBits & testBit)
+                {
+                    os << '1';
+                }
+                else
+                {
+                    os << '0';
+                }
+            }
+            else
+            {
+                os << '_';
+            }
+        }
+        cout << ' ';
+    }
+    os << ")\n";
+
+    return os;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<int nBits>
 void Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
 {
     setCapacity(lst.size());
-    List<unsigned int>::operator=(lst);
+    List<PackedStorage>::operator=(lst);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 214c5e6f6c..982b33ee44 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -40,7 +40,7 @@ SeeAlso
 
 ToDo
     Add checks for bad template parameters (ie, nBits=0, nBits too large).
-    Could make PackedBitRef an iterator and use for traversing as well.
+    The missing const_iterator might eventually still be needed.
 
 SourceFiles
     PackedListI.H
@@ -52,7 +52,6 @@ SourceFiles
 #define PackedList_H
 
 #include "labelList.H"
-#include "List.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,84 +71,6 @@ template<int nBits> class PackedList;
 
 TemplateName(PackedList);
 
-
-/*---------------------------------------------------------------------------*\
-                        Class PackedBitRef Declaration
-\*---------------------------------------------------------------------------*/
-
-//- The PackedBitRef is used for PackedList
-template <int nBits>
-class PackedBitRef
-{
-private:
-
-    // private data
-    // const mutable List<unsigned int>& list_;
-
-    unsigned int& elem_;
-
-    const label startBit_;
-
-public:
-
-    // Static Public Members
-
-        //- The max. number of bits that can be templated.
-        //  Might someday be useful for a template assert.
-        inline static unsigned int max_bits();
-
-        //- The max. value for an entry, can also be used as the mask
-        //  eg, ((1 << 2) - 1) yields 0b0011
-        inline static unsigned int max_value();
-
-        //- The number of entries per storage entry
-        inline static unsigned int packing();
-
-
-    // Constructors
-    inline PackedBitRef
-    (
-        // const List<unsigned int>& lst
-        const unsigned int& elem, label startBit)
-    :
-        // list_(lst),
-        elem_(const_cast<unsigned int&>(elem)),
-        startBit_(startBit)
-    {}
-
-
-    // Members
-
-    // Assign value
-    inline void operator=(const unsigned int val)
-    {
-        unsigned int shiftedMask = max_value() << startBit_;
-        unsigned int shiftedVal  = (val & max_value()) << startBit_;
-
-        elem_ = (elem_ & ~shiftedMask) | shiftedVal;
-    }
-
-    // return value
-    inline unsigned int operator()() const
-    {
-        return ((elem_ >> startBit_) & max_value());
-    }
-
-    //- Conversion operator
-    inline operator unsigned int () const
-    {
-        return ((elem_ >> startBit_) & max_value());
-    }
-
-    //- Conversion operator
-    inline operator bool() const
-    {
-        return !!((elem_ >> startBit_) & max_value());
-    }
-
-};
-
-
 /*---------------------------------------------------------------------------*\
                          Class PackedList Declaration
 \*---------------------------------------------------------------------------*/
@@ -159,6 +80,8 @@ class PackedList
 :
     private List<unsigned int>
 {
+    typedef unsigned int PackedStorage;
+
     // Private data
 
         //- Number of nBits entries
@@ -166,16 +89,10 @@ class PackedList
 
     // Private Member Functions
 
-        //- Calculate underlying list size
-        inline static label storageSize(const label);
+        //- Calculate the list length when packed
+        inline static label packedLength(const label);
 
-        //- Calculate element index and offset (start) bit within storage
-        inline static label location(const label, label& offset);
-
-        //- Check if value is representable in nBits
-        inline static void checkValue(const unsigned int);
-
-        //- Check index i is within valid range (0 ... size-1).
+        //- Check index I is within valid range [ 0 .. max_value() ]
         inline void checkIndex(const label) const;
 
 public:
@@ -184,23 +101,18 @@ public:
 
         //- The max. number of bits that can be templated.
         //  Might someday be useful for a template assert.
-        inline static unsigned int max_bits()
-        {
-            return PackedBitRef<nBits>::max_bits();
-        }
+        inline static unsigned int max_bits();
 
-        //- The max. value for an entry, can also be used as the mask
+        //- The max. value for an entry, which simultaneously the bit-mask
         //  eg, ((1 << 2) - 1) yields 0b0011
-        inline static unsigned int max_value()
-        {
-            return PackedBitRef<nBits>::max_value();
-        }
+        inline static unsigned int max_value();
 
-        //- The number of entries per storage entry
-        inline static unsigned int packing()
-        {
-            return PackedBitRef<nBits>::packing();
-        }
+        //- The number of entries per packed storage element
+        inline static unsigned int packing();
+
+    // Forward declaration of iterator
+        class iterator;
+        friend class iterator;
 
 
     // Constructors
@@ -208,7 +120,7 @@ public:
         //- Null constructor
         inline PackedList();
 
-        //- Construct with given size. Note: initializes list to 0.
+        //- Construct with given size, initializes list to 0.
         inline PackedList(const label size);
 
         //- Construct with given size and value for all elements.
@@ -233,38 +145,41 @@ public:
         //- The number of elements that can be stored before resizing
         inline label capacity() const;
 
-        //- Number of packed elements.
+        //- Number of entries.
         inline label size() const;
 
         //- Return true if the list is empty (i.e., if size() == 0).
         inline bool empty() const;
 
         //- Get value at index I.
-        //  Does not auto-vivifies elements.
-        inline unsigned int get(const label i) const;
+        //  Does not auto-vivifies entries.
+        inline unsigned int get(const label) const;
 
         //- Set value at index I. Return true if value changed.
-        //  Does not auto-vivifies elements.
-        inline bool set(const label i, const unsigned int val);
+        //  Does not auto-vivifies entries.
+        inline bool set(const label, const unsigned int val);
 
-        //- Underlying storage
+        //- Return the underlying packed storage
         inline const List<unsigned int>& storage() const;
 
-        //- Return as labelList
+        //- Return the values as a labelList
         labelList values() const;
 
+        //- Print values and information
+        Ostream& print(Ostream&) const;
+
         // Edit
 
         //- Alter the size of the underlying storage.
         //  The addressed size will be truncated if needed to fit, but will
         //  remain otherwise untouched.
-        //  Use this or reserve() in combination with append().
         inline void setCapacity(const label);
 
-        //- Reset size of List, optionally specify a value for new elements.
+        //- Reset addressable list size, does not shrink the allocated size.
+        //  Optionally specify a value for new elements.
         inline void resize(const label, const unsigned int& val = 0);
 
-        //- Reset size of List, optionally specify a value for new elements.
+        //- Alias for resize()
         inline void setSize(const label, const unsigned int& val = 0);
 
         //- Reserve allocation space for at least this size.
@@ -272,8 +187,8 @@ public:
         //  Optionally provide an initialization value for new elements.
         inline void reserve(const label, const unsigned int& val = 0);
 
-        //- Clear the list, i.e. set size to zero.
-        //- Does not adjust the underlying storage
+        //- Clear the list, i.e. set addressable size to zero.
+        //  Does not adjust the underlying storage
         inline void clear();
 
         //- Clear the list and delete storage.
@@ -282,7 +197,7 @@ public:
         //- Shrink the allocated space to what is used.
         inline void shrink();
 
-        //- Transfer the contents of the argument List into this List
+        //- Transfer the contents of the argument list into this list
         //  and annull the argument list.
         inline void transfer(PackedList<nBits>&);
 
@@ -291,17 +206,17 @@ public:
 
     // Member operators
 
-        //- Append a value at the end of the list. Return true if value changed.
-        inline bool append(const unsigned int val);
+        //- Append a value at the end of the list
+        inline void append(const unsigned int val);
 
         //- Get value at index I
-        //  Does not auto-vivifies elements.
-        inline unsigned int operator[](const label i) const;
+        //  Auto-vivifies any new values to zero.
+        inline unsigned int operator[](const label) const;
 
         //- Set value at index I.
         //  Returns proxy to perform the actual operation.
         //  Auto-vivifies any new values to zero.
-        inline ::Foam::PackedBitRef<nBits> operator[](const label i);
+        inline iterator operator[](const label);
 
         //- Assignment of all entries to the given value.
         //  Does set on all elements.
@@ -318,6 +233,71 @@ public:
     //  // Write PackedList to Ostream.
     //  friend Ostream& operator<< <nBits> (Ostream&, const PackedList<nBits>&);
 
+
+    //- The iterator-like class used for PackedList
+    class iterator
+    {
+        friend class PackedList;
+
+        // Private Data
+
+        //- Reference to original list
+        PackedList& list_;
+
+        //- Element index within storage
+        unsigned elem_;
+
+        //- Offset within storage element
+        unsigned offset_;
+
+        //- Return the raw storage element
+        inline PackedStorage& chunk() const;
+
+        //- Return the position in the PackedList
+        inline label position() const;
+
+    public:
+
+        // Constructors
+
+        //- Construct from base list and position index
+        inline iterator(const PackedList&, const label i);
+
+        // Members
+
+        //- Assign value, returns true if the value changed
+        inline bool operator=(const unsigned int val);
+
+        //- Conversion operator
+        inline operator unsigned int () const;
+
+        //- Conversion operator
+        inline operator bool() const;
+
+        // Member operators
+
+        inline void operator=(const iterator&);
+        inline bool operator==(const iterator&) const;
+        inline bool operator!=(const iterator&) const;
+
+        //- Return referenced value
+        inline unsigned int operator()() const;
+
+        inline iterator& operator++();
+        inline iterator operator++(int);
+
+        //- Print value and information
+        Ostream& print(Ostream&) const;
+
+    };
+
+
+    //- iterator set to the begining of the PackedList
+    inline iterator begin();
+
+    //- iterator set to beyond the end of the HashTable
+    inline iterator end();
+
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 5d534e88da..94ec883daa 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -25,71 +25,38 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef PackedListI_H
-#define PackedListI_H
-
-#include "IOstreams.H"
+#include "error.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<int nBits>
-inline unsigned int Foam::PackedBitRef<nBits>::max_bits()
+inline unsigned int Foam::PackedList<nBits>::max_bits()
 {
-    return sizeof(unsigned int)*8 - 1;
+    return sizeof(PackedStorage)*8 - 1;
 }
 
 
 template<int nBits>
-inline unsigned int Foam::PackedBitRef<nBits>::max_value()
+inline unsigned int Foam::PackedList<nBits>::max_value()
 {
     return ((1u << nBits) - 1);
 }
 
 
 template<int nBits>
-inline unsigned int Foam::PackedBitRef<nBits>::packing()
+inline unsigned int Foam::PackedList<nBits>::packing()
 {
-    return sizeof(unsigned int)*8 / nBits;
-}
-
-
-// Calculate underlying list size
-template<int nBits>
-inline Foam::label Foam::PackedList<nBits>::storageSize(const label sz)
-{
-    return (sz + packing() - 1) / packing();
+    return sizeof(PackedStorage)*8 / nBits;
 }
 
 
 template<int nBits>
-inline Foam::label Foam::PackedList<nBits>::location
-(
-    const label i,
-    label& offset
-)
+inline Foam::label Foam::PackedList<nBits>::packedLength(const label nElem)
 {
-    // the offset is the start bit within the storage element
-    offset = nBits * (i % packing());
-    return i / packing();
+    return (nElem + packing() - 1) / packing();
 }
 
 
-// Check value is representable in nBits
-template<int nBits>
-inline void Foam::PackedList<nBits>::checkValue(const unsigned int val)
-{
-    if (val > max_value())
-    {
-        FatalErrorIn("PackedList<T>::checkValue(const unsigned int)")
-            << "value " << label(val) << " out of range 0 ... "
-            << label(max_value())
-            << " representable by " << nBits << " bits"
-            << abort(FatalError);
-    }
-}
-
-
-// Check index i is within valid range (0 ... size-1).
 template<int nBits>
 inline void Foam::PackedList<nBits>::checkIndex(const label i) const
 {
@@ -110,20 +77,18 @@ inline void Foam::PackedList<nBits>::checkIndex(const label i) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Null constructor
 template<int nBits>
 inline Foam::PackedList<nBits>::PackedList()
 :
-    List<unsigned int>(),
+    List<PackedStorage>(),
     size_(0)
 {}
 
 
-// Construct with given size.
 template<int nBits>
 inline Foam::PackedList<nBits>::PackedList(const label size)
 :
-    List<unsigned int>(storageSize(size), 0u),
+    List<PackedStorage>(packedLength(size), 0u),
     size_(size)
 {}
 
@@ -131,7 +96,7 @@ inline Foam::PackedList<nBits>::PackedList(const label size)
 template<int nBits>
 inline Foam::PackedList<nBits>::PackedList(const PackedList<nBits>& lst)
 :
-    List<unsigned int>(lst),
+    List<PackedStorage>(lst),
     size_(lst.size())
 {}
 
@@ -143,14 +108,161 @@ inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
 }
 
 
-
 template<int nBits>
-inline Foam::autoPtr<Foam::PackedList<nBits> > Foam::PackedList<nBits>::clone() const
+inline Foam::autoPtr<Foam::PackedList<nBits> >
+Foam::PackedList<nBits>::clone() const
 {
     return autoPtr<PackedList<nBits> >(new PackedList<nBits>(*this));
 }
 
 
+// * * * * * * * * * * * * * * * * Iterators * * * * * * * * * * * * * * * * //
+
+template<int nBits>
+inline Foam::PackedList<nBits>::iterator::iterator
+(
+    const PackedList<nBits>& lst,
+    const label i
+)
+:
+    list_(const_cast<PackedList<nBits>&>(lst)),
+    elem_(i / packing()),
+    offset_(i % packing())
+{}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::iterator::operator=
+(
+    const iterator& iter
+)
+{
+    elem_ = iter.elem_;
+    offset_ = iter.offset_;
+}
+
+
+template<int nBits>
+inline bool Foam::PackedList<nBits>::iterator::operator==
+(
+    const iterator& iter
+) const
+{
+    return elem_ == iter.elem_ && offset_ == iter.offset_;
+}
+
+
+template<int nBits>
+inline bool Foam::PackedList<nBits>::iterator::operator!=
+(
+    const iterator& iter
+) const
+{
+    return !(operator==(iter));
+}
+
+
+template<int nBits>
+inline bool Foam::PackedList<nBits>::iterator::operator=
+(
+    const unsigned int val
+)
+{
+    const unsigned int startBit = nBits * offset_;
+    const unsigned int mask = max_value() << startBit;
+
+    unsigned int& stored = chunk();
+    const unsigned int old = stored;
+
+    stored &= ~mask;
+    stored |= (val << startBit) & mask;
+
+    return (old != stored);
+}
+
+
+template<int nBits>
+inline Foam::label Foam::PackedList<nBits>::iterator::position() const
+{
+    return (elem_ * packing() + offset_);
+}
+
+
+template<int nBits>
+inline unsigned int& Foam::PackedList<nBits>::iterator::chunk() const
+{
+    return list_.List<PackedStorage>::operator[](elem_);
+}
+
+
+template<int nBits>
+inline typename Foam::PackedList<nBits>::iterator&
+Foam::PackedList<nBits>::iterator::operator++()
+{
+    if (position() < list_.size())
+    {
+        offset_++;
+        if (offset_ >= packing())
+        {
+            elem_++;
+            offset_ = 0;
+        }
+    }
+
+    return *this;
+}
+
+
+template<int nBits>
+inline typename Foam::PackedList<nBits>::iterator
+Foam::PackedList<nBits>::iterator::operator++(int)
+{
+    iterator old = *this;
+    ++*this;
+    return old;
+}
+
+
+template<int nBits>
+inline unsigned int
+Foam::PackedList<nBits>::iterator::operator()() const
+{
+    return (chunk() >> (nBits * offset_)) & max_value();
+}
+
+
+template<int nBits>
+inline Foam::PackedList<nBits>::iterator::operator
+unsigned int () const
+{
+    return (chunk() >> (nBits * offset_)) & max_value();
+}
+
+
+template<int nBits>
+inline Foam::PackedList<nBits>::iterator::operator
+bool() const
+{
+    return !!(chunk() >> (nBits * offset_)) & max_value();
+}
+
+
+template<int nBits>
+inline typename Foam::PackedList<nBits>::iterator
+Foam::PackedList<nBits>::begin()
+{
+    return iterator(*this, 0);
+}
+
+
+template<int nBits>
+inline typename Foam::PackedList<nBits>::iterator
+Foam::PackedList<nBits>::end()
+{
+    return iterator(*this, size());
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int nBits>
@@ -170,12 +282,12 @@ inline bool Foam::PackedList<nBits>::empty() const
 template<int nBits>
 inline void Foam::PackedList<nBits>::resize
 (
-    const label newSize,
+    const label nElem,
     const unsigned int& val
 )
 {
-    reserve(newSize, val);
-    size_ = newSize;
+    reserve(nElem, val);
+    size_ = nElem;
 }
 
 
@@ -194,21 +306,35 @@ inline void Foam::PackedList<nBits>::setSize
 template<int nBits>
 inline Foam::label Foam::PackedList<nBits>::capacity() const
 {
-    return packing() * List<unsigned int>::size();
+    return packing() * List<PackedStorage>::size();
 }
 
 
 template<int nBits>
 inline void Foam::PackedList<nBits>::setCapacity(const label nElem)
 {
-    List<unsigned int>::setSize(storageSize(nElem), 0);
+    List<PackedStorage>::setSize(packedLength(nElem), 0u);
 
-    for (label i = size_; i < nElem; i++)
+    // truncates addressable section too
+    if (size_ > nElem)
     {
-        set(i, 0);
+#       ifdef DEBUGList
+        // clear old values (purely cosmetics for string output)
+        for (label i = nElem; i < size_; i++)
+        {
+            set(i, 0);
+        }
+#       endif
+        size_ = nElem;
+    }
+    else
+    {
+        // fill new elements
+        for (label i = size_; i < nElem; i++)
+        {
+            set(i, 0);
+        }
     }
-
-    size_ = nElem;
 }
 
 
@@ -219,15 +345,15 @@ inline void Foam::PackedList<nBits>::reserve
     const unsigned int& val
 )
 {
-    label rawSize = storageSize(nElem);
+    label len = packedLength(nElem);
 
     // need more capacity?
-    if (rawSize > List<unsigned int>::size())
+    if (len > List<PackedStorage>::size())
     {
-        List<unsigned int>::setSize(rawSize, 0);
+        List<PackedStorage>::setSize(len, 0);
     }
 
-    // fill new elements, don't rely on List::setSize
+    // fill new elements
     for (label i = size_; i < nElem; i++)
     {
         set(i, val);
@@ -245,7 +371,7 @@ inline void Foam::PackedList<nBits>::clear()
 template<int nBits>
 inline void Foam::PackedList<nBits>::clearStorage()
 {
-    List<unsigned int>::clear();
+    List<PackedStorage>::clear();
     size_ = 0;
 }
 
@@ -253,86 +379,20 @@ inline void Foam::PackedList<nBits>::clearStorage()
 template<int nBits>
 inline void Foam::PackedList<nBits>::shrink()
 {
-    label rawSize = storageSize(size_);
+    label len = packedLength(size_);
 
     // we have unused space?
-    if (rawSize < List<unsigned int>::size())
+    if (len < List<PackedStorage>::size())
     {
-        List<unsigned int>::setSize(rawSize);
+        List<PackedStorage>::setSize(len);
     }
 }
 
-
-// Get value at i
 template<int nBits>
-inline unsigned int Foam::PackedList<nBits>::get(const label i) const
+inline const Foam::List<unsigned int>&
+Foam::PackedList<nBits>::storage() const
 {
-#   ifdef DEBUGList
-    checkIndex(i);
-#   endif
-
-    label startBit;
-    const unsigned int& elem = List<unsigned int>::operator[]
-    (
-        location(i, startBit)
-    );
-
-    // PackedBitRef<nBits> iter(*this, elem, startBit);
-
-    // return PackedBitRef<nBits>(*this, elem, startBit)();
-
-    return (elem >> startBit) & max_value();
-}
-
-
-template<int nBits>
-inline unsigned int Foam::PackedList<nBits>::operator[](const label i) const
-{
-    return get(i);
-}
-
-
-// Set value at i
-template<int nBits>
-inline bool Foam::PackedList<nBits>::set(const label i, const unsigned int val)
-{
-#   ifdef DEBUGList
-    checkIndex(i);
-    checkValue(val);
-#   endif
-
-    label startBit;
-    unsigned int& elem = List<unsigned int>::operator[]
-    (
-        location(i, startBit)
-    );
-
-    unsigned int oldElem = elem;
-
-    unsigned int shiftedMask = max_value() << startBit;
-    unsigned int shiftedVal  = (val & max_value()) << startBit;
-
-    elem = (elem & ~shiftedMask) | shiftedVal;
-
-    return elem != oldElem;
-}
-
-
-template<int nBits>
-inline bool Foam::PackedList<nBits>::append(const unsigned int val)
-{
-    label elemI = size_;
-    reserve(elemI + 1);
-    size_++;
-
-    return set(elemI, val);
-}
-
-
-template<int nBits>
-inline const Foam::List<unsigned int>& Foam::PackedList<nBits>::storage() const
-{
-    return static_cast<const List<unsigned int>&>(*this);
+    return static_cast<const List<PackedStorage>&>(*this);
 }
 
 
@@ -342,11 +402,10 @@ inline void Foam::PackedList<nBits>::transfer(PackedList<nBits>& lst)
     size_ = lst.size_;
     lst.size_ = 0;
 
-    List<unsigned int>::transfer(lst);
+    List<PackedStorage>::transfer(lst);
 }
 
 
-
 template<int nBits>
 inline Foam::Xfer<Foam::PackedList<nBits> >
 Foam::PackedList<nBits>::xfer()
@@ -355,9 +414,69 @@ Foam::PackedList<nBits>::xfer()
 }
 
 
+template<int nBits>
+inline unsigned int Foam::PackedList<nBits>::get(const label i) const
+{
+#   ifdef DEBUGList
+    checkIndex(i);
+#   endif
+
+    return iterator(*this, i)();
+}
+
 
 template<int nBits>
-inline typename Foam::PackedBitRef<nBits>
+inline unsigned int Foam::PackedList<nBits>::operator[](const label i) const
+{
+    if (i >= size_)
+    {
+        setSize(i + 1);
+        return 0;
+    }
+    else
+    {
+        return iterator(*this, i)();
+    }
+}
+
+
+template<int nBits>
+inline bool Foam::PackedList<nBits>::set
+(
+    const label i,
+    const unsigned int val
+)
+{
+#   ifdef DEBUGList
+    checkIndex(i);
+
+    if (val & ~max_value())
+    {
+        FatalErrorIn("PackedList<T>::set(const label, const unsigned int)")
+            << "value " << label(val)
+            << " out-of-range 0 ... " << label(max_value())
+            << " representable by " << nBits << " bits"
+            << abort(FatalError);
+    }
+#   endif
+
+    return (iterator(*this, i) = val);
+}
+
+
+template<int nBits>
+inline void Foam::PackedList<nBits>::append(const unsigned int val)
+{
+    label elemI = size_;
+    reserve(elemI + 1);
+    size_++;
+
+    iterator(*this, elemI) = val;
+}
+
+
+template<int nBits>
+inline typename Foam::PackedList<nBits>::iterator
 Foam::PackedList<nBits>::operator[](const label i)
 {
     if (i >= size_)
@@ -365,45 +484,25 @@ Foam::PackedList<nBits>::operator[](const label i)
         setSize(i + 1);
     }
 
-    label startBit;
-    unsigned int& elem = List<unsigned int>::operator[]
-    (
-        location(i, startBit)
-    );
-
-    return ::Foam::PackedBitRef<nBits>
-    (
-        // *this,
-        elem, 
-        startBit
-    );
+    return iterator(*this, i);
 }
 
 
-// Set all to val
 template<int nBits>
 inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
 {
-#   ifdef DEBUGList
-    checkValue(val);
-#   endif
-
     if (val)
     {
-        forAll(*this, i)
+        forAll(*this, elemI)
         {
-            set(i, val);
+            set(elemI, val);
         }
     }
     else
     {
-        List<unsigned int>::operator=(val);
+        List<PackedStorage>::operator=(val);
     }
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
 // ************************************************************************* //

From e78671dea45d29ad2f8a87c08089f31bea3abc95 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 23 Jan 2009 08:33:33 +0000
Subject: [PATCH 25/32] Select OpenMPI-1.3.

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

diff --git a/etc/settings.csh b/etc/settings.csh
index ee6a08c94a..73b14eb38c 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -121,7 +121,7 @@ unset MPI_ARCH_PATH
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    set mpi_version=openmpi-1.2.8
+    set mpi_version=openmpi-1.3
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 2621e1530c..ff56af0b95 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -151,7 +151,7 @@ unset MPI_ARCH_PATH
 
 case "$WM_MPLIB" in
 OPENMPI)
-    mpi_version=openmpi-1.2.8
+    mpi_version=openmpi-1.3
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
 

From 3be01b9e86a3d2b444387505bfb73bd2600dfc25 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 23 Jan 2009 08:35:29 +0000
Subject: [PATCH 26/32] Added "max" and "min" constants to the primitive types
 which represent the largest and smallest representable values.  Accessible
 directly and via pTraits.

---
 .../FieldFields/FieldField/FieldFieldFunctions.C | 10 ++--------
 .../fields/Fields/Field/FieldFunctions.C         | 10 ++--------
 src/OpenFOAM/primitives/DiagTensor/DiagTensor.H  |  2 ++
 src/OpenFOAM/primitives/Scalar/Scalar.C          |  3 ++-
 src/OpenFOAM/primitives/Scalar/Scalar.H          |  2 ++
 .../Scalar/doubleScalar/doubleScalar.C           |  2 ++
 .../Scalar/doubleScalar/doubleScalar.H           |  2 ++
 .../primitives/Scalar/floatScalar/floatScalar.C  |  2 ++
 .../primitives/Scalar/floatScalar/floatScalar.H  |  2 ++
 .../primitives/SphericalTensor/SphericalTensor.H |  2 ++
 .../SphericalTensor2D/SphericalTensor2D.H        |  2 ++
 src/OpenFOAM/primitives/SymmTensor/SymmTensor.H  |  2 ++
 src/OpenFOAM/primitives/Tensor/Tensor.H          |  2 ++
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H      |  3 +++
 src/OpenFOAM/primitives/Vector/Vector.H          |  2 ++
 src/OpenFOAM/primitives/Vector2D/Vector2D.H      |  2 ++
 src/OpenFOAM/primitives/diagTensor/diagTensor.C  |  6 ++++++
 src/OpenFOAM/primitives/label/label.C            |  5 ++---
 src/OpenFOAM/primitives/label/label.H            |  2 ++
 .../primitives/sphericalTensor/sphericalTensor.C |  6 ++++++
 .../sphericalTensor2D/sphericalTensor2D.C        |  6 ++++++
 src/OpenFOAM/primitives/symmTensor/symmTensor.C  | 16 ++++++++++++++++
 src/OpenFOAM/primitives/tensor/tensor.C          | 16 ++++++++++++++++
 src/OpenFOAM/primitives/tensor2D/tensor2D.C      | 14 ++++++++++++++
 src/OpenFOAM/primitives/uLabel/uLabel.C          |  5 ++---
 src/OpenFOAM/primitives/uLabel/uLabel.H          |  6 +++++-
 src/OpenFOAM/primitives/vector/vector.C          |  6 ++++++
 src/OpenFOAM/primitives/vector2D/vector2D.C      |  6 ++++++
 28 files changed, 120 insertions(+), 24 deletions(-)

diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
index fd5f096898..c0600bd97c 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
@@ -430,10 +430,7 @@ Type max(const FieldField<Field, Type>& f)
     }
     else
     {
-        WarningIn("max(const FieldField<Field, Type>&) const")
-            << "empty fieldField, returning zero" << endl;
-
-        return pTraits<Type>::zero;
+        return pTraits<Type>::min;
     }
 }
 
@@ -464,10 +461,7 @@ Type min(const FieldField<Field, Type>& f)
     }
     else
     {
-        WarningIn("min(const FieldField<Field, Type>&) const")
-            << "empty fieldField, returning zero" << endl;
-
-        return pTraits<Type>::zero;
+        return pTraits<Type>::max;
     }
 }
 
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
index ea1debc235..b000421d76 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
+++ b/src/OpenFOAM/fields/Fields/Field/FieldFunctions.C
@@ -319,10 +319,7 @@ Type max(const UList<Type>& f)
     }
     else
     {
-        WarningIn("max(const UList<Type>&)")
-            << "empty field, returning zero" << endl;
-
-        return pTraits<Type>::zero;
+        return pTraits<Type>::min;
     }
 }
 
@@ -339,10 +336,7 @@ Type min(const UList<Type>& f)
     }
     else
     {
-        WarningIn("min(const UList<Type>&)")
-            << "empty field, returning zero" << endl;
-
-        return pTraits<Type>::zero;
+        return pTraits<Type>::max;
     }
 }
 
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index a425ab1b10..035551a240 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -71,6 +71,8 @@ public:
         static const char* componentNames[];
         static const DiagTensor zero;
         static const DiagTensor one;
+        static const DiagTensor max;
+        static const DiagTensor min;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index 4593405cd5..86087309cb 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -34,6 +34,8 @@ namespace Foam
 const char* const pTraits<Scalar>::typeName = "scalar";
 const Scalar pTraits<Scalar>::zero = 0.0;
 const Scalar pTraits<Scalar>::one = 1.0;
+const Scalar pTraits<Scalar>::max = ScalarVGREAT;
+const Scalar pTraits<Scalar>::min = -ScalarVGREAT;
 
 const char* pTraits<Scalar>::componentNames[] = { "x" };
 
@@ -45,7 +47,6 @@ pTraits<Scalar>::pTraits(Istream& is)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- return a string representation of a Scalar
 word name(const Scalar s)
 {
     std::ostringstream osBuffer;
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 5e2fbc0a26..365a7f017e 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -61,6 +61,8 @@ public:
         static const char* componentNames[];
         static const Scalar zero;
         static const Scalar one;
+        static const Scalar max;
+        static const Scalar min;
 
     // Constructors
 
diff --git a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C
index a3bcf71c99..6fb4d37320 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C
+++ b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.C
@@ -32,10 +32,12 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define Scalar doubleScalar
+#define ScalarVGREAT doubleScalarVGREAT
 #define ScalarVSMALL doubleScalarVSMALL
 #define readScalar readDoubleScalar
 #include "Scalar.C"
 #undef Scalar
+#undef ScalarVGREAT
 #undef ScalarVSMALL
 #undef readScalar
 
diff --git a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
index 640918c813..ff4db3393b 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H
@@ -61,6 +61,7 @@ static const doubleScalar doubleScalarROOTVSMALL = 1.0e-150;
 
 
 #define Scalar doubleScalar
+#define ScalarVGREAT doubleScalarVGREAT
 #define ScalarVSMALL doubleScalarVSMALL
 #define readScalar readDoubleScalar
 
@@ -98,6 +99,7 @@ inline Scalar yn(const int n, const Scalar s)
 }
 
 #undef Scalar
+#undef ScalarVGREAT
 #undef ScalarVSMALL
 #undef readScalar
 #undef transFunc
diff --git a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C
index 5355dc9d89..d5488cebd3 100644
--- a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C
+++ b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.C
@@ -32,11 +32,13 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #define Scalar floatScalar
+#define ScalarVGREAT floatScalarVGREAT
 #define ScalarVSMALL floatScalarVSMALL
 #define readScalar readFloatScalar
 #include "Scalar.C"
 #undef Scalar
 #undef ScalarVSMALL
+#undef ScalarVSMALL
 #undef readScalar
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
index 7ae47138a7..99537311ce 100644
--- a/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
+++ b/src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H
@@ -61,6 +61,7 @@ static const floatScalar floatScalarROOTVSMALL = 1.0e-18;
 
 
 #define Scalar floatScalar
+#define ScalarVGREAT floatScalarVGREAT
 #define ScalarVSMALL floatScalarVSMALL
 #define readScalar readFloatScalar
 
@@ -98,6 +99,7 @@ inline Scalar yn(const int n, const Scalar s)
 }
 
 #undef Scalar
+#undef ScalarVGREAT
 #undef ScalarVSMALL
 #undef readScalar
 #undef transFunc
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index e0698ba7f0..56c51a48d8 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -75,6 +75,8 @@ public:
         static const char* componentNames[];
         static const SphericalTensor zero;
         static const SphericalTensor one;
+        static const SphericalTensor max;
+        static const SphericalTensor min;
         static const SphericalTensor I;
         static const SphericalTensor oneThirdI;
         static const SphericalTensor twoThirdsI;
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
index 8e5adcabf4..03ba859801 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2D.H
@@ -71,6 +71,8 @@ public:
         static const char* componentNames[];
         static const SphericalTensor2D zero;
         static const SphericalTensor2D one;
+        static const SphericalTensor2D max;
+        static const SphericalTensor2D min;
         static const SphericalTensor2D I;
         static const SphericalTensor2D oneThirdI;
         static const SphericalTensor2D twoThirdsI;
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index efb76e2f87..e43a0d741d 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -78,6 +78,8 @@ public:
 
         static const SymmTensor zero;
         static const SymmTensor one;
+        static const SymmTensor max;
+        static const SymmTensor min;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index ea4e5d72b1..305829c16d 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -79,6 +79,8 @@ public:
 
         static const Tensor zero;
         static const Tensor one;
+        static const Tensor max;
+        static const Tensor min;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index 1f2e629761..f3c5d30e64 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -74,6 +74,9 @@ public:
 
         static const Tensor2D zero;
         static const Tensor2D one;
+        static const Tensor2D max;
+        static const Tensor2D min;
+
 
     //- Component labeling enumeration
     enum components { XX, XY, YX, YY };
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index bc1af5db05..c9d7de5286 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -81,6 +81,8 @@ public:
         static const char* componentNames[];
         static const Vector zero;
         static const Vector one;
+        static const Vector max;
+        static const Vector min;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
index 496c443392..392c5ba70b 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
@@ -71,6 +71,8 @@ public:
         static const char* componentNames[];
         static const Vector2D zero;
         static const Vector2D one;
+        static const Vector2D max;
+        static const Vector2D min;
 
 
     //- Component labeling enumeration
diff --git a/src/OpenFOAM/primitives/diagTensor/diagTensor.C b/src/OpenFOAM/primitives/diagTensor/diagTensor.C
index 3e95d75970..7cc498b12c 100644
--- a/src/OpenFOAM/primitives/diagTensor/diagTensor.C
+++ b/src/OpenFOAM/primitives/diagTensor/diagTensor.C
@@ -48,6 +48,12 @@ const diagTensor diagTensor::zero(0, 0, 0);
 template<>
 const diagTensor diagTensor::one(1, 1, 1);
 
+template<>
+const diagTensor diagTensor::max(VGREAT, VGREAT, VGREAT);
+
+template<>
+const diagTensor diagTensor::min(-VGREAT, -VGREAT, -VGREAT);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/label/label.C b/src/OpenFOAM/primitives/label/label.C
index 5d4d7dd2bb..38217bd6b2 100644
--- a/src/OpenFOAM/primitives/label/label.C
+++ b/src/OpenFOAM/primitives/label/label.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
-
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
@@ -40,6 +37,8 @@ namespace Foam
 const char* const pTraits<label>::typeName = "label";
 const label pTraits<label>::zero = 0;
 const label pTraits<label>::one = 1;
+const label pTraits<label>::max = labelMax;
+const label pTraits<label>::min = labelMin;
 
 const char* pTraits<label>::componentNames[] = { "x" };
 
diff --git a/src/OpenFOAM/primitives/label/label.H b/src/OpenFOAM/primitives/label/label.H
index d83cd7b08e..f9c523be3d 100644
--- a/src/OpenFOAM/primitives/label/label.H
+++ b/src/OpenFOAM/primitives/label/label.H
@@ -150,6 +150,8 @@ public:
         static const char* componentNames[];
         static const label zero;
         static const label one;
+        static const label max;
+        static const label min;
 
     // Constructors
 
diff --git a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C b/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C
index 7943dea5cc..2e74cb70ce 100644
--- a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C
+++ b/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C
@@ -45,6 +45,12 @@ const sphericalTensor sphericalTensor::zero(0);
 template<>
 const sphericalTensor sphericalTensor::one(1);
 
+template<>
+const sphericalTensor sphericalTensor::max(VGREAT);
+
+template<>
+const sphericalTensor sphericalTensor::min(-VGREAT);
+
 template<>
 const sphericalTensor sphericalTensor::I(1);
 
diff --git a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C b/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C
index 974aa6278b..f5fa54eb2f 100644
--- a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C
+++ b/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C
@@ -45,6 +45,12 @@ const sphericalTensor2D sphericalTensor2D::zero(0);
 template<>
 const sphericalTensor2D sphericalTensor2D::one(1);
 
+template<>
+const sphericalTensor2D sphericalTensor2D::max(VGREAT);
+
+template<>
+const sphericalTensor2D sphericalTensor2D::min(-VGREAT);
+
 template<>
 const sphericalTensor2D sphericalTensor2D::I(1);
 
diff --git a/src/OpenFOAM/primitives/symmTensor/symmTensor.C b/src/OpenFOAM/primitives/symmTensor/symmTensor.C
index c9faf9aa1e..f5a56a3d86 100644
--- a/src/OpenFOAM/primitives/symmTensor/symmTensor.C
+++ b/src/OpenFOAM/primitives/symmTensor/symmTensor.C
@@ -61,6 +61,22 @@ const symmTensor symmTensor::one
           1
 );
 
+template<>
+const symmTensor symmTensor::max
+(
+    VGREAT, VGREAT, VGREAT,
+       VGREAT, VGREAT,
+          VGREAT
+);
+
+template<>
+const symmTensor symmTensor::min
+(
+    -VGREAT, -VGREAT, -VGREAT,
+       -VGREAT, -VGREAT,
+          -VGREAT
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/tensor/tensor.C b/src/OpenFOAM/primitives/tensor/tensor.C
index d8236547b6..f365893125 100644
--- a/src/OpenFOAM/primitives/tensor/tensor.C
+++ b/src/OpenFOAM/primitives/tensor/tensor.C
@@ -61,6 +61,22 @@ const tensor tensor::one
     1, 1, 1
 );
 
+template<>
+const tensor tensor::max
+(
+    VGREAT, VGREAT, VGREAT,
+    VGREAT, VGREAT, VGREAT,
+    VGREAT, VGREAT, VGREAT
+);
+
+template<>
+const tensor tensor::min
+(
+    -VGREAT, -VGREAT, -VGREAT,
+    -VGREAT, -VGREAT, -VGREAT,
+    -VGREAT, -VGREAT, -VGREAT
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/tensor2D/tensor2D.C
index 25f361f695..e782cd0fea 100644
--- a/src/OpenFOAM/primitives/tensor2D/tensor2D.C
+++ b/src/OpenFOAM/primitives/tensor2D/tensor2D.C
@@ -58,6 +58,20 @@ const tensor2D tensor2D::one
     1, 1
 );
 
+template<>
+const tensor2D tensor2D::max
+(
+    VGREAT, VGREAT,
+    VGREAT, VGREAT
+);
+
+template<>
+const tensor2D tensor2D::min
+(
+    -VGREAT, -VGREAT,
+    -VGREAT, -VGREAT
+);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.C b/src/OpenFOAM/primitives/uLabel/uLabel.C
index b4e72c18a6..b005ed9fba 100644
--- a/src/OpenFOAM/primitives/uLabel/uLabel.C
+++ b/src/OpenFOAM/primitives/uLabel/uLabel.C
@@ -37,6 +37,8 @@ namespace Foam
 const char* const pTraits<uLabel>::typeName = "uLabel";
 const uLabel pTraits<uLabel>::zero = 0;
 const uLabel pTraits<uLabel>::one = 1;
+const uLabel pTraits<uLabel>::max = uLabelMax;
+const uLabel pTraits<uLabel>::min = uLabelMin;
 
 const char* pTraits<uLabel>::componentNames[] = { "x" };
 
@@ -46,9 +48,6 @@ pTraits<uLabel>::pTraits(Istream& is)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.H b/src/OpenFOAM/primitives/uLabel/uLabel.H
index 7b99b79eb1..97bb3e5fa2 100644
--- a/src/OpenFOAM/primitives/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/uLabel/uLabel.H
@@ -57,6 +57,7 @@ namespace Foam
     typedef unsigned int uLabel;
 
     static const uLabel uLabelMax = UINT_MAX;
+    static const uLabel uLabelMin = 0;
 
     inline uLabel readULabel(Istream& is)
     {
@@ -77,7 +78,8 @@ namespace Foam
 {
     typedef unsigned long uLabel;
 
-    static const uLabel uLabelMax = LONG_MAX;
+    static const uLabel uLabelMax = ULONG_MAX;
+    static const uLabel uLabelMin = 0;
 
     inline uLabel readULabel(Istream& is)
     {
@@ -130,6 +132,8 @@ public:
         static const char* componentNames[];
         static const uLabel zero;
         static const uLabel one;
+        static const uLabel max;
+        static const uLabel min;
 
     // Constructors
 
diff --git a/src/OpenFOAM/primitives/vector/vector.C b/src/OpenFOAM/primitives/vector/vector.C
index 1864a7d8af..7c2c84ae9a 100644
--- a/src/OpenFOAM/primitives/vector/vector.C
+++ b/src/OpenFOAM/primitives/vector/vector.C
@@ -48,6 +48,12 @@ const vector vector::zero(0, 0, 0);
 template<>
 const vector vector::one(1, 1, 1);
 
+template<>
+const vector vector::max(VGREAT, VGREAT, VGREAT);
+
+template<>
+const vector vector::min(-VGREAT, -VGREAT, -VGREAT);
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/vector2D/vector2D.C b/src/OpenFOAM/primitives/vector2D/vector2D.C
index da5a2ec532..cbe0d89d1e 100644
--- a/src/OpenFOAM/primitives/vector2D/vector2D.C
+++ b/src/OpenFOAM/primitives/vector2D/vector2D.C
@@ -48,6 +48,12 @@ const vector2D vector2D::zero(0, 0);
 template<>
 const vector2D vector2D::one(1, 1);
 
+template<>
+const vector2D vector2D::max(VGREAT, VGREAT);
+
+template<>
+const vector2D vector2D::min(-VGREAT, -VGREAT);
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

From 45bfb91afb3b9d3e4c79d8c846f582e2482cd02c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Fri, 23 Jan 2009 08:46:54 +0000
Subject: [PATCH 27/32] thisDb to get at objectRegistry

---
 .../SCOPE/SCOPELaminarFlameSpeed.C            |  2 +-
 .../splitMeshRegions/splitMeshRegions.C       |  4 +--
 .../GeometricField/MapGeometricFields.H       |  4 +--
 .../GAMGAgglomeration/GAMGAgglomeration.C     |  8 ++---
 src/OpenFOAM/meshes/GeoMesh/GeoMesh.H         |  2 +-
 src/OpenFOAM/meshes/MeshObject/MeshObject.C   | 30 +++++++++----------
 src/OpenFOAM/meshes/lduMesh/lduMesh.C         |  4 +--
 src/OpenFOAM/meshes/lduMesh/lduMesh.H         |  2 +-
 src/OpenFOAM/meshes/pointMesh/pointMesh.H     |  6 ++--
 .../pointMeshMapper/pointMeshMapper.H         |  2 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       | 12 ++------
 src/OpenFOAM/meshes/polyMesh/polyMesh.H       |  5 ++++
 src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C | 10 ++-----
 .../autoHexMeshDriver/autoLayerDriver.C       |  8 ++---
 .../autoHexMeshDriver/autoRefineDriver.C      |  2 +-
 .../meshRefinementProblemCells.C              |  2 +-
 .../general/SRF/SRFModel/SRFModel/SRFModel.C  |  4 +--
 .../SRF/SRFModel/SRFModel/newSRFModel.C       |  4 +--
 src/finiteVolume/fvMesh/fvMesh.C              | 10 ++-----
 src/finiteVolume/fvMesh/fvMesh.H              |  6 ++--
 .../fvMesh/fvMeshMapper/fvMeshMapper.H        |  2 +-
 .../fvMesh/fvMeshSubset/fvMeshSubset.H        |  1 -
 .../fvMeshSubset/fvMeshSubsetInterpolate.C    |  4 +--
 .../volPointInterpolate.C                     |  8 +++--
 .../radiationModel/newRadiationModel.C        |  4 +--
 .../radiationModel/radiationModel.C           |  4 +--
 .../movingConeTopoFvMesh.C                    |  4 +--
 27 files changed, 70 insertions(+), 84 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
index a9224f59eb..9f42a4cc97 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
@@ -395,7 +395,7 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const
                 (
                     "Ma",
                     mesh.time().timeName(),
-                    mesh.db(),
+                    mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE
                 ),
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 8aac1f6b7e..a4b33b97dd 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -613,7 +613,7 @@ autoPtr<mapPolyMesh> createRegionMesh
             "fvSchemes",
             mesh.time().system(),
             regionName,
-            mesh.db(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
@@ -642,7 +642,7 @@ autoPtr<mapPolyMesh> createRegionMesh
             "fvSolution",
             mesh.time().system(),
             regionName,
-            mesh.db(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
index b85d27c8ad..5f5896893b 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H
@@ -75,7 +75,7 @@ void MapGeometricFields
 {
     HashTable<const GeometricField<Type, PatchField, GeoMesh>*> fields
     (
-        mapper.db().objectRegistry::lookupClass
+        mapper.thisDb().objectRegistry::lookupClass
             <GeometricField<Type, PatchField, GeoMesh> >()
     );
 
@@ -145,7 +145,7 @@ void MapGeometricFields
                 );
             }
 
-            field.instance() = field.mesh().db().time().timeName();
+            field.instance() = field.time().timeName();
         }
         else if (polyMesh::debug)
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index e1df085914..633b8e2f37 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -97,7 +97,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 {
     if
     (
-        !mesh.db().objectRegistry::foundObject<GAMGAgglomeration>
+        !mesh.thisDb().foundObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         )
@@ -134,7 +134,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<GAMGAgglomeration>
+        return mesh.thisDb().lookupObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         );
@@ -152,7 +152,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 
     if
     (
-        !mesh.db().objectRegistry::foundObject<GAMGAgglomeration>
+        !mesh.thisDb().foundObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         )
@@ -185,7 +185,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<GAMGAgglomeration>
+        return mesh.thisDb().lookupObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         );
diff --git a/src/OpenFOAM/meshes/GeoMesh/GeoMesh.H b/src/OpenFOAM/meshes/GeoMesh/GeoMesh.H
index eeec9ac71e..847844e21b 100644
--- a/src/OpenFOAM/meshes/GeoMesh/GeoMesh.H
+++ b/src/OpenFOAM/meshes/GeoMesh/GeoMesh.H
@@ -76,7 +76,7 @@ public:
     // Member Functions
 
         //- Return the object registry
-        const objectRegistry& db() const
+        const objectRegistry& thisDb() const
         {
             return mesh_;
         }
diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.C b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
index 232929e295..68f05c2f82 100644
--- a/src/OpenFOAM/meshes/MeshObject/MeshObject.C
+++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.C
@@ -37,8 +37,8 @@ Foam::MeshObject<Mesh, Type>::MeshObject(const Mesh& mesh)
         IOobject
         (
             Type::typeName,
-            mesh.db().instance(),
-            mesh.db()
+            mesh.thisDb().instance(),
+            mesh.thisDb()
         )
     ),
     mesh_(mesh)
@@ -53,13 +53,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Mesh& mesh
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -72,13 +72,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data1& d
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -92,13 +92,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data2& d2
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d1, d2));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -113,13 +113,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data3& d3
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d1, d2, d3));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -135,13 +135,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data4& d4
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d3, d4));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -151,13 +151,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
 template<class Mesh, class Type>
 bool Foam::MeshObject<Mesh, Type>::Delete(const Mesh& mesh)
 {
-    if (mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
-        return mesh.db().objectRegistry::checkOut
+        return mesh.thisDb().checkOut
         (
             const_cast<Type&>
             (
-                mesh.db().objectRegistry::lookupObject<Type>
+                mesh.thisDb().objectRegistry::lookupObject<Type>
                 (
                     Type::typeName
                 )
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.C b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
index ac9a65fe64..135b74c6ab 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
@@ -36,9 +36,9 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::objectRegistry& Foam::lduMesh::db() const
+const Foam::objectRegistry& Foam::lduMesh::thisDb() const
 {
-    notImplemented("lduMesh::db() const");
+    notImplemented("lduMesh::thisDb() const");
     const objectRegistry* orPtr_ = NULL;
     return *orPtr_;
 }
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.H b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
index 1176f77bc9..5c6f39e778 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
@@ -71,7 +71,7 @@ public:
         // Access
 
             //- Return the object registry
-            virtual const objectRegistry& db() const;
+            virtual const objectRegistry& thisDb() const;
 
             //- Return ldu addressing
             virtual const lduAddressing& lduAddr() const = 0;
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.H b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
index 16f80727e5..a41f725c45 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.H
@@ -112,10 +112,10 @@ public:
             return GeoMesh<polyMesh>::mesh_.globalData();
         }
 
-        //- Return database (only needed for compilation purposes)
-        const objectRegistry& db() const
+        //- Return database. For now is its polyMesh.
+        const objectRegistry& thisDb() const
         {
-            return GeoMesh<polyMesh>::mesh_.db();
+            return GeoMesh<polyMesh>::mesh_.thisDb();
         }
 
 
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
index 0274524887..3f73e8225c 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H
@@ -100,7 +100,7 @@ public:
 
         //- Return reference to objectRegistry storing fields. Can be
         //  removed once fields stored on pointMesh.
-        const objectRegistry& db() const
+        const objectRegistry& thisDb() const
         {
             return mesh_();
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index a1b10f0d8a..c3a789e54d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -1042,17 +1042,11 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
     // movePoints function.
 
     // pointMesh
-    if
-    (
-        db().objectRegistry::foundObject<pointMesh>
-        (
-            pointMesh::typeName
-        )
-    )
+    if (thisDb().foundObject<pointMesh>(pointMesh::typeName))
     {
         const_cast<pointMesh&>
         (
-            db().objectRegistry::lookupObject<pointMesh>
+            thisDb().lookupObject<pointMesh>
             (
                 pointMesh::typeName
             )
@@ -1094,7 +1088,7 @@ const Foam::globalMeshData& Foam::polyMesh::globalData() const
 // Remove all files and some subdirs (eg, sets)
 void Foam::polyMesh::removeFiles(const fileName& instanceDir) const
 {
-    fileName meshFilesPath = db().path()/instanceDir/meshDir();
+    fileName meshFilesPath = thisDb().path()/instanceDir/meshDir();
 
     rm(meshFilesPath/"points");
     rm(meshFilesPath/"faces");
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 0dfd7685c8..588394d1c2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -343,6 +343,11 @@ public:
             //- Return parallel info
             const globalMeshData& globalData() const;
 
+            //- Return the object registry
+            const objectRegistry& thisDb() const
+            {
+                return *this;
+            }
 
         // Mesh motion
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
index 644d4a446a..24d9ebbb13 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C
@@ -71,17 +71,11 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
     // Hack until proper callbacks. Below are all the polyMesh-MeshObjects.
 
     // pointMesh
-    if
-    (
-        db().objectRegistry::foundObject<pointMesh>
-        (
-            pointMesh::typeName
-        )
-    )
+    if (thisDb().foundObject<pointMesh>(pointMesh::typeName))
     {
         const_cast<pointMesh&>
         (
-            db().objectRegistry::lookupObject<pointMesh>
+            thisDb().lookupObject<pointMesh>
             (
                 pointMesh::typeName
             )
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index b384902710..bbe715eff0 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2889,12 +2889,12 @@ void Foam::autoLayerDriver::addLayers
                 //mesh.name()+"_layer",
                 mesh.name(),
                 static_cast<polyMesh&>(mesh).instance(),
-                mesh.db(),
+                mesh.db(),  // register with runTime
                 static_cast<polyMesh&>(mesh).readOpt(),
                 static_cast<polyMesh&>(mesh).writeOpt()
-            ),          // io params from original mesh but new name
-            mesh,      // original mesh
-            true        // parallel sync
+            ),              // io params from original mesh but new name
+            mesh,           // original mesh
+            true            // parallel sync
         );
         fvMesh& newMesh = newMeshPtr();
 
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index f602376461..e53c4e041a 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -80,7 +80,7 @@ Foam::label Foam::autoRefineDriver::readFeatureEdges
                     featFileName,           // name
                     mesh.time().constant(), // directory
                     "triSurface",           // instance
-                    mesh.db(),              // registry
+                    mesh.time(),            // registry
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
                     false
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
index fd5a7bdffa..ff1d5fc3a4 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -443,7 +443,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
     {
         const labelList& cPoints = mesh_.cellPoints(cellI, dynCPoints);
 
-        // Get number of anchor points (pointLevel == cellLevel)
+        // Get number of anchor points (pointLevel <= cellLevel)
 
         label nBoundaryAnchors = 0;
         label nNonAnchorBoundary = 0;
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index a16ea2fd04..394be20d2e 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -56,8 +56,8 @@ Foam::SRF::SRFModel::SRFModel
         IOobject
         (
             "SRFProperties",
-            Urel.mesh().time().constant(),
-            Urel.mesh().db(),
+            Urel.time().constant(),
+            Urel.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
index 914fe22978..ff94172db0 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C
@@ -53,8 +53,8 @@ autoPtr<SRFModel> SRFModel::New
             IOobject
             (
                 "SRFProperties",
-                Urel.mesh().time().constant(),
-                Urel.mesh().db(),
+                Urel.time().constant(),
+                Urel.db(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE
             )
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 1192ef2357..d9c775a68b 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -485,17 +485,11 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
 template<class Type>
 void MeshObjectMovePoints(const Foam::fvMesh& mesh)
 {
-    if
-    (
-        mesh.db().objectRegistry::foundObject<Type>
-        (
-            Type::typeName
-        )
-    )
+    if (mesh.thisDb().foundObject<Type>(Type::typeName))
     {
         const_cast<Type&>
         (
-            mesh.db().objectRegistry::lookupObject<Type>
+            mesh.thisDb().lookupObject<Type>
             (
                 Type::typeName
             )
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 819dd30514..64e4d87f3e 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -221,10 +221,10 @@ public:
                 return polyMesh::time();
             }
 
-            //- Return the object registry
-            virtual const objectRegistry& db() const
+            //- Return the object registry - resolve conflict polyMesh/lduMesh
+            virtual const objectRegistry& thisDb() const
             {
-                return *this;
+                return polyMesh::thisDb();
             }
 
             //- Return reference to name
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
index 1a277a14b9..0f9784affd 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H
@@ -108,7 +108,7 @@ public:
 
         //- Return reference to objectRegistry storing fields. Can be
         //  removed once fields stored on pointMesh.
-        const objectRegistry& db() const
+        const objectRegistry& thisDb() const
         {
             return mesh_;
         }
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
index 32749e5233..9ad70db647 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
@@ -335,7 +335,6 @@ public:
             (
                 const GeometricField<Type, pointPatchField, pointMesh>&,
                 const pointMesh& sMesh,
-                const objectRegistry& reg,
                 const labelList& patchMap,
                 const labelList& pointMap
             );
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index 7986cfc665..f95b7a9dfe 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -299,7 +299,6 @@ fvMeshSubset::interpolate
 (
     const GeometricField<Type, pointPatchField, pointMesh>& vf,
     const pointMesh& sMesh,
-    const objectRegistry& reg,
     const labelList& patchMap,
     const labelList& pointMap
 )
@@ -385,7 +384,7 @@ fvMeshSubset::interpolate
             (
                 "subset"+vf.name(),
                 vf.time().timeName(),
-                reg,
+                sMesh.thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
@@ -410,7 +409,6 @@ tmp<GeometricField<Type, pointPatchField, pointMesh> > fvMeshSubset::interpolate
     (
         sf,
         pointMesh::New(subMesh()),     // subsetted point mesh
-        subMesh(),          // registry (pointfields are stored on the polyMesh)
         patchMap(),
         pointMap()
     );
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 405fb59be0..1adc4046c7 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -128,7 +128,7 @@ volPointInterpolation::interpolate
             (
                 "volPointInterpolate(" + vf.name() + ')',
                 vf.instance(),
-                vf.db()
+                pMesh.thisDb()
             ),
             pMesh,
             vf.dimensions(),
@@ -168,6 +168,8 @@ volPointInterpolation::interpolate
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
+    const pointMesh& pm = pointMesh::New(vf.mesh());
+
     tmp<GeometricField<Type, pointPatchField, pointMesh> > tpf
     (
         new GeometricField<Type, pointPatchField, pointMesh>
@@ -176,9 +178,9 @@ volPointInterpolation::interpolate
             (
                 "volPointInterpolate(" + vf.name() + ')',
                 vf.instance(),
-                vf.db()
+                pm.thisDb()
             ),
-            pointMesh::New(vf.mesh()),
+            pm,
             vf.dimensions()
         )
     );
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
index a30d7946f4..0a213f03d3 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C
@@ -52,8 +52,8 @@ autoPtr<radiationModel> radiationModel::New
             IOobject
             (
                 "radiationProperties",
-                T.mesh().time().constant(),
-                T.mesh().db(),
+                T.time().constant(),
+                T.db(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE
             )
diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
index 5fec3f003f..adc5c53558 100644
--- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
+++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C
@@ -54,8 +54,8 @@ Foam::radiation::radiationModel::radiationModel
         IOobject
         (
             "radiationProperties",
-            T.mesh().time().constant(),
-            T.mesh().db(),
+            T.time().constant(),
+            T.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 2ebc9f7ff0..2f3804afde 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -343,7 +343,7 @@ bool Foam::movingConeTopoFvMesh::update()
             //    << endl;
 
             {
-                OFstream str(db().path()/"meshPoints.obj");
+                OFstream str(thisDb().path()/"meshPoints.obj");
                 Pout<< "Writing mesh with meshPoints to " << str.name()
                     << endl;
 
@@ -361,7 +361,7 @@ bool Foam::movingConeTopoFvMesh::update()
                 }
             }
             {
-                OFstream str(db().path()/"preMotionPoints.obj");
+                OFstream str(thisDb().path()/"preMotionPoints.obj");
                 Pout<< "Writing mesh with preMotionPoints to " << str.name()
                     << endl;
 

From 6bd41c513dccf540b0516413f275e646bb0c1296 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs@hunt.opencfd.co.uk>
Date: Fri, 23 Jan 2009 08:59:28 +0000
Subject: [PATCH 28/32] missing assignment operator

---
 .../Lists/DynamicList/DynamicList.H           |  9 +++++--
 .../Lists/DynamicList/DynamicListI.H          | 25 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index d6553dcfab..2738b414b0 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -182,9 +182,14 @@ public:
         //- Assignment of all addressed entries to the given value
         inline void operator=(const T&);
 
-        //- Assignment from List<T>. Also handles assignment from DynamicList.
-        inline void operator=(const UList<T>&);
+        //- Assignment from DynamicList
+        inline void operator=
+        (
+            const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+        );
 
+        //- Assignment from List<T>.
+        inline void operator=(const UList<T>&);
 
     // IOstream operators
 
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index f1e7d40dd6..c573a5df5e 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -334,13 +334,36 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
 (
     const UList<T>& lst
 )
+{
+    if (capacity_ >= lst.size())
+    {
+        // can copy w/o reallocating, match initial size to avoid reallocation
+        List<T>::size(lst.size());
+        List<T>::operator=(lst);
+    }
+    else
+    {
+        // make everything available for the copy operation
+        List<T>::size(capacity_);
+
+        List<T>::operator=(lst);
+        capacity_ = List<T>::size();
+    }
+}
+
+
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
+(
+    const DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
+)
 {
     if (this == &lst)
     {
         FatalErrorIn
         (
             "DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator="
-            "(const UList<T>&)"
+            "(const DynamicList<T, SizeInc, SizeMult, SizeDiv>&)"
         )   << "attempted assignment to self" << abort(FatalError);
     }
 

From ce14f243c64ba38b01ca772bd8babad7328e67fe Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 23 Jan 2009 15:17:01 +0100
Subject: [PATCH 29/32] Removed handling of single-quoted strings.

---
 applications/test/dictionary/testDictRegex         | 14 +++++++-------
 .../mesh/manipulation/cellSet/cellSetDict          |  2 +-
 .../mesh/manipulation/faceSet/faceSetDict          |  4 ++--
 .../mesh/manipulation/pointSet/pointSetDict        |  2 +-
 src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C      |  2 +-
 src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H      |  2 +-
 src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H      |  2 +-
 src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C      | 10 +++-------
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C      |  6 +++---
 src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H      |  2 +-
 .../db/IOstreams/Sstreams/prefixOSstream.H         |  4 ++--
 src/OpenFOAM/db/IOstreams/token/token.H            |  2 --
 12 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex
index ee4bf298e0..01d4274ba8 100644
--- a/applications/test/dictionary/testDictRegex
+++ b/applications/test/dictionary/testDictRegex
@@ -15,21 +15,21 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 #inputMode  merge
 
-'.*'        parentValue1;
-'[n-z].*'   parentValue2;
-'f.*'       parentValue3;
+".*"        parentValue1;
+"[n-z].*"   parentValue2;
+"f.*"       parentValue3;
 keyX        parentValue4;
 keyY        parentValue5;
 
-'(.*)Dict'
+"(.*)Dict"
 {
     foo         subdictValue0;
     bar         $f.*;         // should this really match 'foo'?
 
     // result is dependent on insert order!
-    'a.*c'      subdictValue3;
-    'ab.*'      subdictValue2;
-    'a.*'       subdictValue1;
+    "a.*c"      subdictValue3;
+    "ab.*"      subdictValue2;
+    "a.*"       subdictValue1;
     abcd        \1;
 }
 
diff --git a/applications/utilities/mesh/manipulation/cellSet/cellSetDict b/applications/utilities/mesh/manipulation/cellSet/cellSetDict
index 61f8ed4432..8dafcd3fa2 100644
--- a/applications/utilities/mesh/manipulation/cellSet/cellSetDict
+++ b/applications/utilities/mesh/manipulation/cellSet/cellSetDict
@@ -82,7 +82,7 @@ topoSetSources
     // Cells in cell zone
     zoneToCell
     {
-        name '.*Zone';      // Name of cellZone, regular expressions allowed
+        name ".*Zone";      // Name of cellZone, regular expressions allowed
     }
 
     // values of field within certain range
diff --git a/applications/utilities/mesh/manipulation/faceSet/faceSetDict b/applications/utilities/mesh/manipulation/faceSet/faceSetDict
index 04c0ee2837..4d5abe2a5e 100644
--- a/applications/utilities/mesh/manipulation/faceSet/faceSetDict
+++ b/applications/utilities/mesh/manipulation/faceSet/faceSetDict
@@ -56,13 +56,13 @@ topoSetSources
     // All faces of patch
     patchToFace
     {
-        name '.*Wall';      // Name of patch, regular expressions allowed
+        name ".*Wall";      // Name of patch, regular expressions allowed
     }
 
     // All faces of faceZone
     zoneToFace
     {
-        name '.*Zone1';     // Name of faceZone, regular expressions allowed
+        name ".*Zone1";     // Name of faceZone, regular expressions allowed
     }
 
     // Faces with face centre within box
diff --git a/applications/utilities/mesh/manipulation/pointSet/pointSetDict b/applications/utilities/mesh/manipulation/pointSet/pointSetDict
index b7215c64e6..1c704a1868 100644
--- a/applications/utilities/mesh/manipulation/pointSet/pointSetDict
+++ b/applications/utilities/mesh/manipulation/pointSet/pointSetDict
@@ -60,7 +60,7 @@ topoSetSources
     // All points in pointzone
     zoneToPoint
     {
-        name '.*Zone';      // name of pointZone, regular expressions allowed
+        name ".*Zone";      // name of pointZone, regular expressions allowed
     }
 
     // Select based on surface
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
index c0d1a03535..960ec0ff66 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C
@@ -48,7 +48,7 @@ void Foam::Ostream::decrIndent()
 
 
 // Write keyType
-// write regular expression as single-quoted string
+// write regular expression as quoted string
 // write plain word as word (unquoted)
 Foam::Ostream& Foam::Ostream::write(const keyType& kw)
 {
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
index 6d01d46438..f82c796222 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
@@ -115,7 +115,7 @@ public:
             //- Write string
             virtual Ostream& write(const string&) = 0;
 
-            //- Write std::string surrounded by single quotes.
+            //- Write std::string surrounded by quotes.
             //  Optional write without quotes.
             virtual Ostream& writeQuoted
             (
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
index b02f892d9e..6db9a827b1 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.H
@@ -136,7 +136,7 @@ public:
             //- Write string
             Ostream& write(const string&);
 
-            //- Write std::string surrounded by single quotes.
+            //- Write std::string surrounded by quotes.
             //  Optional write without quotes.
             Ostream& writeQuoted
             (
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
index c94e6c9bbc..01b92cacee 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
@@ -152,9 +152,8 @@ Foam::Istream& Foam::ISstream::read(token& t)
             return *this;
         }
 
-        // Strings: enclosed by single or double quotes.
+        // Strings: enclosed by double quotes.
         case token::BEGIN_STRING :
-        case token::BEGIN_QSTRING :
         {
             putback(c);
             string* sPtr = new string;
@@ -369,11 +368,8 @@ Foam::Istream& Foam::ISstream::read(string& str)
 
     char endTok = token::END_STRING;
 
-    if (c == token::BEGIN_QSTRING)
-    {
-        endTok = token::END_QSTRING;
-    }
-    else if (c != token::BEGIN_STRING)
+    // Note, we could also handle single-quoted strings here (if desired)
+    if (c != token::BEGIN_STRING)
     {
         buf[0] = '\0';
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
index a954f1b778..ac04467f3c 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C
@@ -118,7 +118,7 @@ Foam::Ostream& Foam::OSstream::writeQuoted
 {
     if (quoted)
     {
-        os_ << token::BEGIN_QSTRING;
+        os_ << token::BEGIN_STRING;
 
         register int backslash = 0;
         for
@@ -141,7 +141,7 @@ Foam::Ostream& Foam::OSstream::writeQuoted
                 lineNumber_++;
                 backslash++;    // backslash escape for newline
             }
-            else if (c == token::END_QSTRING)
+            else if (c == token::END_STRING)
             {
                 backslash++;    // backslash escape for quote
             }
@@ -158,7 +158,7 @@ Foam::Ostream& Foam::OSstream::writeQuoted
 
         // silently drop any trailing backslashes
         // they would otherwise appear like an escaped end-quote
-        os_ << token::END_QSTRING;
+        os_ << token::END_STRING;
     }
     else
     {
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
index d4f552bd53..75d18ef793 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
@@ -141,7 +141,7 @@ public:
             //  double-quote.
             virtual Ostream& write(const string&);
 
-            //- Write std::string surrounded by single quotes.
+            //- Write std::string surrounded by quotes.
             //  Optional write without quotes.
             virtual Ostream& writeQuoted
             (
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
index aede82b4b9..10ae981ca7 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.H
@@ -114,8 +114,8 @@ public:
             //- Write string
             virtual Ostream& write(const string&);
 
-            //- Write std::string
-            //  Specify if string should be single quoted or remain unquoted.
+            //- Write std::string surrounded by quotes.
+            //  Optional write without quotes.
             virtual Ostream& writeQuoted
             (
                 const std::string&,
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 9cd5bde737..cf51ad8a09 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -109,8 +109,6 @@ public:
 
         BEGIN_STRING   = '"',
         END_STRING     = BEGIN_STRING,
-        BEGIN_QSTRING  = '\'',
-        END_QSTRING    = BEGIN_QSTRING,
 
         ASSIGN         = '=',
         ADD            = '+',

From 1d46bf6fb095a3c9c8978780f6b21b1329ba59eb Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Mon, 26 Jan 2009 13:26:07 +0000
Subject: [PATCH 30/32] Corrected the handling of no transformation.

---
 src/OpenFOAM/fields/Fields/transformField/transformField.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.C b/src/OpenFOAM/fields/Fields/transformField/transformField.C
index 11fe39e225..eef930b954 100644
--- a/src/OpenFOAM/fields/Fields/transformField/transformField.C
+++ b/src/OpenFOAM/fields/Fields/transformField/transformField.C
@@ -94,7 +94,7 @@ void Foam::transform
         }
         else
         {
-            rtf = vector::zero;
+            rtf = tf;
         }
     }
 }

From 038c1990515fb17c13b8e9cd1c957d4dc804ce8c Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Mon, 26 Jan 2009 13:26:42 +0000
Subject: [PATCH 31/32] Corrected the implementation of the spectral function.

---
 .../incompressible/LES/spectEddyVisc/spectEddyVisc.C   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
index 1f56b36328..28a563b4c6 100644
--- a/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
@@ -108,13 +108,13 @@ spectEddyVisc::spectEddyVisc
 
 tmp<volScalarField> spectEddyVisc::k() const
 {
-    volScalarField Eps = 2*nuEff()*magSqr(symm(fvc::grad(U())));
+    volScalarField eps = 2*nuEff()*magSqr(symm(fvc::grad(U())));
 
     return
-        cK1_*pow(delta(), 2.0/3.0)*pow(Eps, 2.0/3.0)
-        *exp(-cK2_*pow(delta(), -4.0/3.0)*nu()/pow(Eps, 1.0/3.0))
-      - cK3_*pow(Eps*nu(), 1.0/2.0)
-       *erfc(cK4_*pow(delta(), -2.0/3.0)*pow(Eps, -1.0/6.0));
+        cK1_*pow(delta()*eps, 2.0/3.0)
+       *exp(-cK2_*pow(delta(), -4.0/3.0)*nu()/pow(eps, 1.0/3.0))
+      - cK3_*sqrt(eps*nu())
+       *erfc(cK4_*pow(delta(), -2.0/3.0)*sqrt(nu())*pow(eps, -1.0/6.0));
 }
 
 

From 1a1a919c70b73299648dd89c444d570941b3d957 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Mon, 26 Jan 2009 13:27:03 +0000
Subject: [PATCH 32/32] Minor format change.

---
 .../containers/LinkedLists/linkTypes/SLListBase/SLListBase.H    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index 4f660a1e4d..0c67d7a56e 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -247,6 +247,7 @@ public:
         inline const_iterator begin() const;
         inline const const_iterator& end() const;
 
+
 private:
 
         //- iterator returned by end()
@@ -254,7 +255,6 @@ private:
 
         //- const_iterator returned by end()
         static const_iterator endConstIter_;
-
 };