Merge branch 'master' into particleInteractions

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -41,24 +41,6 @@
             )
         );
 
-        Info<< "    Adding to KFluid\n" << endl;
-        KFluid.set
-        (
-            i,
-            new volScalarField
-            (
-                IOobject
-                (
-                    "K",
-                    runTime.timeName(),
-                    fluidRegions[i],
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE
-                ),
-                thermoFluid[i].Cp()*thermoFluid[i].alpha()
-            )
-        );
-
         Info<< "    Adding to UFluid\n" << endl;
         UFluid.set
         (
@@ -129,6 +111,24 @@
             ).ptr()
         );
 
+        Info<< "    Adding to KFluid\n" << endl;
+        KFluid.set
+        (
+            i,
+            new volScalarField
+            (
+                IOobject
+                (
+                    "K",
+                    runTime.timeName(),
+                    fluidRegions[i],
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                thermoFluid[i].Cp()*turbulence[i].alphaEff()
+            )
+        );
+
         Info<< "    Adding to DpDtFluid\n" << endl;
         DpDtFluid.set
         (

applications/utilities/mesh/manipulation/checkMesh/checkMesh.C

@@ -47,7 +47,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    timeSelector::addOptions(false);   // no constant
+    timeSelector::addOptions();
 #   include "addRegionOption.H"
     argList::validOptions.insert("noTopology", "");
     argList::validOptions.insert("allGeometry", "");

etc/settings.csh

@@ -35,6 +35,8 @@
 alias _foamAddPath 'set path=(\!* $path)'
 # prefix to LD_LIBRARY_PATH
 alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
+# prefix to MANPATH
+alias _foamAddManPath 'setenv MANPATH \!*\:${MANPATH}'
 
 # location of the jobControl directory
 setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
@@ -117,6 +119,7 @@ case OpenFOAM:
     _foamAddPath    ${WM_COMPILER_DIR}/bin
     _foamAddLib     ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH}
     _foamAddLib     ${WM_COMPILER_DIR}/lib
+    _foamAddManPath ${WM_COMPILER_DIR}/man
 
     breaksw
 endsw
@@ -138,19 +141,20 @@ case OPENMPI:
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
+    _foamAddManPath $MPI_ARCH_PATH/man
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
     breaksw
 
 case MPICH:
-    set mpi_version=mpich-1.2.4
+    set mpi_version=mpich2-1.1.1p1
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-    setenv MPICH_ROOT $MPI_ARCH_PATH
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
+    _foamAddManPath $MPI_ARCH_PATH/share/man
 
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -159,7 +163,6 @@ case MPICH:
 case MPICH-GM:
     setenv MPI_ARCH_PATH /opt/mpi
     setenv MPICH_PATH $MPI_ARCH_PATH
-    setenv MPICH_ROOT $MPI_ARCH_PATH
     setenv GM_LIB_PATH /opt/gm/lib64
 
     _foamAddPath $MPI_ARCH_PATH/bin
@@ -172,7 +175,6 @@ case MPICH-GM:
 case HPMPI:
     setenv MPI_HOME /opt/hpmpi
     setenv MPI_ARCH_PATH $MPI_HOME
-    setenv MPICH_ROOT=$MPI_ARCH_PATH
 
     _foamAddPath $MPI_ARCH_PATH/bin
 

etc/settings.sh

@@ -51,6 +51,16 @@ _foamAddLib()
     done
 }
 
+# prefix to MANPATH
+_foamAddManPath()
+{
+    while [ $# -ge 1 ]
+    do
+        export MANPATH=$1:$MANPATH
+        shift
+    done
+}
+
 
 # location of the jobControl directory
 export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
@@ -90,7 +100,7 @@ _foamAddLib  $FOAM_LIBBIN $FOAM_SITE_LIBBIN $FOAM_USER_LIBBIN
 
 # Compiler settings
 # ~~~~~~~~~~~~~~~~~
-unset compilerBin compilerLib
+unset compilerBin compilerLib compilerMan
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -133,6 +143,7 @@ OpenFOAM)
 
     compilerBin=$WM_COMPILER_DIR/bin
     compilerLib=$WM_COMPILER_DIR/lib$WM_COMPILER_LIB_ARCH:$WM_COMPILER_DIR/lib
+    compilerMan=$WM_COMPILER_DIR/man
     ;;
 esac
 
@@ -140,9 +151,10 @@ if [ -d "$compilerBin" ]
 then
     _foamAddPath    $compilerBin
     _foamAddLib     $compilerLib
+    _foamAddManPath $compilerMan
 fi
 
