From 5b10d3c3fa3fbd696607ce941a2bb1dd17b493bb Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 17 Mar 2011 09:58:33 +0000
Subject: [PATCH 1/8] ENH: Added relaxation factor to cloud explicit calcs

---
 .../KinematicCloud/cloudSolution/cloudSolution.C    | 13 +++++++++----
 .../KinematicCloud/cloudSolution/cloudSolution.H    |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
index 2d726f45e8..165a7be0b6 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
@@ -127,17 +127,19 @@ void Foam::cloudSolution::read()
     schemes_.setSize(vars.size());
     forAll(vars, i)
     {
+        // read solution variable name
         schemes_[i].first() = vars[i];
 
+        // set semi-implicit (1) explicit (0) flag
         Istream& is = schemesDict.lookup(vars[i]);
         const word scheme(is);
         if (scheme == "semiImplicit")
         {
-            is >> schemes_[i].second();
+            schemes_[i].second().first() = true;
         }
         else if (scheme == "explicit")
         {
-            schemes_[i].second() = -1;
+            schemes_[i].second().first() = false;
         }
         else
         {
@@ -145,6 +147,9 @@ void Foam::cloudSolution::read()
                 << "Invalid scheme " << scheme << ". Valid schemes are "
                 << "explicit and semiImplicit" << exit(FatalError);
         }
+
+        // read under-relaxation factor
+        is  >> schemes_[i].second().second();
     }
 }
 
@@ -155,7 +160,7 @@ Foam::scalar Foam::cloudSolution::relaxCoeff(const word& fieldName) const
     {
         if (fieldName == schemes_[i].first())
         {
-            return schemes_[i].second();
+            return schemes_[i].second().second();
         }
     }
 
@@ -173,7 +178,7 @@ bool Foam::cloudSolution::semiImplicit(const word& fieldName) const
     {
         if (fieldName == schemes_[i].first())
         {
-            return schemes_[i].second() >= 0;
+            return schemes_[i].second().first();
         }
     }
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
index 6c2430e408..5f0fdb1cee 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
@@ -25,7 +25,7 @@ Class
     Foam::cloudSolution
 
 Description
-    - Stores all relevant solution info
+    Stores all relevant solution info for cloud
 
 SourceFiles
     cloudSolutionI.H
@@ -100,7 +100,7 @@ class cloudSolution
             Switch resetSourcesOnStartup_;
 
             //- List schemes, e.g. U semiImplicit 1
-            List<Tuple2<word, scalar> > schemes_;
+            List<Tuple2<word, Tuple2<bool, scalar> > > schemes_;
 
 
     // Private Member Functions

From a9109f3e3069ce71166468af7cc7b60841822c3b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 17 Mar 2011 10:00:14 +0000
Subject: [PATCH 2/8] ENH: Added reg expression handling for patches lookup in
 cloud models

---
 src/lagrangian/intermediate/Make/files        |   1 +
 .../LocalInteraction/LocalInteraction.C       |  48 +------
 .../LocalInteraction/LocalInteraction.H       |   6 +-
 .../patchInteractionDataList.C                | 130 ++++++++++++++++++
 .../patchInteractionDataList.H                |  90 ++++++++++++
 .../PatchPostProcessing/PatchPostProcessing.C |  78 ++++++-----
 .../PatchPostProcessing/PatchPostProcessing.H |  12 +-
 .../PatchPostProcessingI.H                    |  12 +-
 8 files changed, 280 insertions(+), 97 deletions(-)
 create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
 create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.H

diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index f3a6866a97..9165621d6c 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -48,6 +48,7 @@ $(RADIATION)/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.
 $(RADIATION)/scatter/cloudScatter/cloudScatter.C
 
 submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
+submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
 
 KINEMATICINJECTION=submodels/Kinematic/InjectionModel
 $(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionData.C
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 56a9ce61a6..20d8997b22 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -33,9 +33,9 @@ Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
     const label globalPatchI
 ) const
 {
-    forAll(patchIds_, patchI)
+    forAll(patchIDs_, patchI)
     {
-        if (patchIds_[patchI] == globalPatchI)
+        if (patchIDs_[patchI] == globalPatchI)
         {
             return patchI;
         }
@@ -130,8 +130,8 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
 )
 :
     PatchInteractionModel<CloudType>(dict, cloud, typeName),
-    patchData_(this->coeffDict().lookup("patches")),
-    patchIds_(patchData_.size()),
+    patchData_(cloud.mesh(), this->coeffDict().lookup("patches")),
+    patchIDs_(patchData_.size()),
     nEscape0_(patchData_.size(), 0),
     massEscape0_(patchData_.size(), 0.0),
     nStick0_(patchData_.size(), 0),
@@ -141,44 +141,6 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
     nStick_(patchData_.size(), 0),
     massStick_(patchData_.size(), 0.0)
 {
-    const polyMesh& mesh = cloud.mesh();
-    const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
-
-    // check that user patches are valid region patches
-    forAll(patchData_, patchI)
-    {
-        const word& patchName = patchData_[patchI].patchName();
-        patchIds_[patchI] = bMesh.findPatchID(patchName);
-        if (patchIds_[patchI] < 0)
-        {
-            FatalErrorIn("LocalInteraction(const dictionary&, CloudType&)")
-                << "Patch " << patchName << " not found. Available patches "
-                << "are: " << bMesh.names() << nl << exit(FatalError);
-        }
-    }
-
-    // check that all walls are specified
-    DynamicList<word> badWalls;
-    forAll(bMesh, patchI)
-    {
-        if
-        (
-            isA<wallPolyPatch>(bMesh[patchI])
-         && applyToPatch(bMesh[patchI].index()) < 0
-        )
-        {
-            badWalls.append(bMesh[patchI].name());
-        }
-    }
-
-    if (badWalls.size() > 0)
-    {
-        FatalErrorIn("LocalInteraction(const dictionary&, CloudType&)")
-            << "All wall patches must be specified when employing local patch "
-            << "interaction. Please specify data for patches:" << nl
-            << badWalls << nl << exit(FatalError);
-    }
-
     // check that interactions are valid/specified
     forAll(patchData_, patchI)
     {
@@ -211,7 +173,7 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
 :
     PatchInteractionModel<CloudType>(pim),
     patchData_(pim.patchData_),
-    patchIds_(pim.patchIds_),
+    patchIDs_(pim.patchIDs_),
     nEscape0_(pim.nEscape0_),
     massEscape0_(pim.massEscape0_),
     nStick0_(pim.nStick0_),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
index 42b641aeab..5d6962b595 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -33,7 +33,7 @@ Description
 #define LocalInteraction_H
 
 #include "PatchInteractionModel.H"
-#include "patchInteractionData.H"
+#include "patchInteractionDataList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,10 +51,10 @@ class LocalInteraction
     // Private data
 
         //- List of participating patches
-        const List<patchInteractionData> patchData_;
+        const patchInteractionDataList patchData_;
 
         //- List of participating patch ids
-        List<label> patchIds_;
+        List<label> patchIDs_;
 
 
         // Counters for initial particle fates
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
new file mode 100644
index 0000000000..566287eca0
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "patchInteractionDataList.H"
+#include "stringListOps.H"
+#include "wallPolyPatch.H"
+
+// * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
+
+Foam::patchInteractionDataList::patchInteractionDataList()
+:
+    List<patchInteractionData>(),
+    patchGroupIDs_()
+{}
+
+
+Foam::patchInteractionDataList::patchInteractionDataList
+(
+    const polyMesh& mesh,
+    const dictionary& dict
+)
+:
+    List<patchInteractionData>(dict.lookup("patches")),
+    patchGroupIDs_(this->size())
+{
+    const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
+    const wordList allPatchNames = bMesh.names();
+
+    const List<patchInteractionData>& items = *this;
+    forAllReverse(items, i)
+    {
+        const word& patchName = items[i].patchName();
+        labelList patchIDs = findStrings(patchName, allPatchNames);
+
+        if (patchIDs.empty())
+        {
+            WarningIn
+            (
+                "Foam::patchInteractionDataList::patchInteractionDataList"
+                "("
+                    "const polyMesh&, "
+                    "const dictionary&"
+                ")"
+            )   << "Cannot find any patch names matching " << patchName
+                << endl;
+        }
+
+        patchGroupIDs_[i].transfer(patchIDs);
+    }
+
+    // check that all walls are specified
+    DynamicList<word> badWalls;
+    forAll(bMesh, patchI)
+    {
+        const polyPatch& pp = bMesh[patchI];
+        if (isA<wallPolyPatch>(pp) && applyToPatch(pp.index()) < 0)
+        {
+            badWalls.append(pp.name());
+        }
+    }
+
+    if (badWalls.size() > 0)
+    {
+        FatalErrorIn
+        (
+            "Foam::patchInteractionDataList::patchInteractionDataList"
+            "("
+                "const polyMesh&, "
+                "const dictionary&"
+            ")"
+        )    << "All wall patches must be specified when employing local patch "
+            << "interaction. Please specify data for patches:" << nl
+            << badWalls << nl << exit(FatalError);
+    }
+}
+
+
+Foam::patchInteractionDataList::patchInteractionDataList
+(
+    const patchInteractionDataList& pidl
+)
+:
+    List<patchInteractionData>(pidl),
+    patchGroupIDs_(pidl.patchGroupIDs_)
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::label Foam::patchInteractionDataList::applyToPatch(const label id) const
+{
+    forAll(patchGroupIDs_, groupI)
+    {
+        const labelList& patchIDs = patchGroupIDs_[groupI];
+        forAll(patchIDs, patchI)
+        {
+            if (patchIDs[patchI] == id)
+            {
+                return groupI;
+            }
+        }
+    }
+
+    return -1;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.H
new file mode 100644
index 0000000000..6c48ea735d
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.H
@@ -0,0 +1,90 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::patchInteractionDataList
+
+Description
+    List container for patchInteractionData class
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef patchInteractionDataList_H
+#define patchInteractionDataList_H
+
+#include "patchInteractionData.H"
+#include "polyMesh.H"
+#include "dictionary.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                  Class patchInteractionDataList Declaration
+\*---------------------------------------------------------------------------*/
+
+class patchInteractionDataList
+:
+    public List<patchInteractionData>
+{
+private:
+
+    // Private data
+
+        //- List of patch IDs for each patch group
+        labelListList patchGroupIDs_;
+
+
+public:
+
+    // Constructor
+
+        //- Construct null
+        patchInteractionDataList();
+
+        //- Construct copy
+        patchInteractionDataList(const patchInteractionDataList& pidl);
+
+        //- Construct from Istream
+        patchInteractionDataList(const polyMesh& mesh, const dictionary& dict);
+
+
+    // Member functions
+
+        //- Return label of group containing patch id
+        //  Returns -1 if patch id is not present
+        label applyToPatch(const label id) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
index e87f37e727..550a9d54c7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 
 #include "PatchPostProcessing.H"
 #include "Pstream.H"
+#include "stringListOps.H"
 #include "ListListOps.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -35,12 +36,15 @@ Foam::label Foam::PatchPostProcessing<CloudType>::applyToPatch
     const label globalPatchI
 ) const
 {
-    forAll(patchIds_, patchI)
+    label patchI = 0;
+    forAllConstIter(labelHashSet, patchIDs_, iter)
     {
-        if (patchIds_[patchI] == globalPatchI)
+        if (iter.key() == globalPatchI)
         {
             return patchI;
         }
+
+        patchI++;
     }
 
     return -1;
@@ -52,16 +56,18 @@ Foam::label Foam::PatchPostProcessing<CloudType>::applyToPatch
 template<class CloudType>
 void Foam::PatchPostProcessing<CloudType>::write()
 {
-    forAll(patchData_, patchI)
+    forAll(patchData_, i)
     {
         List<List<string> > procData(Pstream::nProcs());
-        procData[Pstream::myProcNo()] = patchData_[patchI];
+        procData[Pstream::myProcNo()] = patchData_[i];
 
         Pstream::gatherList(procData);
 
         if (Pstream::master())
         {
-            fileName outputDir = this->owner().time().path();
+            const fvMesh& mesh = this->owner().mesh();
+
+            fileName outputDir = mesh.time().path();
 
             if (Pstream::parRun())
             {
@@ -69,24 +75,26 @@ void Foam::PatchPostProcessing<CloudType>::write()
                 // distributed data running)
                 outputDir =
                     outputDir/".."/"postProcessing"/cloud::prefix/
-                    this->owner().name()/this->owner().time().timeName();
+                    this->owner().name()/mesh.time().timeName();
             }
             else
             {
                 outputDir =
                     outputDir/"postProcessing"/cloud::prefix/
-                    this->owner().name()/this->owner().time().timeName();
+                    this->owner().name()/mesh.time().timeName();
             }
 
             // Create directory if it doesn't exist
             mkDir(outputDir);
 
+            const word& patchName = mesh.boundaryMesh()[patchIDs_[i]].name();
+
             OFstream patchOutFile
             (
-                outputDir/patchNames_[patchI] + ".post",
+                outputDir/patchName + ".post",
                 IOstream::ASCII,
                 IOstream::currentVersion,
-                this->owner().time().writeCompression()
+                mesh.time().writeCompression()
             );
 
             List<string> globalData;
@@ -99,13 +107,13 @@ void Foam::PatchPostProcessing<CloudType>::write()
 
             patchOutFile<< "# Time " + parcelType::propHeader << nl;
 
-            forAll(globalData, i)
+            forAll(globalData, dataI)
             {
-                patchOutFile<< globalData[i].c_str() << nl;
+                patchOutFile<< globalData[dataI].c_str() << nl;
             }
         }
 
-        patchData_[patchI].clearStorage();
+        patchData_[i].clearStorage();
     }
 }
 
@@ -121,29 +129,36 @@ Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
 :
     PostProcessingModel<CloudType>(dict, owner, typeName),
     maxStoredParcels_(readLabel(this->coeffDict().lookup("maxStoredParcels"))),
-    patchNames_(this->coeffDict().lookup("patches")),
-    patchData_(patchNames_.size()),
-    patchIds_(patchNames_.size())
+    patchIDs_(),
+    patchData_()
 {
-    const polyBoundaryMesh& bMesh = this->owner().mesh().boundaryMesh();
-    forAll(patchNames_, patchI)
+    const wordList allPatchNames = owner.mesh().boundaryMesh().names();
+    wordList patchName(this->coeffDict().lookup("patches"));
+
+    forAllReverse(patchName, i)
     {
-        const label id = bMesh.findPatchID(patchNames_[patchI]);
-        if (id < 0)
+        labelList patchIDs = findStrings(patchName[i], allPatchNames);
+
+        if (patchIDs.empty())
         {
-            FatalErrorIn
+            WarningIn
             (
-                "PatchPostProcessing<CloudType>::PatchPostProcessing"
+                "Foam::PatchPostProcessing<CloudType>::PatchPostProcessing"
                 "("
                     "const dictionary&, "
-                    "CloudType& owner"
+                    "CloudType& "
                 ")"
-            )<< "Requested patch " << patchNames_[patchI] << " not found" << nl
-             << "Available patches are: " << bMesh.names() << nl
-             << exit(FatalError);
+            )   << "Cannot find any patch names matching " << patchName[i]
+                << endl;
+        }
+
+        forAll(patchIDs, j)
+        {
+            patchIDs_.insert(patchIDs[j]);
         }
-        patchIds_[patchI] = id;
     }
+
+    patchData_.setSize(patchIDs_.size());
 }
 
 
@@ -155,9 +170,8 @@ Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
 :
     PostProcessingModel<CloudType>(ppm),
     maxStoredParcels_(ppm.maxStoredParcels_),
-    patchNames_(ppm.patchNames_),
-    patchData_(ppm.patchData_),
-    patchIds_(ppm.patchIds_)
+    patchIDs_(ppm.patchIDs_),
+    patchData_(ppm.patchData_)
 {}
 
 
@@ -177,8 +191,8 @@ void Foam::PatchPostProcessing<CloudType>::postPatch
     const label patchI
 )
 {
-    label localPatchI = applyToPatch(patchI);
-    if (localPatchI >= 0 && patchData_[localPatchI].size() < maxStoredParcels_)
+    const label localPatchI = applyToPatch(patchI);
+    if (localPatchI != -1 && patchData_[localPatchI].size() < maxStoredParcels_)
     {
         OStringStream data;
         data<< this->owner().time().timeName() << ' ' << p;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
index df075084d4..32847c1b12 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
@@ -58,15 +58,12 @@ class PatchPostProcessing
         //- Maximum number of parcels to store
         label maxStoredParcels_;
 
-        //- List of patch names
-        wordList patchNames_;
+        //- List of patch indices to post-process
+        labelHashSet patchIDs_;
 
         //- List of output data per patch
         List<DynamicList<string> > patchData_;
 
-        //- Mapping from local to global patch ids
-        labelList patchIds_;
-
 
     // Private Member Functions
 
@@ -117,11 +114,8 @@ public:
             //- Return maximum number of parcels to store per patch
             inline label maxStoredParcels() const;
 
-            //- Return const access to the list of patch names
-            inline const wordList& patchNames() const;
-
             //- Return const mapping from local to global patch ids
-            inline const labelList& patchIds() const;
+            inline const labelList& patchIDs() const;
 
 
         // Evaluation
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
index 3415904d3c..5cd4f5b255 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
@@ -31,17 +31,9 @@ Foam::label Foam::PatchPostProcessing<CloudType>::maxStoredParcels() const
 
 
 template<class CloudType>
-const Foam::wordList& Foam::PatchPostProcessing<CloudType>::patchNames() const
+const Foam::labelList& Foam::PatchPostProcessing<CloudType>::patchIDs() const
 {
-    return patchNames_;
-}
-
-
-template<class CloudType>
-const Foam::labelList&
-Foam::PatchPostProcessing<CloudType>::patchIds() const
-{
-    return patchIds_;
+    return patchIDs_;
 }
 
 

From 8f351e2776066d95791bac9ef3b431e1589bb798 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 17 Mar 2011 10:33:16 +0000
Subject: [PATCH 3/8] ENH: Only read set and surface sampling fields if
 specified

---
 .../sampledSet/sampledSets/sampledSets.C      | 69 ++++++++++++-------
 .../sampledSurfaces/sampledSurfaces.C         | 65 ++++++++++-------
 2 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 8d3bfc29d3..2304ec5048 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -231,28 +231,43 @@ void Foam::sampledSets::write()
 void Foam::sampledSets::read(const dictionary& dict)
 {
     dict_ = dict;
-    dict_.lookup("fields") >> fieldSelection_;
-    clearFieldGroups();
 
-    dict.lookup("interpolationScheme") >> interpolationScheme_;
-    dict.lookup("setFormat") >> writeFormat_;
+    bool setsFound = dict_.found("sets");
+    if (setsFound)
+    {
+        dict_.lookup("fields") >> fieldSelection_;
+        clearFieldGroups();
 
-    PtrList<sampledSet> newList
-    (
-        dict_.lookup("sets"),
-        sampledSet::iNew(mesh_, searchEngine_)
-    );
-    transfer(newList);
-    combineSampledSets(masterSampledSets_, indexSets_);
+        dict.lookup("interpolationScheme") >> interpolationScheme_;
+        dict.lookup("setFormat") >> writeFormat_;
+
+        PtrList<sampledSet> newList
+        (
+            dict_.lookup("sets"),
+            sampledSet::iNew(mesh_, searchEngine_)
+        );
+        transfer(newList);
+        combineSampledSets(masterSampledSets_, indexSets_);
+
+        if (this->size())
+        {
+            Info<< "Reading set description:" << nl;
+            forAll(*this, setI)
+            {
+                Info<< "    " << operator[](setI).name() << nl;
+            }
+            Info<< endl;
+        }
+    }
 
     if (Pstream::master() && debug)
     {
         Pout<< "sample fields:" << fieldSelection_ << nl
             << "sample sets:" << nl << "(" << nl;
 
-        forAll(*this, si)
+        forAll(*this, setI)
         {
-            Pout<< "  " << operator[](si) << endl;
+            Pout<< "  " << operator[](setI) << endl;
         }
         Pout<< ")" << endl;
     }
@@ -261,19 +276,23 @@ void Foam::sampledSets::read(const dictionary& dict)
 
 void Foam::sampledSets::correct()
 {
-    // reset interpolation
-    pointMesh::Delete(mesh_);
-    volPointInterpolation::Delete(mesh_);
+    bool setsFound = dict_.found("sets");
+    if (setsFound)
+    {
+        // reset interpolation
+        pointMesh::Delete(mesh_);
+        volPointInterpolation::Delete(mesh_);
 
-    searchEngine_.correct();
+        searchEngine_.correct();
 
-    PtrList<sampledSet> newList
-    (
-        dict_.lookup("sets"),
-        sampledSet::iNew(mesh_, searchEngine_)
-    );
-    transfer(newList);
-    combineSampledSets(masterSampledSets_, indexSets_);
+        PtrList<sampledSet> newList
+        (
+            dict_.lookup("sets"),
+            sampledSet::iNew(mesh_, searchEngine_)
+        );
+        transfer(newList);
+        combineSampledSets(masterSampledSets_, indexSets_);
+    }
 }
 
 
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 581b7e206b..b3e2fc7394 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -216,34 +216,49 @@ void Foam::sampledSurfaces::write()
 
 void Foam::sampledSurfaces::read(const dictionary& dict)
 {
-    dict.lookup("fields") >> fieldSelection_;
-    clearFieldGroups();
+    bool surfacesFound = dict.found("surfaces");
 
-    dict.lookup("interpolationScheme") >> interpolationScheme_;
-    const word writeType(dict.lookup("surfaceFormat"));
-
-    // define the surface formatter
-    // optionally defined extra controls for the output formats
-    formatter_ = surfaceWriter::New
-    (
-        writeType,
-        dict.subOrEmptyDict("formatOptions").subOrEmptyDict(writeType)
-    );
-
-    PtrList<sampledSurface> newList
-    (
-        dict.lookup("surfaces"),
-        sampledSurface::iNew(mesh_)
-    );
-    transfer(newList);
-
-    if (Pstream::parRun())
+    if (surfacesFound)
     {
-        mergeList_.setSize(size());
-    }
+        dict.lookup("fields") >> fieldSelection_;
+        clearFieldGroups();
 
-    // ensure all surfaces and merge information are expired
-    expire();
+        dict.lookup("interpolationScheme") >> interpolationScheme_;
+        const word writeType(dict.lookup("surfaceFormat"));
+
+        // define the surface formatter
+        // optionally defined extra controls for the output formats
+        formatter_ = surfaceWriter::New
+        (
+            writeType,
+            dict.subOrEmptyDict("formatOptions").subOrEmptyDict(writeType)
+        );
+
+        PtrList<sampledSurface> newList
+        (
+            dict.lookup("surfaces"),
+            sampledSurface::iNew(mesh_)
+        );
+        transfer(newList);
+
+        if (Pstream::parRun())
+        {
+            mergeList_.setSize(size());
+        }
+
+        // ensure all surfaces and merge information are expired
+        expire();
+
+        if (this->size())
+        {
+            Info<< "Reading surface description:" << nl;
+            forAll(*this, surfI)
+            {
+                Info<< "    " << operator[](surfI).name() << nl;
+            }
+            Info<< endl;
+        }
+    }
 
     if (Pstream::master() && debug)
     {

From eb0335cb1b5eec036620b79157f32e7bfca293ad Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 17 Mar 2011 10:55:00 +0000
Subject: [PATCH 4/8] ENH: File missed during commit a9109f3

---
 .../PatchPostProcessing/PatchPostProcessingI.H                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
index 5cd4f5b255..c6b8fa3b43 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 58e2a245df6b3ed2a396a534c57afbb03db0227b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 17 Mar 2011 10:55:57 +0000
Subject: [PATCH 5/8] ENH: Updates to sample dictionaries

---
 .../rhoCentralFoam/biconic25-55Run35/system/sampleDict |  4 ----
 .../rhoCentralFoam/shockTube/system/sampleDict         |  4 ----
 .../sonicFoam/laminar/shockTube/system/sampleDict      |  2 --
 .../mhdFoam/hartmann/system/sampleDict                 |  2 --
 .../buoyantSimpleFoam/buoyantCavity/system/sampleDict  |  2 --
 .../solidDisplacementFoam/plateHole/system/sampleDict  |  4 ----
 .../plateHole/system/sampleSurfaceDict                 | 10 +++++++++-
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
index c6c09765b4..200d1d8457 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
@@ -19,8 +19,6 @@ interpolationScheme cellPointFace;
 
 setFormat       raw;
 
-surfaceFormat   vtk;
-
 sets
 (
     cone25
@@ -49,8 +47,6 @@ sets
     }
 );
 
-surfaces        ( );
-
 fields          ( p wallHeatTransRate );
 
 
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
index 5b09da7be9..cb39c94af2 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict
@@ -19,8 +19,6 @@ interpolationScheme cellPoint;
 
 setFormat       raw;
 
-surfaceFormat   vtk;
-
 sets
 (
     line
@@ -33,8 +31,6 @@ sets
     }
 );
 
-surfaces        ();
-
 fields          ( p U.component(0) T rho );
 
 
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
index 5c511b54cb..30094ce956 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
@@ -31,8 +31,6 @@ sets
     }
 );
 
-surfaces        ();
-
 fields          ( T magU p );
 
 
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
index 62a059a57e..66425ed726 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
@@ -31,8 +31,6 @@ sets
     }
 );
 
-surfaces        ();
-
 fields          ( Ux );
 
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
index 710a7e00db..7d6d849af8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
@@ -87,8 +87,6 @@ sets
     }
 );
 
-surfaces ();
-
 fields
 (
     T
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
index 035ab3685f..b4fa7a9327 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict
@@ -17,8 +17,6 @@ FoamFile
 
 interpolationScheme cellPoint;
 
-setFormat       raw;
-
 sets
 (
     leftPatch
@@ -31,8 +29,6 @@ sets
     }
 );
 
-surfaces        ();
-
 fields          ( sigmaxx );
 
 
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
index e3dcebdbfe..0bf0e0b33e 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict
@@ -19,7 +19,15 @@ interpolationScheme cellPoint;
 
 surfaceFormat   dx;
 
-surfaces        ( constantPlane { name plate ; basePoint ( 0 0 0.25 ) ; normalVector ( 0 0 1 ) ; } );
+surfaces
+(
+    constantPlane
+    {
+        name plate;
+        basePoint ( 0 0 0.25 );
+        normalVector ( 0 0 1 );
+    }
+);
 
 fields          ( sigmaxx );
 

From 80393339a9a7453006554230f7c669a2d017cf67 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 17 Mar 2011 15:03:15 +0000
Subject: [PATCH 6/8] Upgrade of compressible solvers merging in developments
 from OpenFOAM-1.7.x

---
 .../compressible/rhoCentralFoam/Make/options  | 13 ++-
 .../rhoCentralFoam/createFields.H             | 15 +++
 .../rhoCentralDyMFoam/Make/options            |  7 +-
 .../rhoCentralDyMFoam/rhoCentralDyMFoam.C     | 22 +++--
 .../rhoCentralFoam/rhoCentralFoam.C           | 40 +++++---
 .../compressible/rhoPimpleFoam/Allwmake       |  8 ++
 .../compressible/rhoPimpleFoam/createFields.H | 10 ++
 .../solvers/compressible/rhoPimpleFoam/pEqn.H |  6 ++
 .../rhoPimpleFoam/rhoPimpleFoam.C             |  3 +-
 .../rhoPorousMRFPimpleFoam/Make/files         |  0
 .../rhoPorousMRFPimpleFoam/Make/options       |  2 +-
 .../rhoPorousMRFPimpleFoam/UEqn.H             |  0
 .../rhoPorousMRFPimpleFoam/createZones.H      |  5 +
 .../rhoPorousMRFPimpleFoam/pEqn.H             | 32 +++---
 .../rhoPorousMRFPimpleFoam.C                  |  1 +
 .../rhoPorousMRFPimpleFoam/createFields.H     | 77 ---------------
 .../rhoPorousSimpleFoam/createFields.H        | 98 -------------------
 .../compressible/rhoSimpleFoam/Allwmake       |  8 ++
 .../rhoPorousSimpleFoam/Make/files            |  0
 .../rhoPorousSimpleFoam/Make/options          |  1 +
 .../rhoPorousSimpleFoam/UEqn.H                |  0
 .../rhoPorousSimpleFoam/createPorousZones.H   | 27 +++++
 .../rhoPorousSimpleFoam/hEqn.H                |  4 +-
 .../rhoPorousSimpleFoam/pEqn.H                |  0
 .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C |  1 +
 .../rhoSimplecFoam/rhoSimplecFoam.C           |  2 +-
 .../sonicDyMFoam/compressibleContinuityErrs.H | 20 ----
 .../compressible/sonicDyMFoam/createFields.H  | 57 -----------
 .../readThermodynamicProperties.H             | 23 -----
 .../solvers/compressible/sonicFoam/Allwmake   |  9 ++
 .../solvers/compressible/sonicFoam/UEqn.H     |  4 +-
 .../{ => sonicFoam}/sonicDyMFoam/Make/files   |  0
 .../{ => sonicFoam}/sonicDyMFoam/Make/options |  2 +-
 .../sonicFoam/sonicDyMFoam/pEqn.H             | 33 +++++++
 .../sonicDyMFoam/sonicDyMFoam.C               | 53 +---------
 .../compressible/sonicFoam/sonicFoam.C        |  2 +-
 .../sonicLiquidFoam/Make/files                |  0
 .../sonicLiquidFoam/Make/options              |  0
 .../compressibleContinuityErrs.H              |  0
 .../sonicLiquidFoam/createFields.H            |  0
 .../readThermodynamicProperties.H             |  0
 .../readTransportProperties.H                 |  0
 .../sonicLiquidFoam/sonicLiquidFoam.C         |  2 +-
 .../sonicLiquidFoam/readTransportProperties.H | 18 ----
 .../fireFoam/les/smallPoolFire2D/0/p_rgh      | 11 ++-
 .../fireFoam/les/smallPoolFire3D/0/p_rgh      |  9 +-
 .../les/smallPoolFire3D/system/fvSolution     | 10 +-
 .../constant/turbulenceProperties             | 21 ++++
 .../constant/turbulenceProperties             | 21 ++++
 .../forwardStep/constant/turbulenceProperties | 21 ++++
 .../constant/turbulenceProperties             | 21 ++++
 .../shockTube/constant/turbulenceProperties   | 21 ++++
 .../wedge15Ma5/constant/turbulenceProperties  | 21 ++++
 .../les/pitzDaily/system/fvSolution           |  2 +
 .../ras/angledDuct/system/fvSolution          |  2 +
 .../ras/cavity/system/fvSolution              |  2 +
 .../angledDuctExplicit/system/fvSchemes       |  4 +-
 .../angledDuctExplicit/system/fvSolution      |  2 +-
 .../constant/polyMesh/boundary                |  2 +-
 .../angledDuctImplicit/system/fvSchemes       |  4 +-
 .../laminar/shockTube/system/sampleDict       | 11 ++-
 61 files changed, 359 insertions(+), 431 deletions(-)
 create mode 100755 applications/solvers/compressible/rhoPimpleFoam/Allwmake
 rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/Make/files (100%)
 rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/Make/options (94%)
 rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/UEqn.H (100%)
 create mode 100644 applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H
 rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/pEqn.H (80%)
 rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C (99%)
 delete mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H
 delete mode 100644 applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
 create mode 100755 applications/solvers/compressible/rhoSimpleFoam/Allwmake
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/Make/files (100%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/Make/options (98%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/UEqn.H (100%)
 create mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/hEqn.H (68%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/pEqn.H (100%)
 rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C (98%)
 delete mode 100644 applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H
 delete mode 100644 applications/solvers/compressible/sonicDyMFoam/createFields.H
 delete mode 100644 applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H
 create mode 100755 applications/solvers/compressible/sonicFoam/Allwmake
 rename applications/solvers/compressible/{ => sonicFoam}/sonicDyMFoam/Make/files (100%)
 rename applications/solvers/compressible/{ => sonicFoam}/sonicDyMFoam/Make/options (95%)
 create mode 100644 applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
 rename applications/solvers/compressible/{ => sonicFoam}/sonicDyMFoam/sonicDyMFoam.C (66%)
 rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/Make/files (100%)
 rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/Make/options (100%)
 rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/compressibleContinuityErrs.H (100%)
 rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/createFields.H (100%)
 rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/readThermodynamicProperties.H (100%)
 rename applications/solvers/compressible/{sonicDyMFoam => sonicFoam/sonicLiquidFoam}/readTransportProperties.H (100%)
 rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/sonicLiquidFoam.C (98%)
 delete mode 100644 applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H
 create mode 100644 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
 create mode 100644 tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
 create mode 100644 tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
 create mode 100644 tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
 create mode 100644 tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
 create mode 100644 tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties

diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options
index 4714ca611c..b3be16a505 100644
--- a/applications/solvers/compressible/rhoCentralFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/Make/options
@@ -1,11 +1,18 @@
 EXE_INC = \
+    -IBCs/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -IBCs/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
 EXE_LIBS = \
     -lfiniteVolume \
     -lbasicThermophysicalModels \
     -lspecie \
-    -lrhoCentralFoam
+    -lrhoCentralFoam \
+    -lcompressibleTurbulenceModel \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
+    -lmeshTools
diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H
index fc65b3e5b4..60b40db1d1 100644
--- a/applications/solvers/compressible/rhoCentralFoam/createFields.H
+++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H
@@ -96,3 +96,18 @@ surfaceScalarField neg
     mesh,
     dimensionedScalar("neg", dimless, -1.0)
 );
+
+
+surfaceScalarField phi("phi", mesh.Sf() & fvc::interpolate(rhoU));
+
+Info<< "Creating turbulence model\n" << endl;
+autoPtr<compressible::turbulenceModel> turbulence
+(
+    compressible::turbulenceModel::New
+    (
+        rho,
+        U,
+        phi,
+        thermo
+    )
+);
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
index 403ffc1eef..250effbee2 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options
@@ -1,10 +1,10 @@
 EXE_INC = \
     -I.. \
+    -I../BCs/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I../BCs/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
@@ -13,5 +13,8 @@ EXE_LIBS = \
     -lbasicThermophysicalModels \
     -lspecie \
     -lrhoCentralFoam \
+    -lcompressibleTurbulenceModel \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels \
     -ldynamicMesh \
     -lmeshTools
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index 64b5fb5d87..8005a77aa7 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    rhoCentralFoam
+    rhoCentralDyMFoam
 
 Description
     Density-based compressible flow solver based on central-upwind schemes of
@@ -32,6 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicPsiThermo.H"
+#include "turbulenceModel.H"
 #include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"
 #include "motionSolver.H"
@@ -185,12 +186,11 @@ int main(int argc, char *argv[])
           + aSf*p_pos - aSf*p_neg
         );
 
-        volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U))));
+        volScalarField muEff(turbulence->muEff());
+        volTensorField tauMC("tauMC", muEff*dev2(Foam::T(fvc::grad(U))));
 
         // --- Solve density
