Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

src/finiteVolume/Make/files

@@ -183,6 +183,7 @@ $(derivedFvPatchFields)/turbulentIntensityKineticEnergyInlet/turbulentIntensityK
 $(derivedFvPatchFields)/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
 $(derivedFvPatchFields)/uniformFixedGradient/uniformFixedGradientFvPatchFields.C
 $(derivedFvPatchFields)/uniformFixedValue/uniformFixedValueFvPatchFields.C
+$(derivedFvPatchFields)/uniformInletOutlet/uniformInletOutletFvPatchFields.C
 $(derivedFvPatchFields)/uniformJump/uniformJumpFvPatchFields.C
 $(derivedFvPatchFields)/uniformJumpAMI/uniformJumpAMIFvPatchFields.C
 $(derivedFvPatchFields)/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C

src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C

@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "uniformInletOutletFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    mixedFvPatchField<Type>(p, iF),
+    phiName_("phi")
+{
+    this->refValue() = pTraits<Type>::zero;
+    this->refGrad() = pTraits<Type>::zero;
+    this->valueFraction() = 0.0;
+}
+
+
+template<class Type>
+Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
+(
+    const uniformInletOutletFvPatchField<Type>& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchField<Type>(p, iF),
+    phiName_(ptf.phiName_),
+    uniformInletValue_(ptf.uniformInletValue_, false)
+{
+    this->patchType() = ptf.patchType();
+
+    // For safety re-evaluate
+    const scalar t = this->db().time().timeOutputValue();
+    this->refValue() = uniformInletValue_->value(t);
+    this->refGrad() = pTraits<Type>::zero;
+    this->valueFraction() = 0.0;
+
+    // Map value (unmapped get refValue)
+    if (&iF && iF.size())
+    {
+        fvPatchField<Type>::operator=(this->refValue());
+    }
+    this->map(ptf, mapper);
+
+}
+
+
+template<class Type>
+Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchField<Type>(p, iF),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    uniformInletValue_(DataEntry<Type>::New("uniformInletValue", dict))
+{
+    const scalar t = this->db().time().timeOutputValue();
+    this->refValue() = uniformInletValue_->value(t);
+
+    if (dict.found("value"))
+    {
+        fvPatchField<Type>::operator=
+        (
+            Field<Type>("value", dict, p.size())
+        );
+    }
+    else
+    {
+        fvPatchField<Type>::operator=(this->refValue());
+    }
+
+    this->refGrad() = pTraits<Type>::zero;
+    this->valueFraction() = 0.0;
+}
+
+
+template<class Type>
+Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
+(
+    const uniformInletOutletFvPatchField<Type>& ptf
+)
+:
+    mixedFvPatchField<Type>(ptf),
+    phiName_(ptf.phiName_),
+    uniformInletValue_(ptf.uniformInletValue_, false)
+{}
+
+
+template<class Type>
+Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
+(
+    const uniformInletOutletFvPatchField<Type>& ptf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    mixedFvPatchField<Type>(ptf, iF),
+    phiName_(ptf.phiName_),
+    uniformInletValue_(ptf.uniformInletValue_, false)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::uniformInletOutletFvPatchField<Type>::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const Field<scalar>& phip =
+        this->patch().template lookupPatchField<surfaceScalarField, scalar>
+        (
+            phiName_
+        );
+
+    this->valueFraction() = 1.0 - pos(phip);
+
+    mixedFvPatchField<Type>::updateCoeffs();
+}
+
+
+template<class Type>
+void Foam::uniformInletOutletFvPatchField<Type>::write(Ostream& os) const
+{
+    fvPatchField<Type>::write(os);
+    if (phiName_ != "phi")
+    {
+        os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+    }
+    this->uniformInletValue_->writeData(os);
+    this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::uniformInletOutletFvPatchField<Type>::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    mixedFvPatchField<Type>::autoMap(m);
+
+    // Override
+    const scalar t = this->db().time().timeOutputValue();
+    this->refValue() = uniformInletValue_->value(t);
+}
+
+
+template<class Type>
+void Foam::uniformInletOutletFvPatchField<Type>::rmap
+(
+    const fvPatchField<Type>& ptf,
+    const labelList& addr
+)
+{
+    mixedFvPatchField<Type>::rmap(ptf, addr);
+
+    // Override
+    const scalar t = this->db().time().timeOutputValue();
+    this->refValue() = uniformInletValue_->value(t);
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::uniformInletOutletFvPatchField<Type>::operator=
+(
+    const fvPatchField<Type>& ptf
+)
+{
+    fvPatchField<Type>::operator=
+    (
+        this->valueFraction()*this->refValue()
+        + (1 - this->valueFraction())*ptf
+    );
+}
+
+
+// ************************************************************************* //

src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.H

@@ -0,0 +1,214 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::uniformInletOutletFvPatchField
+
+Group
+    grpOutletBoundaryConditions
+
+Description
+    Variant of inletOutlet boundary condition with uniform inletValue.
+
+    \heading Patch usage
+
+    \table
+        Property     | Description             | Required    | Default value
+        phi          | flux field name         | no          | phi
+        uniformInletValue   | inlet value for reverse flow | yes    |
+    \endtable
+
+    Example of the boundary condition specification:
+    \verbatim
+    myPatch
+    {
+        type                uniformInletOutlet;
+        phi                 phi;
+        uniformInletValue   0;
+        value               uniform 0;
+    }
+    \endverbatim
+
+    The mode of operation is determined by the sign of the flux across the
+    patch faces.
+
+Note
+    Sign conventions:
+    - positive flux (out of domain): apply zero-gradient condition
+    - negative flux (into of domain): apply the user-specified fixed value
+
+SeeAlso
+    Foam::inletOutletFvPatchField
+
+SourceFiles
+    uniformInletOutletFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef uniformInletOutletFvPatchField_H
+#define uniformInletOutletFvPatchField_H
+
+#include "mixedFvPatchField.H"
+#include "DataEntry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class uniformInletOutletFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class uniformInletOutletFvPatchField
+:
+    public mixedFvPatchField<Type>
+{
+
+protected:
+
+    // Protected data
+
+        //- Name of flux field
+        word phiName_;
+
+        //- Value
+        autoPtr<DataEntry<Type> > uniformInletValue_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("uniformInletOutlet");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        uniformInletOutletFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        uniformInletOutletFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given uniformInletOutletFvPatchField
+        //  onto a new patch
+        uniformInletOutletFvPatchField
+        (
+            const uniformInletOutletFvPatchField<Type>&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        uniformInletOutletFvPatchField
+        (
+            const uniformInletOutletFvPatchField<Type>&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type> > clone() const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new uniformInletOutletFvPatchField<Type>(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        uniformInletOutletFvPatchField
+        (
+            const uniformInletOutletFvPatchField<Type>&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type> > clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new uniformInletOutletFvPatchField<Type>(*this, iF)
+            );
+        }
+
+
+    // Mapping functions
+
+        //- Map (and resize as needed) from self given a mapping object
+        virtual void autoMap
+        (
+            const fvPatchFieldMapper&
+        );
+
+        //- Reverse map the given fvPatchField onto this fvPatchField
+        virtual void rmap
+        (
+            const fvPatchField<Type>&,
+            const labelList&
+        );
+
+
+    // Member functions
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+
+
+    // Member operators
+
+        virtual void operator=(const fvPatchField<Type>& pvf);
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "uniformInletOutletFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchFields.C

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "uniformInletOutletFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(uniformInletOutlet);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //

src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchFields.H

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef uniformInletOutletFvPatchFields_H
+#define uniformInletOutletFvPatchFields_H
+
+#include "uniformInletOutletFvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(uniformInletOutlet);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchFieldsFwd.H

@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef uniformInletOutletFvPatchFieldsFwd_H
+#define uniformInletOutletFvPatchFieldsFwd_H
+
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class uniformInletOutletFvPatchField;
+
+makePatchTypeFieldTypedefs(uniformInletOutlet);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Aw

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 0;
+        uniformInletValue   0;
-        value           uniform 0;
+        value               uniform 0;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/B

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform ( 0 0 0 0 0 0 );
+        uniformInletValue   ( 0 0 0 0 0 0 );
-        value           uniform ( 0 0 0 0 0 0 );
+        value               uniform ( 0 0 0 0 0 0 );
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CR

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform ( 0 0 0 0 0 0 );
+        uniformInletValue   ( 0 0 0 0 0 0 );
-        value           uniform ( 0 0 0 0 0 0 );
+        value               uniform ( 0 0 0 0 0 0 );
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/CT

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform ( 0 0 0 0 0 0 );
+        uniformInletValue   ( 0 0 0 0 0 0 );
-        value           uniform ( 0 0 0 0 0 0 );
+        value               uniform ( 0 0 0 0 0 0 );
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Lobs

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 0;
+        uniformInletValue   0;
-        value           uniform 0;
+        value               uniform 0;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Nv

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 0;
+        uniformInletValue   0;
-        value           uniform 0;
+        value               uniform 0;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Su

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 0.5;
+        uniformInletValue   0.5;
-        value           uniform 0.5;
+        value               uniform 0.5;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/T

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 300;
+        uniformInletValue   300;
-        value           uniform 300;
+        value               uniform 300;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Tu

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 300;
+        uniformInletValue   300;
-        value           uniform 300;
+        value               uniform 300;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/U

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform ( 0 0 0 );
+        uniformInletValue   ( 0 0 0 );
-        value           uniform ( 0 0 0 );
+        value               uniform ( 0 0 0 );
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/Xi

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 1;
+        uniformInletValue   1;
-        value           uniform 1;
+        value               uniform 1;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/b

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 1;
+        uniformInletValue   1;
-        value           uniform 1;
+        value               uniform 1;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/betav

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 1;
+        uniformInletValue   1;
-        value           uniform 1;
+        value               uniform 1;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 0.1;
+        uniformInletValue   0.1;
-        value           uniform 0.1;
+        value               uniform 0.1;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/epsilon.old

@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      epsilon;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 2 -3 0 0 0 0 ];
-
-internalField   uniform 0.1;
-
-boundaryField
-{
-    outer
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.1;
-        value           uniform 0.1;
-    }
-    ground
-    {
-        type            compressible::epsilonWallFunction;
-        value           uniform 0.1;
-    }
-    blockedFaces
-    {
-        type            compressible::epsilonWallFunction;
-        value           uniform 0.1;
-    }
-    baffleWall
-    {
-        type            compressible::epsilonWallFunction;
-        value           uniform 1e-05;
-    }
-    baffleCyclic_half0
-    {
-        type            cyclic;
-    }
-    baffleCyclic_half1
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/ft

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 0.0623;
+        uniformInletValue   0.0623;
-        value           uniform 0.0623;
+        value               uniform 0.0623;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 1.5;
+        uniformInletValue   1.5;
-        value           uniform 1.5;
+        value               uniform 1.5;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/k.old

@@ -23,9 +23,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform 1.5;
+        uniformInletValue   1.5;
-        value           uniform 1.5;
+        value               uniform 1.5;
     }
     ground
     {

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.org/nsv

@@ -8052,9 +8052,9 @@ boundaryField
 {
     outer
     {
-        type            inletOutlet;
+        type                uniformInletOutlet;
-        inletValue      uniform ( 0 0 0 0 0 0 );
+        uniformInletValue   ( 0 0 0 0 0 0 );
-        value           uniform ( 0 0 0 0 0 0 );
+        value               uniform ( 0 0 0 0 0 0 );
     }
     ground
     {

wmake/src/wmkdep.l

@@ -3,7 +3,7 @@
  =========                   |
  \\      /   F ield          | OpenFOAM: The Open Source CFD Toolbox
   \\    /    O peration      |
-   \\  /     A nd            | Copyright (C) 2011 OpenFOAM Foundation
+   \\  /     A nd            | Copyright (C) 2011-2013 OpenFOAM Foundation
     \\/      M anipulation   |
 ------------------------------------------------------------------------------
 License
@@ -333,12 +333,24 @@ void nextFile(const char* fileName)
             free(pathName);
         }
 
-        fprintf
+        if (nDirectories == 0)
-        (
+        {
-            stderr,
+            fprintf
-            "could not open file %s for source file %s\n",
+            (
-            fileName, sourceFile
+                stderr,
-        );
+                "could not open file %s for source file %s\n",
+                fileName, sourceFile
+            );
+        }
+        else
+        {
+            fprintf
+            (
+                stderr,
+                "could not open file %s for source file %s due to %s\n",
+                fileName, sourceFile, strerror(errno)
+            );
+        }
 
         fflush(stdout);
         fflush(stderr);