-unset compilerBin compilerLib compilerInstall
+unset compilerBin compilerLib compilerMan compilerInstall
 
 # Communications library
 # ~~~~~~~~~~~~~~~~~~~~~~
@@ -160,19 +172,20 @@ OPENMPI)
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
+    _foamAddManPath $MPI_ARCH_PATH/man
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
     ;;
 
 MPICH)
-    mpi_version=mpich-1.2.4
+    mpi_version=mpich2-1.1.1p1
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-    export MPICH_ROOT=$MPI_ARCH_PATH
 
     _foamAddPath    $MPI_ARCH_PATH/bin
     _foamAddLib     $MPI_ARCH_PATH/lib
+    _foamAddManPath $MPI_ARCH_PATH/share/man
 
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
     unset mpi_version
@@ -181,7 +194,6 @@ MPICH)
 MPICH-GM)
     export MPI_ARCH_PATH=/opt/mpi
     export MPICH_PATH=$MPI_ARCH_PATH
-    export MPICH_ROOT=$MPI_ARCH_PATH
     export GM_LIB_PATH=/opt/gm/lib64
 
     _foamAddPath $MPI_ARCH_PATH/bin
@@ -194,7 +206,6 @@ MPICH-GM)
 HPMPI)
     export MPI_HOME=/opt/hpmpi
     export MPI_ARCH_PATH=$MPI_HOME
-    export MPICH_ROOT=$MPI_ARCH_PATH
 
     _foamAddPath $MPI_ARCH_PATH/bin
 

src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C

@@ -85,7 +85,6 @@ inline void Foam::OPstream::writeToBuffer
 }
 
 
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 Foam::OPstream::OPstream

src/OpenFOAM/db/IOstreams/Pstreams/Pstream.C

@@ -217,7 +217,7 @@ bool Foam::Pstream::parRun_(false);
 Foam::List<int> Foam::Pstream::procIDs_(1, 0);
 
 // Standard transfer message type
-const int Foam::Pstream::msgType_(1);
+int Foam::Pstream::msgType_(1);
 
 // Linear communication schedule
 Foam::List<Foam::Pstream::commsStruct> Foam::Pstream::linearCommunication_(0);

src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H

@@ -163,7 +163,7 @@ private:
         static bool parRun_;
 
         static List<int> procIDs_;
-        static const int msgType_;
+        static int msgType_;
 
         static List<commsStruct> linearCommunication_;
         static List<commsStruct> treeCommunication_;
@@ -337,11 +337,12 @@ public:
         }
 
         //- Message tag of standard messages
-        static int msgType()
+        static int& msgType()
         {
             return msgType_;
         }
 
+
             //- Get the communications type of the stream
             commsTypes commsType() const
             {

src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H

@@ -38,6 +38,7 @@ SourceFiles
 
 #include "symmTransform.H"
 #include "symmTensorField.H"
+#include "sphericalTensor.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C

@@ -26,6 +26,7 @@ License
 
 #include "basicSymmetryPointPatchField.H"
 #include "transformField.H"
+#include "symmTransformField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -89,7 +90,12 @@ void basicSymmetryPointPatchField<Type>::evaluate(const Pstream::commsTypes)
     const vectorField& nHat = this->patch().pointNormals();
 
     tmp<Field<Type> > tvalues =
-        transform(I - nHat*nHat, this->patchInternalField());
+    (
+        (
+            this->patchInternalField()
+          + transform(I - 2.0*sqr(nHat), this->patchInternalField())
+        )/2.0
+    );
 
     // Get internal field to insert values into
     Field<Type>& iF = const_cast<Field<Type>&>(this->internalField());

src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C

@@ -1134,6 +1134,18 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
                         }
                     }
                 }
+
+
+                // If the faceZones are not synchronised the blockedFace
+                // might not be synchronised. If you are sure the faceZones
+                // are synchronised remove below check.
+                syncTools::syncFaceList
+                (
+                    mesh_,
+                    blockedFace,
+                    andEqOp<bool>(),    // combine operator
+                    false               // separation
+                );
             }
             reduce(nUnblocked, sumOp<label>());
 

src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C