-        Info<< max(rho) << " " << min(rho) << endl;
         solve(fvm::ddt(rho) + fvc::div(phi));
-        Info<< max(rho) << " " << min(rho) << endl;
 
         // --- Solve momentum
         solve(fvm::ddt(rhoU) + fvc::div(phiUp));
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
             solve
             (
                 fvm::ddt(rho, U) - fvc::ddt(rho, U)
-              - fvm::laplacian(mu, U)
+              - fvm::laplacian(muEff, U)
               - fvc::div(tauMC)
             );
             rhoU = rho*U;
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
         surfaceScalarField sigmaDotU
         (
             (
-                fvc::interpolate(mu)*mesh.magSf()*fvc::snGrad(U)
+                fvc::interpolate(muEff)*mesh.magSf()*fvc::snGrad(U)
               + (mesh.Sf() & fvc::interpolate(tauMC))
             )
             & (a_pos*U_pos + a_neg*U_neg)
@@ -240,12 +240,12 @@ int main(int argc, char *argv[])
 
         if (!inviscid)
         {
-            volScalarField k("k", thermo.Cp()*mu/Pr);
+            volScalarField k("k", thermo.Cp()*muEff/Pr);
             solve
             (
                 fvm::ddt(rho, e) - fvc::ddt(rho, e)
-              - fvm::laplacian(thermo.alpha(), e)
-              + fvc::laplacian(thermo.alpha(), e)
+              - fvm::laplacian(turbulence->alphaEff(), e)
+              + fvc::laplacian(turbulence->alpha(), e)
               - fvc::laplacian(k, T)
             );
             thermo.correct();
@@ -258,6 +258,8 @@ int main(int argc, char *argv[])
         p.correctBoundaryConditions();
         rho.boundaryField() = psi.boundaryField()*p.boundaryField();
 
+        turbulence->correct();
+
         runTime.write();
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 71ce4c2187..dd0f4ee4a5 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,7 @@ Description
 
 #include "fvCFD.H"
 #include "basicPsiThermo.H"
+#include "turbulenceModel.H"
 #include "zeroGradientFvPatchFields.H"
 #include "fixedRhoFvPatchScalarField.H"
 
@@ -51,7 +52,7 @@ int main(int argc, char *argv[])
 
     #include "readFluxScheme.H"
 
-    dimensionedScalar v_zero("v_zero",dimVolume/dimTime, 0.0);
+    dimensionedScalar v_zero("v_zero", dimVolume/dimTime, 0.0);
 
     Info<< "\nStarting time loop\n" << endl;
 
@@ -128,14 +129,6 @@ int main(int argc, char *argv[])
 
         surfaceScalarField amaxSf("amaxSf", max(mag(am), mag(ap)));
 
-        #include "compressibleCourantNo.H"
-        #include "readTimeControls.H"
-        #include "setDeltaT.H"
-
-        runTime++;
-
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
         surfaceScalarField aSf(am*a_pos);
 
         if (fluxScheme == "Tadmor")
@@ -152,6 +145,18 @@ int main(int argc, char *argv[])
         surfaceScalarField aphiv_pos(phiv_pos - aSf);
         surfaceScalarField aphiv_neg(phiv_neg + aSf);
 
+        // Reuse amaxSf for the maximum positive and negative fluxes
+        // estimated by the central scheme
+        amaxSf = max(mag(aphiv_pos), mag(aphiv_neg));
+
+        #include "compressibleCourantNo.H"
+        #include "readTimeControls.H"
+        #include "setDeltaT.H"
+
+        runTime++;
+
+        Info<< "Time = " << runTime.timeName() << nl << endl;
+
         surfaceScalarField phi("phi", aphiv_pos*rho_pos + aphiv_neg*rho_neg);
 
         surfaceVectorField phiUp
@@ -167,7 +172,8 @@ int main(int argc, char *argv[])
           + aSf*p_pos - aSf*p_neg
         );
 
-        volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U))));
+        volScalarField muEff(turbulence->muEff());
+        volTensorField tauMC("tauMC", muEff*dev2(Foam::T(fvc::grad(U))));
 
         // --- Solve density
         solve(fvm::ddt(rho) + fvc::div(phi));
@@ -188,7 +194,7 @@ int main(int argc, char *argv[])
             solve
             (
                 fvm::ddt(rho, U) - fvc::ddt(rho, U)
-              - fvm::laplacian(mu, U)
+              - fvm::laplacian(muEff, U)
               - fvc::div(tauMC)
             );
             rhoU = rho*U;
@@ -198,7 +204,7 @@ int main(int argc, char *argv[])
         surfaceScalarField sigmaDotU
         (
             (
-                fvc::interpolate(mu)*mesh.magSf()*fvc::snGrad(U)
+                fvc::interpolate(muEff)*mesh.magSf()*fvc::snGrad(U)
               + (mesh.Sf() & fvc::interpolate(tauMC))
             )
             & (a_pos*U_pos + a_neg*U_neg)
@@ -222,12 +228,12 @@ int main(int argc, char *argv[])
 
         if (!inviscid)
         {
-            volScalarField k("k", thermo.Cp()*mu/Pr);
+            volScalarField k("k", thermo.Cp()*muEff/Pr);
             solve
             (
                 fvm::ddt(rho, e) - fvc::ddt(rho, e)
-              - fvm::laplacian(thermo.alpha(), e)
-              + fvc::laplacian(thermo.alpha(), e)
+              - fvm::laplacian(turbulence->alphaEff(), e)
+              + fvc::laplacian(turbulence->alpha(), e)
               - fvc::laplacian(k, T)
             );
             thermo.correct();
@@ -240,6 +246,8 @@ int main(int argc, char *argv[])
         p.correctBoundaryConditions();
         rho.boundaryField() = psi.boundaryField()*p.boundaryField();
 
+        turbulence->correct();
+
         runTime.write();
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/Allwmake b/applications/solvers/compressible/rhoPimpleFoam/Allwmake
new file mode 100755
index 0000000000..29bc918085
--- /dev/null
+++ b/applications/solvers/compressible/rhoPimpleFoam/Allwmake
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake
+wmake rhoPorousMRFPimpleFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 3c29a987d3..d1ade4b457 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -39,6 +39,16 @@
 
     #include "compressibleCreatePhi.H"
 
+    dimensionedScalar rhoMax
+    (
+        mesh.solutionDict().subDict("PIMPLE").lookup("rhoMax")
+    );
+
+    dimensionedScalar rhoMin
+    (
+        mesh.solutionDict().subDict("PIMPLE").lookup("rhoMin")
+    );
+
     Info<< "Creating turbulence model\n" << endl;
     autoPtr<compressible::turbulenceModel> turbulence
     (
diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
index 84e6451890..29ceb721c7 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H
@@ -1,4 +1,7 @@
 rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
 
 U = rAU*UEqn().H();
 
@@ -98,6 +101,9 @@ p.relax();
 
 // Recalculate density from the relaxed pressure
 rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
 Info<< "rho max/min : " << max(rho).value()
     << " " << min(rho).value() << endl;
 
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index be0e09ee28..b91675f761 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,6 +75,7 @@ int main(int argc, char *argv[])
             if (nOuterCorr != 1)
             {
                 p.storePrevIter();
+                rho.storePrevIter();
             }
 
             #include "UEqn.H"
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/files b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/files
similarity index 100%
rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/files
rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/files
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options
similarity index 94%
rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/options
rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options
index 809b4a63a1..4067875fbc 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I../rhoPimpleFoam \
+    -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/cfdTools \
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H
similarity index 100%
rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H
rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H
new file mode 100644
index 0000000000..487a55d8ed
--- /dev/null
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H
@@ -0,0 +1,5 @@
+    MRFZones mrfZones(mesh);
+    mrfZones.correctBoundaryVelocity(U);
+
+    porousZones pZones(mesh);
+    Switch pressureImplicitPorosity(false);
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
similarity index 80%
rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H
rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
index 3802c9298a..87794f8a47 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H
@@ -1,4 +1,7 @@
 rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
 
 volScalarField rAU(1.0/UEqn().A());
 U = rAU*UEqn().H();
@@ -96,30 +99,17 @@ else
 #include "rhoEqn.H"
 #include "compressibleContinuityErrs.H"
 
-//if (oCorr != nOuterCorr-1)
-{
-    // Explicitly relax pressure for momentum corrector
-    p.relax();
+// Explicitly relax pressure for momentum corrector
+p.relax();
 
-    rho = thermo.rho();
-    rho = max(rho, rhoMin);
-    rho = min(rho, rhoMax);
-    rho.relax();
-    Info<< "rho max/min : " << max(rho).value()
-        << " " << min(rho).value() << endl;
-}
+rho = thermo.rho();
+rho = max(rho, rhoMin);
+rho = min(rho, rhoMax);
+rho.relax();
+Info<< "rho max/min : " << max(rho).value()
+    << " " << min(rho).value() << endl;
 
 U -= rAU*fvc::grad(p);
 U.correctBoundaryConditions();
 
 DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
-
-// For closed-volume cases adjust the pressure and density levels
-// to obey overall mass continuity
-/*
-if (closedVolume)
-{
-    p += (initialMass - fvc::domainIntegrate(psi*p))
-        /fvc::domainIntegrate(psi);
-}
-*/
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
similarity index 99%
rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
index 0a3a899821..d72ff3af5a 100644
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createZones.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H
deleted file mode 100644
index 9dd30f53cf..0000000000
--- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H
+++ /dev/null
@@ -1,77 +0,0 @@
-    Info<< "Reading thermophysical properties\n" << endl;
-
-    autoPtr<basicPsiThermo> pThermo
-    (
-        basicPsiThermo::New(mesh)
-    );
-    basicPsiThermo& thermo = pThermo();
-
-    volScalarField& p = thermo.p();
-    volScalarField& h = thermo.h();
-    const volScalarField& psi = thermo.psi();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::READ_IF_PRESENT,
-            IOobject::AUTO_WRITE
-        ),
-        thermo.rho()
-    );
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    #include "compressibleCreatePhi.H"
-
-    dimensionedScalar rhoMax
-    (
-        mesh.solutionDict().subDict("PIMPLE").lookup("rhoMax")
-    );
-
-    dimensionedScalar rhoMin
-    (
-        mesh.solutionDict().subDict("PIMPLE").lookup("rhoMin")
-    );
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::turbulenceModel> turbulence
-    (
-        compressible::turbulenceModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
-    );
-
-    //dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-
-
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt
-    (
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
-    );
-
-    MRFZones mrfZones(mesh);
-    mrfZones.correctBoundaryVelocity(U);
-
-    porousZones pZones(mesh);
-    Switch pressureImplicitPorosity(false);
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
deleted file mode 100644
index 1a242bdfff..0000000000
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H
+++ /dev/null
@@ -1,98 +0,0 @@
-    Info<< "Reading thermophysical properties\n" << endl;
-
-    autoPtr<basicPsiThermo> pThermo
-    (
-        basicPsiThermo::New(mesh)
-    );
-    basicPsiThermo& thermo = pThermo();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::READ_IF_PRESENT,
-            IOobject::AUTO_WRITE
-        ),
-        thermo.rho()
-    );
-
-    volScalarField& p = thermo.p();
-    volScalarField& h = thermo.h();
-    const volScalarField& psi = thermo.psi();
-
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    #include "compressibleCreatePhi.H"
-
-
-    label pRefCell = 0;
-    scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue);
-
-    dimensionedScalar rhoMax
-    (
-        mesh.solutionDict().subDict("SIMPLE").lookup("rhoMax")
-    );
-
-    dimensionedScalar rhoMin
-    (
-        mesh.solutionDict().subDict("SIMPLE").lookup("rhoMin")
-    );
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::RASModel> turbulence
-    (
-        compressible::RASModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
-    );
-
-    dimensionedScalar initialMass = fvc::domainIntegrate(rho);
-
-    thermalPorousZones pZones(mesh);
-    Switch pressureImplicitPorosity(false);
-
-    // nUCorrectors used for pressureImplicitPorosity
-    int nUCorr = 0;
-    if (pZones.size())
-    {
-        // nUCorrectors for pressureImplicitPorosity
-        if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
-        {
-            nUCorr = readInt
-            (
-                mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
-            );
-        }
-
-        if (nUCorr > 0)
-        {
-            pressureImplicitPorosity = true;
-            Info<< "Using pressure implicit porosity" << endl;
-        }
-        else
-        {
-            Info<< "Using pressure explicit porosity" << endl;
-        }
-    }
-
diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwmake b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
new file mode 100755
index 0000000000..d4c5bc2828
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/Allwmake
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake
+wmake rhoPorousSimpleFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/files b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files
similarity index 100%
rename from applications/solvers/compressible/rhoPorousSimpleFoam/Make/files
rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
similarity index 98%
rename from applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
index a4cdecf368..14e73bf2a5 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermalPorousZone/lnInclude \
     -I$(LIB_SRC)/turbulenceModels \
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
similarity index 100%
rename from applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H
rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H
new file mode 100644
index 0000000000..8640b360e0
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H
@@ -0,0 +1,27 @@
+    thermalPorousZones pZones(mesh);
+    Switch pressureImplicitPorosity(false);
+
+    // nUCorrectors used for pressureImplicitPorosity
+    int nUCorr = 0;
+    if (pZones.size())
+    {
+        // nUCorrectors for pressureImplicitPorosity
+        if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors"))
+        {
+            nUCorr = readInt
+            (
+                mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors")
+            );
+        }
+
+        if (nUCorr > 0)
+        {
+            pressureImplicitPorosity = true;
+            Info<< "Using pressure implicit porosity" << endl;
+        }
+        else
+        {
+            Info<< "Using pressure explicit porosity" << endl;
+        }
+    }
+
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H
similarity index 68%
rename from applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H
index 9e5138de8a..ff0b91bcb7 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H
@@ -5,8 +5,8 @@
       - fvm::Sp(fvc::div(phi), h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p, "div(U,p)"))
-      - p*fvc::div(phi/fvc::interpolate(rho))
+        fvc::div(phi/fvc::interpolate(rho), rho/psi, "div(U,p)")
+      - (rho/psi)*fvc::div(phi/fvc::interpolate(rho))
     );
 
     pZones.addEnthalpySource(thermo, rho, hEqn);
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
similarity index 100%
rename from applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H
rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
similarity index 98%
rename from applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index 2b77cf6265..005e27b4a5 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
+    #include "createPorousZones.H"
     #include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
index fa6c9f3594..c804e4e45d 100644
--- a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
+++ b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H
deleted file mode 100644
index 1d869cc58d..0000000000
--- a/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    #include "rhoEqn.H"
-}
-{
-    scalar sumLocalContErr =
-        sum
-        (
-            mag(rho.internalField() - (psi*p)().internalField())
-        )/sum(rho.internalField());
-
-    scalar globalContErr =
-        sum(rho.internalField() - (psi*p)().internalField())
-       /sum(rho.internalField());
-
-    cumulativeContErr += globalContErr;
-
-    Info<< "time step continuity errors : sum local = " << sumLocalContErr
-         << ", global = " << globalContErr
-         << ", cumulative = " << cumulativeContErr << endl;
-}
diff --git a/applications/solvers/compressible/sonicDyMFoam/createFields.H b/applications/solvers/compressible/sonicDyMFoam/createFields.H
deleted file mode 100644
index 8367d7e331..0000000000
--- a/applications/solvers/compressible/sonicDyMFoam/createFields.H
+++ /dev/null
@@ -1,57 +0,0 @@
-    Info<< "Reading thermophysical properties\n" << endl;
-
-    autoPtr<basicPsiThermo> pThermo
-    (
-        basicPsiThermo::New(mesh)
-    );
-    basicPsiThermo& thermo = pThermo();
-
-    volScalarField& p = thermo.p();
-    volScalarField& e = thermo.e();
-    const volScalarField& psi = thermo.psi();
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh
-        ),
-        thermo.rho()
-    );
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-#   include "compressibleCreatePhi.H"
-
-
-    Info<< "Creating turbulence model\n" << endl;
-    autoPtr<compressible::turbulenceModel> turbulence
-    (
-        compressible::turbulenceModel::New
-        (
-            rho,
-            U,
-            phi,
-            thermo
-        )
-    );
-
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt
-    (
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
-    );
diff --git a/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H
deleted file mode 100644
index 4e19adaae4..0000000000
--- a/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H
+++ /dev/null
@@ -1,23 +0,0 @@
-    Info<< "Reading thermodynamicProperties\n" << endl;
-
-    IOdictionary thermodynamicProperties
-    (
-        IOobject
-        (
-            "thermodynamicProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar R
-    (
-        thermodynamicProperties.lookup("R")
-    );
-
-    dimensionedScalar Cv
-    (
-        thermodynamicProperties.lookup("Cv")
-    );
diff --git a/applications/solvers/compressible/sonicFoam/Allwmake b/applications/solvers/compressible/sonicFoam/Allwmake
new file mode 100755
index 0000000000..27c1194eaf
--- /dev/null
+++ b/applications/solvers/compressible/sonicFoam/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake
+wmake sonicDyMFoam
+wmake sonicLiquidFoam
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H
index 25506783ae..27edbece47 100644
--- a/applications/solvers/compressible/sonicFoam/UEqn.H
+++ b/applications/solvers/compressible/sonicFoam/UEqn.H
@@ -1,8 +1,8 @@
 fvVectorMatrix UEqn
 (
     fvm::ddt(rho, U)
-    + fvm::div(phi, U)
-    + turbulence->divDevRhoReff(U)
+  + fvm::div(phi, U)
+  + turbulence->divDevRhoReff(U)
 );
 
 solve(UEqn == -fvc::grad(p));
diff --git a/applications/solvers/compressible/sonicDyMFoam/Make/files b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/files
similarity index 100%
rename from applications/solvers/compressible/sonicDyMFoam/Make/files
rename to applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/files
diff --git a/applications/solvers/compressible/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
similarity index 95%
rename from applications/solvers/compressible/sonicDyMFoam/Make/options
rename to applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
index 81495fb1f6..73e3e02dc4 100644
--- a/applications/solvers/compressible/sonicDyMFoam/Make/options
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I../sonicFoam \
+    -I.. \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
new file mode 100644
index 0000000000..98cc22d15a
--- /dev/null
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
@@ -0,0 +1,33 @@
+rho = thermo.rho();
+
+volScalarField rAU(1.0/UEqn.A());
+U = UEqn.H()/UEqn.A();
+
+surfaceScalarField phid
+(
+    "phid",
+    fvc::interpolate(psi)
+   *(
+        (fvc::interpolate(U) & mesh.Sf())
+      - fvc::meshPhi(rho, U)
+    )
+);
+
+for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
+{
+    fvScalarMatrix pEqn
+    (
+        fvm::ddt(psi, p)
+      + fvm::div(phid, p)
+      - fvm::laplacian(rho*rAU, p)
+    );
+
+    pEqn.solve();
+
+    phi = pEqn.flux();
+}
+
+#include "compressibleContinuityErrs.H"
+
+U -= rAU*fvc::grad(p);
+U.correctBoundaryConditions();
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
similarity index 66%
rename from applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
rename to applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
index 453a84b9a3..dd870e9a31 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,14 +62,7 @@ int main(int argc, char *argv[])
 
         #include "rhoEqn.H"
 
-        fvVectorMatrix UEqn
-        (
-            fvm::ddt(rho, U)
-          + fvm::div(phi, U)
-          + turbulence->divDevRhoReff(U)
-        );
-
-        solve(UEqn == -fvc::grad(p));
+        #include "UEqn.H"
 
         #include "eEqn.H"
 
@@ -78,50 +71,12 @@ int main(int argc, char *argv[])
 
         for (int corr=0; corr<nCorr; corr++)
         {
-            U = UEqn.H()/UEqn.A();
-
-            surfaceScalarField phid
-            (
-                "phid",
-                fvc::interpolate(psi)
-               *(
-                    (fvc::interpolate(U) & mesh.Sf()) - fvc::meshPhi(rho, U)
-                )
-            );
-
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-            {
-                fvScalarMatrix pEqn
-                (
-                    fvm::ddt(psi, p)
-                  + fvm::div(phid, p)
-                  - fvm::laplacian(rho/UEqn.A(), p)
-                );
-
-                pEqn.solve();
-
-                phi = pEqn.flux();
-            }
-
-            #include "compressibleContinuityErrs.H"
-
-            U -= fvc::grad(p)/UEqn.A();
-            U.correctBoundaryConditions();
+            #include "pEqn.H"
         }
 
-        DpDt = fvc::DDt
-        (
-            surfaceScalarField
-            (
-                "phiU",
-                phi/fvc::interpolate(rho) + fvc::meshPhi(rho, U)
-            ),
-            p
-        );
-
         turbulence->correct();
 
-        rho = psi*p;
+        rho = thermo.rho();
 
         runTime.write();
 
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 820945edea..2923446e2f 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/compressible/sonicLiquidFoam/Make/files b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/files
similarity index 100%
rename from applications/solvers/compressible/sonicLiquidFoam/Make/files
rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/files
diff --git a/applications/solvers/compressible/sonicLiquidFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/options
similarity index 100%
rename from applications/solvers/compressible/sonicLiquidFoam/Make/options
rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/options
diff --git a/applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/compressibleContinuityErrs.H
similarity index 100%
rename from applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H
rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/compressibleContinuityErrs.H
diff --git a/applications/solvers/compressible/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H
similarity index 100%
rename from applications/solvers/compressible/sonicLiquidFoam/createFields.H
rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H
diff --git a/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H
similarity index 100%
rename from applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H
rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H
diff --git a/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H
similarity index 100%
rename from applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H
rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H
diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
similarity index 98%
rename from applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
index 86987d92c9..c948d4737c 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H b/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H
deleted file mode 100644
index c30f65b445..0000000000
--- a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H
+++ /dev/null
@@ -1,18 +0,0 @@
-    Info<< "Reading transportProperties\n" << endl;
-
-    IOdictionary transportProperties
-    (
-        IOobject
-        (
-            "transportProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar mu
-    (
-        transportProperties.lookup("mu")
-    );
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
index 1e165b9bbf..356077d324 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh
@@ -24,12 +24,17 @@ boundaryField
     outlet
     {
         type            buoyantPressure;
-        value           uniform 101325;
+        value           $internalField;
     }
-
     sides
     {
-        type            fixedValue;
+        type            totalPressure;
+        p0              $internalField;
+        U               U;
+        phi             phi;
+        rho             none;
+        psi             none;
+        gamma           1;
         value           $internalField;
     }
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
index 47b78e4c87..38b3c31d20 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
@@ -26,10 +26,15 @@ boundaryField
         type            buoyantPressure;
         value           $internalField;
     }
-
     sides
     {
-        type            fixedValue;
+        type            totalPressure;
+        p0              $internalField;
+        U               U;
+        phi             phi;
+        rho             none;
+        psi             none;
+        gamma           1;
         value           $internalField;
     }
     base
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
index 8c855503fc..72c26cef38 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
@@ -18,18 +18,11 @@ FoamFile
 
 solvers
 {
-    rho
+    "(rho|rhoFinal)"
     {
         solver              PCG;
         preconditioner      DIC;
         tolerance           1e-7;
-        relTol              0.1;
-    };
-
-    rhoFinal
-    {
-        $rho;
-        tolerance           1e-7;
         relTol              0;
     };
 
@@ -69,7 +62,6 @@ solvers
         relTol          0;
     };
 
-
     Ii
     {
         solver              GAMG;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
new file mode 100644
index 0000000000..d0a0998654
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
new file mode 100644
index 0000000000..d0a0998654
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
new file mode 100644
index 0000000000..d0a0998654
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
new file mode 100644
index 0000000000..d0a0998654
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
new file mode 100644
index 0000000000..d0a0998654
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
new file mode 100644
index 0000000000..d0a0998654
--- /dev/null
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
index 0cfde23d31..739c8a48a6 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution
@@ -52,6 +52,8 @@ PIMPLE
     nOuterCorrectors 2;
     nCorrectors     1;
     nNonOrthogonalCorrectors 0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 2.0;
 }
 
 relaxationFactors
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
index 58e0443d46..8c260da89e 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution
@@ -55,6 +55,8 @@ PIMPLE
     nOuterCorrectors 50;
     nCorrectors     1;
     nNonOrthogonalCorrectors 0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 2.0;
 }
 
 relaxationFactors
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
index 80bab234da..197228f4bc 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution
@@ -59,6 +59,8 @@ PIMPLE
     nOuterCorrectors 1;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
+    rhoMax          rhoMax [ 1 -3 0 0 0 ] 2.0;
 }
 
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
index 184f6b4d1b..8792a00a15 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -23,8 +23,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(U)         Gauss linear;
-    grad(p)         Gauss linear;
 }
 
 divSchemes
@@ -34,6 +32,7 @@ divSchemes
     div(phi,h)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
+    div(U,p)        Gauss upwind;
 }
 
 laplacianSchemes
@@ -50,7 +49,6 @@ laplacianSchemes
 interpolationSchemes
 {
     default         linear;
-    div(U,p)        upwind phi;
 }
 
 snGradSchemes
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
index f9e889652c..e6b7b5ec15 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -57,7 +57,7 @@ solvers
 SIMPLE
 {
     nNonOrthogonalCorrectors 0;
-    rhoMin          rhoMin [ 1 -3 0 0 0 ] 1.0;
+    rhoMin          rhoMin [ 1 -3 0 0 0 ] 0.5;
     rhoMax          rhoMax [ 1 -3 0 0 0 ] 1.5;
 }
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
index dc9ecffb7b..117139f505 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
index 92ad9e0855..a5f9ea99dd 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -23,8 +23,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(U)         Gauss linear;
-    grad(p)         Gauss linear;
 }
 
 divSchemes
@@ -34,6 +32,7 @@ divSchemes
     div(phi,h)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
+    div(U,p)        Gauss upwind;
 }
 
 laplacianSchemes
@@ -49,7 +48,6 @@ laplacianSchemes
 interpolationSchemes
 {
     default         linear;
-    div(U,p)        upwind phi;
 }
 
 snGradSchemes
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
index 5c511b54cb..2e59f91be1 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
@@ -19,21 +19,22 @@ interpolationScheme cellPoint;
 
 setFormat       raw;
 
+surfaceFormat   dx;
+surfaces        ();
+
 sets
 (
     data
     {
         type    uniform;
         axis    x;
-        start   ( -4.995 0 0 );
-        end     ( 4.995 0 0 );
+        start   (-4.995 0 0);
+        end     (4.995 0 0);
         nPoints 1000;
     }
 );
 
-surfaces        ();
-
-fields          ( T magU p );
+fields          (T magU p);
 
 
 // ************************************************************************* //

From 230f903f06bb243468d0ef0af06527c5555cb49e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 17 Mar 2011 15:09:23 +0000
Subject: [PATCH 7/8] Corrected change date

---
 .../rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C             | 2 +-
 .../rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
index d72ff3af5a..a410cf5248 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index 005e27b4a5..b0a99e3306 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From a302f0637f24e665dcae72b494590b5310c3eab8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 17 Mar 2011 15:15:05 +0000
Subject: [PATCH 8/8] shockTube tutorial: removed spurious surface
 specification in sampleDict

---
 .../compressible/sonicFoam/laminar/shockTube/system/sampleDict | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
index 561612437a..34176d6c3f 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict
@@ -19,9 +19,6 @@ interpolationScheme cellPoint;
 
 setFormat       raw;
 
-surfaceFormat   dx;
-surfaces        ();
-
 sets
 (
     data