@@ -95,11 +95,11 @@ basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// return gradient at boundary
 template<class Type>
 tmp<Field<Type> > basicSymmetryFvPatchField<Type>::snGrad() const
 {
     vectorField nHat = this->patch().nf();
+
     return
     (
         transform(I - 2.0*sqr(nHat), this->patchInternalField())
@@ -108,7 +108,6 @@ tmp<Field<Type> > basicSymmetryFvPatchField<Type>::snGrad() const
 }
 
 
-// Evaluate the field on the patch
 template<class Type>
 void basicSymmetryFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 {
@@ -118,6 +117,7 @@ void basicSymmetryFvPatchField<Type>::evaluate(const Pstream::commsTypes)
     }
 
     vectorField nHat = this->patch().nf();
+
     Field<Type>::operator=
     (
         (
@@ -130,11 +130,11 @@ void basicSymmetryFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 }
 
 
-// Return defining fields
 template<class Type>
 tmp<Field<Type> > basicSymmetryFvPatchField<Type>::snGradTransformDiag() const
 {
     vectorField nHat = this->patch().nf();
+
     vectorField diag(nHat.size());
 
     diag.replace(vector::X, mag(nHat.component(vector::X)));

src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C

@@ -99,7 +99,7 @@ void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict)
 {
     dict.lookup("Tcommon") >> Tcommon_;
     dict.lookup("Tlow") >> Tlow_;
-    dict.lookup("Tlow") >> Thigh_;
+    dict.lookup("Thigh") >> Thigh_;
     dict.lookup("invTemp") >> invTemp_;
 
     dict.lookup("loTcoeffs") >> lowACoeffs_;

src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C

@@ -26,7 +26,6 @@ License
 
 #include "fvDOM.H"
 #include "addToRunTimeSelectionTable.H"
-#include "fvm.H"
 
 #include "absorptionEmissionModel.H"
 #include "scatterModel.H"
@@ -65,7 +64,7 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
             mesh_.time().timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
         mesh_,
         dimensionedScalar("G", dimMass/pow3(dimTime), 0.0)
@@ -347,7 +346,7 @@ Foam::radiation::fvDOM::Ru() const
     const DimensionedField<scalar, volMesh> a =
         a_.dimensionedInternalField(); //absorptionEmission_->aCont()()
 
-    return  a*G - 4.0*E;
+    return  a*G - E;
 }
 
 

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

@@ -27,12 +27,9 @@ License
 #include "radiativeIntensityRay.H"
 #include "fvm.H"
 #include "fvDOM.H"
+#include "constants.H"
 
-#include "absorptionEmissionModel.H"
+using namespace Foam::constant;
-#include "scatterModel.H"
-#include "mathConstants.H"
-#include "radiationModel.H"
-#include "Vector2D.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -202,9 +199,9 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
             fvm::div(Ji, ILambda_[lambdaI], "div(Ji,Ii_h)")
           + fvm::Sp(k*omega_, ILambda_[lambdaI])
          ==
-            1.0/constant::math::pi
+            1.0/constant::math::pi*omega_
            *(
-                k*omega_*blackBody_.bLambda(lambdaI)
+                k*blackBody_.bLambda(lambdaI)
               + absorptionEmission_.ECont(lambdaI)
             )
         );

src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C

@@ -43,19 +43,19 @@ autoPtr<radiationModel> radiationModel::New
 {
     word radiationModelTypeName;
 
-    // Enclose the creation of the radiationPropertiesDict to ensure it is
+    // Note: no need to register/keep radiationProperties since models read
-    // deleted before the radiationModel is created otherwise the dictionary
+    // it themselves.
-    // is entered in the database twice
     {
         IOdictionary radiationPropertiesDict
         (
             IOobject
             (
                 "radiationProperties",
-                T.mesh().time().constant(),
+                T.time().constant(),
-                T.mesh().objectRegistry::db(),
+                T.mesh(),
                 IOobject::MUST_READ,
-                IOobject::NO_WRITE
+                IOobject::NO_WRITE,
+                false
             )
         );
 

src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C

@@ -259,10 +259,11 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
         )
     );
 
-    if (mesh_.foundObject<volScalarField>("hrr"))
+    if (mesh_.foundObject<volScalarField>("dQ"))
     {
-        const volScalarField& hrr = mesh_.lookupObject<volScalarField>("hrr");
+        const volScalarField& dQ =
-        E().internalField() = EhrrCoeff_*hrr.internalField();
+            mesh_.lookupObject<volScalarField>("dQ");
+        E().internalField() = EhrrCoeff_*dQ;
     }
 
     return E;

src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C

@@ -215,6 +215,8 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField
 tmp<scalarField>
 turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const
 {
+    const fvMesh& mesh = patch().boundaryMesh().mesh();
+
     if (KName_ == "none")
     {
         const compressible::RASModel& model =
@@ -227,12 +229,33 @@ turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const
 
         return
             talpha().boundaryField()[patch().index()]
-           *thermo.rho()().boundaryField()[patch().index()]
            *thermo.Cp()().boundaryField()[patch().index()];
     }
+    else if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
+    {
+        return patch().lookupPatchField<volScalarField, scalar>(KName_);
+    }
+    else if (mesh.objectRegistry::foundObject<volSymmTensorField>(KName_))
+    {
+        const symmTensorField& KWall =
+            patch().lookupPatchField<volSymmTensorField, scalar>(KName_);
+
+        vectorField n = patch().nf();
+
+        return n & KWall & n;
+    }
     else
     {
-        return patch().lookupPatchField<volScalarField, scalar>(KName_);
+        FatalErrorIn
+        (
+            "turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const"
+        )   << "Did not find field " << KName_
+            << " on mesh " << mesh.name() << " patch " << patch().name()
+            << endl
+            << "Please set 'K' to 'none', a valid volScalarField"
+            << " or a valid volSymmTensorField." << exit(FatalError);
+
+        return scalarField(0);
     }
 }
 

src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkRoughWallFunction/mutkRoughWallFunctionFvPatchScalarField.C

@@ -77,7 +77,7 @@ tmp<scalarField> mutkRoughWallFunctionFvPatchScalarField::calcMut() const
 
     const scalar Cmu25 = pow025(Cmu_);
 
-    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
+    tmp<scalarField> tmutw(new scalarField(*this));
     scalarField& mutw = tmutw();
 
     forAll(mutw, faceI)

src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C

@@ -76,7 +76,7 @@ tmp<scalarField> nutkRoughWallFunctionFvPatchScalarField::calcNut() const
 
     const scalar Cmu25 = pow025(Cmu_);
 
-    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
+    tmp<scalarField> tnutw(new scalarField(*this));
     scalarField& nutw = tnutw();
 
     forAll(nutw, faceI)

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/changeDictionaryDict

@@ -86,7 +86,7 @@ dictionaryReplacement
             }
             bottomAir_to_leftSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
@@ -94,14 +94,14 @@ dictionaryReplacement
             }
             bottomAir_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             bottomAir_to_rightSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict

@@ -71,7 +71,7 @@ dictionaryReplacement
 
             heater_to_bottomAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
@@ -79,21 +79,21 @@ dictionaryReplacement
             }
             heater_to_leftSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             heater_to_rightSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             heater_to_topAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict

@@ -61,7 +61,7 @@ dictionaryReplacement
             }
             leftSolid_to_bottomAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
@@ -69,14 +69,14 @@ dictionaryReplacement
             }
             leftSolid_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             leftSolid_to_topAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict

@@ -61,21 +61,21 @@ dictionaryReplacement
             }
             rightSolid_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             rightSolid_to_bottomAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             rightSolid_to_topAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict

@@ -87,7 +87,7 @@ dictionaryReplacement
             }
             topAir_to_leftSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
@@ -95,14 +95,14 @@ dictionaryReplacement
             }
             topAir_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             topAir_to_rightSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict

@@ -120,21 +120,21 @@ dictionaryReplacement
             }
             bottomAir_to_leftSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             bottomAir_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             bottomAir_to_rightSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict

@@ -71,7 +71,7 @@ dictionaryReplacement
 
             heater_to_bottomAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
@@ -79,21 +79,21 @@ dictionaryReplacement
             }
             heater_to_leftSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             heater_to_rightSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             heater_to_topAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict

@@ -61,7 +61,7 @@ dictionaryReplacement
             }
             leftSolid_to_bottomAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
@@ -69,14 +69,14 @@ dictionaryReplacement
             }
             leftSolid_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             leftSolid_to_topAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict

@@ -61,21 +61,21 @@ dictionaryReplacement
             }
             rightSolid_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             rightSolid_to_bottomAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             rightSolid_to_topAir
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict

@@ -126,7 +126,7 @@ dictionaryReplacement
             }
             topAir_to_leftSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
@@ -134,14 +134,14 @@ dictionaryReplacement
             }
             topAir_to_heater
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;
             }
             topAir_to_rightSolid
             {
-                type            turbulentTemperatureCoupledBaffle;
+                type            compressible::turbulentTemperatureCoupledBaffle;
                 neighbourFieldName T;
                 K               K;
                 value           uniform 300;

wmake/rules/linux64Gcc/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc42/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc43/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Gcc44/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linux64Icc/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linuxGcc/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linuxGcc42/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linuxGcc43/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linuxGcc44/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     =
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linuxIA64Gcc/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linuxIA64Icc/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt

wmake/rules/linuxIcc/mplibMPICH

@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt