Merge commit 'OpenCFD/master' into olesenm

src/OpenFOAM/meshes/boundBox/boundBox.C

@@ -42,15 +42,6 @@ Foam::boundBox::boundBox(const pointField& points, const bool doReduce)
             min_ = point(VGREAT, VGREAT, VGREAT);
             max_ = point(-VGREAT, -VGREAT, -VGREAT);
         }
-        else
-        {
-            WarningIn("boundBox::boundBox(const pointField& points)")
-                << "Cannot find bounding box for zero sized pointField, "
-                   "returning zero"
-                << endl;
-
-            return;
-        }
     }
     else
     {

src/transportModels/interfaceProperties/Make/files

@@ -1,11 +1,11 @@
 interfaceProperties.C
 interfaceCompression/interfaceCompression.C
 
-gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.C
-gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.C
-gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C
-gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.C
+alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
 
-gammaFixedPressure/gammaFixedPressureFvPatchScalarField.C
+alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libinterfaceProperties

src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C

@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
@@ -33,14 +33,13 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(gammaContactAngleFvPatchScalarField, 0);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -50,9 +49,9 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 {}
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const gammaContactAngleFvPatchScalarField& gcpsf,
+    const alphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -62,7 +61,7 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 {}
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -75,18 +74,18 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 }
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const gammaContactAngleFvPatchScalarField& gcpsf
+    const alphaContactAngleFvPatchScalarField& gcpsf
 )
 :
     zeroGradientFvPatchScalarField(gcpsf)
 {}
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const gammaContactAngleFvPatchScalarField& gcpsf,
+    const alphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -94,8 +93,4 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //

src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H

@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::gammaContactAngleFvPatchScalarField
+    Foam::alphaContactAngleFvPatchScalarField
 
 Description
-    Abstract base class for gammaContactAngle boundary conditions.
+    Abstract base class for alphaContactAngle boundary conditions.
 
     Derived classes must implement the theta() fuction which returns the
     wall contact angle field.
 
 SourceFiles
-    gammaContactAngleFvPatchScalarField.C
+    alphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef gammaContactAngleFvPatchScalarField_H
-#define gammaContactAngleFvPatchScalarField_H
+#ifndef alphaContactAngleFvPatchScalarField_H
+#define alphaContactAngleFvPatchScalarField_H
 
 #include "zeroGradientFvPatchFields.H"
 #include "fvsPatchFields.H"
@@ -48,10 +48,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class gammaContactAngleFvPatch Declaration
+                   Class alphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class gammaContactAngleFvPatchScalarField
+class alphaContactAngleFvPatchScalarField
 :
     public zeroGradientFvPatchScalarField
 {
@@ -59,46 +59,46 @@ class gammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("gammaContactAngle");
+    TypeName("alphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given gammaContactAngleFvPatchScalarField
+        //- Construct by mapping given alphaContactAngleFvPatchScalarField
         //  onto a new patch
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
-            const gammaContactAngleFvPatchScalarField&,
+            const alphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
-            const gammaContactAngleFvPatchScalarField&
+            const alphaContactAngleFvPatchScalarField&
         );
 
         //- Construct as copy setting internal field reference
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
-            const gammaContactAngleFvPatchScalarField&,
+            const alphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 

src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C

@@ -24,85 +24,81 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "constantGammaContactAngleFvPatchScalarField.H"
+#include "constantAlphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volMesh.H"
 #include "fvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(0.0)
 {}
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
-    const constantGammaContactAngleFvPatchScalarField& gcpsf,
+    const constantAlphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
     theta0_(gcpsf.theta0_)
 {}
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(readScalar(dict.lookup("theta0")))
 {
     evaluate();
 }
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
-    const constantGammaContactAngleFvPatchScalarField& gcpsf
+    const constantAlphaContactAngleFvPatchScalarField& gcpsf
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleFvPatchScalarField(gcpsf),
     theta0_(gcpsf.theta0_)
 {}
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
-    const constantGammaContactAngleFvPatchScalarField& gcpsf,
+    const constantAlphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleFvPatchScalarField(gcpsf, iF),
     theta0_(gcpsf.theta0_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField> constantGammaContactAngleFvPatchScalarField::theta
+Foam::tmp<Foam::scalarField>
+Foam::constantAlphaContactAngleFvPatchScalarField::theta
 (
     const fvPatchVectorField&,
     const fvsPatchVectorField&
@@ -112,7 +108,10 @@ tmp<scalarField> constantGammaContactAngleFvPatchScalarField::theta
 }
 
 
-void constantGammaContactAngleFvPatchScalarField::write(Ostream& os) const
+void Foam::constantAlphaContactAngleFvPatchScalarField::write
+(
+    Ostream& os
+) const
 {
     fvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
@@ -122,14 +121,13 @@ void constantGammaContactAngleFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField
-(
-    fvPatchScalarField,
-    constantGammaContactAngleFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        constantAlphaContactAngleFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //

src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H

@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::constantGammaContactAngleFvPatchScalarField
+    Foam::constantAlphaContactAngleFvPatchScalarField
 
 Description
-    A constant gammaContactAngle scalar boundary condition 
-    (gammaContactAngleFvPatchScalarField)
+    A constant alphaContactAngle scalar boundary condition
+    (alphaContactAngleFvPatchScalarField)
 
 SourceFiles
-    constantGammaContactAngleFvPatchScalarField.C
+    constantAlphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef constantGammaContactAngleFvPatchScalarField_H
-#define constantGammaContactAngleFvPatchScalarField_H
+#ifndef constantAlphaContactAngleFvPatchScalarField_H
+#define constantAlphaContactAngleFvPatchScalarField_H
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,12 +45,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class constantGammaContactAngleFvPatch Declaration
+                           Class constantAlphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class constantGammaContactAngleFvPatchScalarField
+class constantAlphaContactAngleFvPatchScalarField
 :
-    public gammaContactAngleFvPatchScalarField
+    public alphaContactAngleFvPatchScalarField
 {
     // Private data
 
@@ -61,20 +61,20 @@ class constantGammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("constantGammaContactAngle");
+    TypeName("constantAlphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -82,20 +82,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  constantGammaContactAngleFvPatchScalarField
+        //  constantAlphaContactAngleFvPatchScalarField
         //  onto a new patch
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
-            const constantGammaContactAngleFvPatchScalarField&,
+            const constantAlphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
-            const constantGammaContactAngleFvPatchScalarField&
+            const constantAlphaContactAngleFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -103,14 +103,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new constantGammaContactAngleFvPatchScalarField(*this)
+                new constantAlphaContactAngleFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
-            const constantGammaContactAngleFvPatchScalarField&,
+            const constantAlphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -122,7 +122,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new constantGammaContactAngleFvPatchScalarField(*this, iF)
+                new constantAlphaContactAngleFvPatchScalarField(*this, iF)
             );
         }
 

src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C

@@ -24,21 +24,21 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "dynamicGammaContactAngleFvPatchScalarField.H"
+#include "dynamicAlphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(0.0),
     uTheta_(0.0),
     thetaA_(0.0),
@@ -46,16 +46,16 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
-    const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
+    const dynamicAlphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
     theta0_(gcpsf.theta0_),
     uTheta_(gcpsf.uTheta_),
     thetaA_(gcpsf.thetaA_),
@@ -63,15 +63,15 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(readScalar(dict.lookup("theta0"))),
     uTheta_(readScalar(dict.lookup("uTheta"))),
     thetaA_(readScalar(dict.lookup("thetaA"))),
@@ -81,13 +81,13 @@ dynamicGammaContactAngleFvPatchScalarField
 }
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
-    const dynamicGammaContactAngleFvPatchScalarField& gcpsf
+    const dynamicAlphaContactAngleFvPatchScalarField& gcpsf
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleFvPatchScalarField(gcpsf),
     theta0_(gcpsf.theta0_),
     uTheta_(gcpsf.uTheta_),
     thetaA_(gcpsf.thetaA_),
@@ -95,14 +95,14 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
-    const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
+    const dynamicAlphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleFvPatchScalarField(gcpsf, iF),
     theta0_(gcpsf.theta0_),
     uTheta_(gcpsf.uTheta_),
     thetaA_(gcpsf.thetaA_),
@@ -113,7 +113,7 @@ dynamicGammaContactAngleFvPatchScalarField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::scalarField>
-Foam::dynamicGammaContactAngleFvPatchScalarField::theta
+Foam::dynamicAlphaContactAngleFvPatchScalarField::theta
 (
     const fvPatchVectorField& Up,
     const fvsPatchVectorField& nHat
@@ -144,7 +144,7 @@ Foam::dynamicGammaContactAngleFvPatchScalarField::theta
 }
 
 
-void Foam::dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const
+void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
@@ -162,7 +162,7 @@ namespace Foam
     makePatchTypeField
     (
         fvPatchScalarField,
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
     );
 }
 

src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H

@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::dynamicGammaContactAngleFvPatchScalarField
+    Foam::dynamicAlphaContactAngleFvPatchScalarField
 
 Description
-    A dynamic gammaContactAngle scalar boundary condition 
-    (gammaContactAngleFvPatchScalarField)
+    A dynamic alphaContactAngle scalar boundary condition
+    (alphaContactAngleFvPatchScalarField)
 
 SourceFiles
-    dynamicGammaContactAngleFvPatchScalarField.C
+    dynamicAlphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dynamicGammaContactAngleFvPatchScalarField_H
-#define dynamicGammaContactAngleFvPatchScalarField_H
+#ifndef dynamicAlphaContactAngleFvPatchScalarField_H
+#define dynamicAlphaContactAngleFvPatchScalarField_H
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,12 +45,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class dynamicGammaContactAngleFvPatch Declaration
+                           Class dynamicAlphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class dynamicGammaContactAngleFvPatchScalarField
+class dynamicAlphaContactAngleFvPatchScalarField
 :
-    public gammaContactAngleFvPatchScalarField
+    public alphaContactAngleFvPatchScalarField
 {
     // Private data
 
@@ -70,20 +70,20 @@ class dynamicGammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("dynamicGammaContactAngle");
+    TypeName("dynamicAlphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -91,20 +91,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  dynamicGammaContactAngleFvPatchScalarField
+        //  dynamicAlphaContactAngleFvPatchScalarField
         //  onto a new patch
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
-            const dynamicGammaContactAngleFvPatchScalarField&,
+            const dynamicAlphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
-            const dynamicGammaContactAngleFvPatchScalarField&
+            const dynamicAlphaContactAngleFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -112,14 +112,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new dynamicGammaContactAngleFvPatchScalarField(*this)
+                new dynamicAlphaContactAngleFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
-            const dynamicGammaContactAngleFvPatchScalarField&,
+            const dynamicAlphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -131,7 +131,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new dynamicGammaContactAngleFvPatchScalarField(*this, iF)
+                new dynamicAlphaContactAngleFvPatchScalarField(*this, iF)
             );
         }
 

src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C

@@ -24,27 +24,22 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "timeVaryingGammaContactAngleFvPatchScalarField.H"
+#include "timeVaryingAlphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
 #include "Time.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     t0_(0.0),
     thetaT0_(0.0),
     te_(0.0),
@@ -52,16 +47,16 @@ timeVaryingGammaContactAngleFvPatchScalarField
 {}
 
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
-    const timeVaryingGammaContactAngleFvPatchScalarField& gcpsf,
+    const timeVaryingAlphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
     t0_(gcpsf.t0_),
     thetaT0_(gcpsf.thetaT0_),
     te_(gcpsf.te_),
@@ -69,15 +64,15 @@ timeVaryingGammaContactAngleFvPatchScalarField
 {}
 
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     t0_(readScalar(dict.lookup("t0"))),
     thetaT0_(readScalar(dict.lookup("thetaT0"))),
     te_(readScalar(dict.lookup("te"))),
@@ -87,14 +82,14 @@ timeVaryingGammaContactAngleFvPatchScalarField
 }
 
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
-    const timeVaryingGammaContactAngleFvPatchScalarField& gcpsf,
+    const timeVaryingAlphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleFvPatchScalarField(gcpsf, iF),
     t0_(gcpsf.t0_),
     thetaT0_(gcpsf.thetaT0_),
     te_(gcpsf.te_),
@@ -104,7 +99,8 @@ timeVaryingGammaContactAngleFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField> timeVaryingGammaContactAngleFvPatchScalarField::theta
+Foam::tmp<Foam::scalarField>
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::theta
 (
     const fvPatchVectorField&,
     const fvsPatchVectorField&
@@ -130,7 +126,10 @@ tmp<scalarField> timeVaryingGammaContactAngleFvPatchScalarField::theta
 }
 
 
-void timeVaryingGammaContactAngleFvPatchScalarField::write(Ostream& os) const
+void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write
+(
+    Ostream& os
+) const
 {
     fvPatchScalarField::write(os);
     os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
@@ -143,10 +142,13 @@ void timeVaryingGammaContactAngleFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, timeVaryingGammaContactAngleFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        timeVaryingAlphaContactAngleFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //

src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H

@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::timeVaryingGammaContactAngleFvPatchScalarField
+    Foam::timeVaryingAlphaContactAngleFvPatchScalarField
 
 Description
-    A time-varying gammaContactAngle scalar boundary condition
-    (gammaContactAngleFvPatchScalarField)
+    A time-varying alphaContactAngle scalar boundary condition
+    (alphaContactAngleFvPatchScalarField)
 
 SourceFiles
-    timeVaryingGammaContactAngleFvPatchScalarField.C
+    timeVaryingAlphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef timeVaryingGammaContactAngleFvPatchScalarField_H
-#define timeVaryingGammaContactAngleFvPatchScalarField_H
+#ifndef timeVaryingAlphaContactAngleFvPatchScalarField_H
+#define timeVaryingAlphaContactAngleFvPatchScalarField_H
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,12 +45,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class timeVaryingGammaContactAngleFvPatch Declaration
+            Class timeVaryingAlphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class timeVaryingGammaContactAngleFvPatchScalarField
+class timeVaryingAlphaContactAngleFvPatchScalarField
 :
-    public gammaContactAngleFvPatchScalarField
+    public alphaContactAngleFvPatchScalarField
 {
     // Private data
 
@@ -64,31 +64,31 @@ class timeVaryingGammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("timeVaryingGammaContactAngle");
+    TypeName("timeVaryingAlphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given timeVaryingGammaContactAngleFvPatchScalarField
+        //- Construct by mapping given timeVaryingAlphaContactAngleFvPatchScalarField
         //  onto a new patch
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
-            const timeVaryingGammaContactAngleFvPatchScalarField&,
+            const timeVaryingAlphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
@@ -99,14 +99,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new timeVaryingGammaContactAngleFvPatchScalarField(*this)
+                new timeVaryingAlphaContactAngleFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
-            const timeVaryingGammaContactAngleFvPatchScalarField&,
+            const timeVaryingAlphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -118,7 +118,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new timeVaryingGammaContactAngleFvPatchScalarField(*this, iF)
+                new timeVaryingAlphaContactAngleFvPatchScalarField(*this, iF)
             );
         }
 

src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C

@@ -24,20 +24,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "gammaFixedPressureFvPatchScalarField.H"
+#include "alphaFixedPressureFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -48,9 +44,10 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 {}
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
-    const gammaFixedPressureFvPatchScalarField& ptf,
+    const alphaFixedPressureFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -61,7 +58,8 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 {}
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -85,9 +83,10 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 }
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
-    const gammaFixedPressureFvPatchScalarField& tppsf
+    const alphaFixedPressureFvPatchScalarField& tppsf
 )
 :
     fixedValueFvPatchScalarField(tppsf),
@@ -95,9 +94,10 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 {}
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
-    const gammaFixedPressureFvPatchScalarField& tppsf,
+    const alphaFixedPressureFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -108,7 +108,7 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void gammaFixedPressureFvPatchScalarField::autoMap
+void Foam::alphaFixedPressureFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -118,7 +118,7 @@ void gammaFixedPressureFvPatchScalarField::autoMap
 }
 
 
-void gammaFixedPressureFvPatchScalarField::rmap
+void Foam::alphaFixedPressureFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
@@ -126,14 +126,14 @@ void gammaFixedPressureFvPatchScalarField::rmap
 {
     fixedValueFvPatchScalarField::rmap(ptf, addr);
 
-    const gammaFixedPressureFvPatchScalarField& tiptf =
-        refCast<const gammaFixedPressureFvPatchScalarField>(ptf);
+    const alphaFixedPressureFvPatchScalarField& tiptf =
+        refCast<const alphaFixedPressureFvPatchScalarField>(ptf);
 
     p_.rmap(tiptf.p_, addr);
 }
 
 
-void gammaFixedPressureFvPatchScalarField::updateCoeffs()
+void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -154,7 +154,10 @@ void gammaFixedPressureFvPatchScalarField::updateCoeffs()
 }
 
 
-void gammaFixedPressureFvPatchScalarField::write(Ostream& os) const
+void Foam::alphaFixedPressureFvPatchScalarField::write
+(
+    Ostream& os
+) const
 {
     fvPatchScalarField::write(os);
     p_.writeEntry("p", os);
@@ -164,10 +167,13 @@ void gammaFixedPressureFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, gammaFixedPressureFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        alphaFixedPressureFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //

src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H

@@ -23,18 +23,18 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::gammaFixedPressureFvPatchScalarField
+    Foam::alphaFixedPressureFvPatchScalarField
 
 Description
-    A fixed-pressure gammaContactAngle boundary
+    A fixed-pressure alphaContactAngle boundary
 
 SourceFiles
-    gammaFixedPressureFvPatchScalarField.C
+    alphaFixedPressureFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef gammaFixedPressureFvPatchScalarField_H
-#define gammaFixedPressureFvPatchScalarField_H
+#ifndef alphaFixedPressureFvPatchScalarField_H
+#define alphaFixedPressureFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -44,10 +44,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                 Class gammaFixedPressureFvPatch Declaration
+                 Class alphaFixedPressureFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class gammaFixedPressureFvPatchScalarField
+class alphaFixedPressureFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -60,40 +60,40 @@ class gammaFixedPressureFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("gammaFixedPressure");
+    TypeName("alphaFixedPressure");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given gammaFixedPressureFvPatchScalarField
+        //- Construct by mapping given alphaFixedPressureFvPatchScalarField
         //  onto a new patch
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
-            const gammaFixedPressureFvPatchScalarField&,
+            const alphaFixedPressureFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
-            const gammaFixedPressureFvPatchScalarField&
+            const alphaFixedPressureFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -101,14 +101,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new gammaFixedPressureFvPatchScalarField(*this)
+                new alphaFixedPressureFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
-            const gammaFixedPressureFvPatchScalarField&,
+            const alphaFixedPressureFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -120,7 +120,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new gammaFixedPressureFvPatchScalarField(*this, iF)
+                new alphaFixedPressureFvPatchScalarField(*this, iF)
             );
         }
 
@@ -129,13 +129,13 @@ public:
 
         // Access
 
-            //- Return the gammaFixed pressure
+            //- Return the alphaFixed pressure
             const scalarField& p() const
             {
                 return p_;
             }
 
-            //- Return reference to the gammaFixed pressure to allow adjustment
+            //- Return reference to the alphaFixed pressure to allow adjustment
             scalarField& p()
             {
                 return p_;

src/transportModels/interfaceProperties/interfaceProperties.C

@@ -22,33 +22,20 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    interfaceProperties
-
-Description
-    Properties to aid interFoam :
-    1. Correct the gamma boundary condition for dynamic contact angle.
-    2. Calculate interface curvature.
-
 \*---------------------------------------------------------------------------*/
 
 #include "interfaceProperties.H"
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
 #include "fvcGrad.H"
 #include "fvcSnGrad.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
 
-const scalar interfaceProperties::convertToRad =
-    mathematicalConstant::pi/180.0;
+const Foam::scalar Foam::interfaceProperties::convertToRad =
+    Foam::mathematicalConstant::pi/180.0;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -59,26 +46,26 @@ const scalar interfaceProperties::convertToRad =
 // The dynamic contact angle is calculated from the component of the
 // velocity on the direction of the interface, parallel to the wall.
 
-void interfaceProperties::correctContactAngle
+void Foam::interfaceProperties::correctContactAngle
 (
     surfaceVectorField::GeometricBoundaryField& nHatb
 ) const
 {
-    const fvMesh& mesh = gamma_.mesh();
-    const volScalarField::GeometricBoundaryField& gbf = gamma_.boundaryField();
+    const fvMesh& mesh = alpha1_.mesh();
+    const volScalarField::GeometricBoundaryField& gbf = alpha1_.boundaryField();
 
     const fvBoundaryMesh& boundary = mesh.boundary();
 
     forAll(boundary, patchi)
     {
-        if (isA<gammaContactAngleFvPatchScalarField>(gbf[patchi]))
+        if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi]))
         {
-            const gammaContactAngleFvPatchScalarField& gcap = 
-                refCast<const gammaContactAngleFvPatchScalarField>
+            const alphaContactAngleFvPatchScalarField& gcap =
+                refCast<const alphaContactAngleFvPatchScalarField>
                 (gbf[patchi]);
 
             fvsPatchVectorField& nHatp = nHatb[patchi];
-            scalarField theta = 
+            scalarField theta =
                 convertToRad*gcap.theta(U_.boundaryField()[patchi], nHatp);
 
             vectorField nf = boundary[patchi].nf();
@@ -109,22 +96,22 @@ void interfaceProperties::correctContactAngle
 }
 
 
-void interfaceProperties::calculateK()
+void Foam::interfaceProperties::calculateK()
 {
-    const fvMesh& mesh = gamma_.mesh();
+    const fvMesh& mesh = alpha1_.mesh();
     const surfaceVectorField& Sf = mesh.Sf();
 
-    // Cell gradient of gamma
-    volVectorField gradGamma = fvc::grad(gamma_);
+    // Cell gradient of alpha
+    volVectorField gradAlpha = fvc::grad(alpha1_);
 
-    // Interpolated face-gradient of gamma
-    surfaceVectorField gradGammaf = fvc::interpolate(gradGamma);
-    //gradGammaf -=
+    // Interpolated face-gradient of alpha
+    surfaceVectorField gradAlphaf = fvc::interpolate(gradAlpha);
+    //gradAlphaf -=
     //    (mesh.Sf()/mesh.magSf())
-    //   *(fvc::snGrad(gamma_) - (mesh.Sf() & gradGammaf)/mesh.magSf());
+    //   *(fvc::snGrad(alpha1_) - (mesh.Sf() & gradAlphaf)/mesh.magSf());
 
     // Face unit interface normal
-    surfaceVectorField nHatfv = gradGammaf/(mag(gradGammaf) + deltaN_);
+    surfaceVectorField nHatfv = gradAlphaf/(mag(gradAlphaf) + deltaN_);
     correctContactAngle(nHatfv.boundaryField());
 
     // Face unit interface normal flux
@@ -136,7 +123,7 @@ void interfaceProperties::calculateK()
     // Complex expression for curvature.
     // Correction is formally zero but numerically non-zero.
     /*
-    volVectorField nHat = gradGamma/(mag(gradGamma) + deltaN_);
+    volVectorField nHat = gradAlpha/(mag(gradAlpha) + deltaN_);
     forAll(nHat.boundaryField(), patchi)
     {
         nHat.boundaryField()[patchi] = nHatfv.boundaryField()[patchi];
@@ -149,19 +136,19 @@ void interfaceProperties::calculateK()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-interfaceProperties::interfaceProperties
+Foam::interfaceProperties::interfaceProperties
 (
-    const volScalarField& gamma,
+    const volScalarField& alpha1,
     const volVectorField& U,
     const IOdictionary& dict
 )
 :
     transportPropertiesDict_(dict),
-    cGamma_
+    cAlpha_
     (
         readScalar
         (
-            gamma.mesh().solutionDict().subDict("PISO").lookup("cGamma")
+            alpha1.mesh().solutionDict().subDict("PISO").lookup("cAlpha")
         )
     ),
     sigma_(dict.lookup("sigma")),
@@ -169,10 +156,10 @@ interfaceProperties::interfaceProperties
     deltaN_
     (
         "deltaN",
-        1e-8/pow(average(gamma.mesh().V()), 1.0/3.0)
+        1e-8/pow(average(alpha1.mesh().V()), 1.0/3.0)
     ),
 
-    gamma_(gamma),
+    alpha1_(alpha1),
     U_(U),
 
     nHatf_
@@ -180,10 +167,10 @@ interfaceProperties::interfaceProperties
         IOobject
         (
             "nHatf",
-            gamma_.time().timeName(),
-            gamma_.mesh()
+            alpha1_.time().timeName(),
+            alpha1_.mesh()
         ),
-        gamma_.mesh(),
+        alpha1_.mesh(),
         dimensionedScalar("nHatf", dimArea, 0.0)
     ),
 
@@ -192,10 +179,10 @@ interfaceProperties::interfaceProperties
         IOobject
         (
             "K",
-            gamma_.time().timeName(),
-            gamma_.mesh()
+            alpha1_.time().timeName(),
+            alpha1_.mesh()
         ),
-        gamma_.mesh(),
+        alpha1_.mesh(),
         dimensionedScalar("K", dimless/dimLength, 0.0)
     )
 {
@@ -203,8 +190,4 @@ interfaceProperties::interfaceProperties
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //

src/transportModels/interfaceProperties/interfaceProperties.H

@@ -29,7 +29,7 @@ Description
     Contains the interface properties.
 
     Properties to aid interFoam:
-    -# Correct the gamma boundary condition for dynamic contact angle.
+    -# Correct the alpha boundary condition for dynamic contact angle.
     -# Calculate interface curvature.
 
 SourceFiles
@@ -61,7 +61,7 @@ class interfaceProperties
         const dictionary& transportPropertiesDict_;
 
         //- Compression coefficient
-        scalar cGamma_;
+        scalar cAlpha_;
 
         //- Surface tension
         dimensionedScalar sigma_;
@@ -69,7 +69,7 @@ class interfaceProperties
         //- Stabilisation for normalisation of the interface normal
         const dimensionedScalar deltaN_;
 
-        const volScalarField& gamma_;
+        const volScalarField& alpha1_;
         const volVectorField& U_;
         surfaceScalarField nHatf_;
         volScalarField K_;
@@ -104,7 +104,7 @@ public:
         //- Construct from volume fraction field gamma and IOdictionary
         interfaceProperties
         (
-            const volScalarField& gamma,
+            const volScalarField& alpha1,
             const volVectorField& U,
             const IOdictionary&
         );
@@ -112,9 +112,9 @@ public:
 
     // Member Functions
 
-        scalar cGamma() const
+        scalar cAlpha() const
         {
-            return cGamma_;
+            return cAlpha_;
         }
 
         const dimensionedScalar& deltaN() const

src/turbulenceModels/Allwmake

@@ -2,7 +2,8 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-RAS/Allwmake
-LES/Allwmake
+(cd LES && ./Allwmake )
+(cd incompressible && ./Allwmake )
+(cd compressible && ./Allwmake )
 
 # ----------------------------------------------------------------- end-of-file

src/turbulenceModels/LES/Allwmake

@@ -2,11 +2,9 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmakeLnInclude -f incompressible
+wmakeLnInclude -f ../incompressible/LES
 
 wmake libso LESfilters
 wmake libso LESdeltas
-wmake libso incompressible
-wmake libso compressible
 
 # ----------------------------------------------------------------- end-of-file

src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H

@@ -113,10 +113,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~LESdelta()
-        {}
+    //- Destructor
+    virtual ~LESdelta()
+    {}
 
 
     // Member Functions

src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H

@@ -85,19 +85,18 @@ public:
         );
 
 
-    // Destructor
-
-        ~PrandtlDelta()
-        {}
+    //- Destructor
+    virtual ~PrandtlDelta()
+    {}
 
 
     // Member Functions
 
         //- Read the LESdelta dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
         // Correct values
-        void correct();
+        virtual void correct();
 };
 
 

src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H

@@ -83,19 +83,18 @@ public:
         );
 
 
-    // Destructor
-
-        ~cubeRootVolDelta()
-        {}
+    //- Destructor
+    virtual ~cubeRootVolDelta()
+    {}
 
 
     // Member Functions
 
         //- Read the LESdelta dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
         // Correct values
-        void correct();
+        virtual void correct();
 };
 
 

src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H

@@ -26,8 +26,8 @@ Class
     Foam::smoothDelta
 
 Description
-    Smoothed delta which takes a given simple geometric delta and applies 
-    smoothing to it such that the ratio of deltas between two cells is no 
+    Smoothed delta which takes a given simple geometric delta and applies
+    smoothing to it such that the ratio of deltas between two cells is no
     larger than a specified amount, typically 1.15.
 
 SourceFiles
@@ -233,19 +233,18 @@ public:
         );
 
 
-    // Destructor
-
-        ~smoothDelta()
-        {}
+    //- Destructor
+    virtual ~smoothDelta()
+    {}
 
 
     // Member Functions
 
         //- Read the LESdelta dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
         // Correct values
-        void correct();
+        virtual void correct();
 };
 
 

src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H

@@ -107,10 +107,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~LESfilter()
-        {}
+    //- Destructor
+    virtual ~LESfilter()
+    {}
 
 
     // Member Functions

src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H

@@ -86,27 +86,29 @@ public:
         anisotropicFilter(const fvMesh& mesh, const dictionary&);
 
 
-    // Destructor
-
-        ~anisotropicFilter()
-        {}
+    //- Destructor
+    virtual ~anisotropicFilter()
+    {}
 
 
     // Member Functions
 
         //- Read the LESfilter dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
 
     // Member Operators
 
-        tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
-        tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
-        tmp<volSymmTensorField> operator()
+        virtual tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
+
+        virtual tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
+
+        virtual tmp<volSymmTensorField> operator()
         (
             const tmp<volSymmTensorField>&
         ) const;
-        tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
+
+        virtual tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
 };
 
 

src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H

@@ -87,27 +87,29 @@ public:
         laplaceFilter(const fvMesh& mesh, const dictionary&);
 
 
-    // Destructor
-
-        ~laplaceFilter()
-        {}
+    //- Destructor
+    virtual ~laplaceFilter()
+    {}
 
 
     // Member Functions
 
         //- Read the LESfilter dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
 
     // Member Operators
 
-        tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
-        tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
-        tmp<volSymmTensorField> operator()
+        virtual tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
+
+        virtual tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
+
+        virtual tmp<volSymmTensorField> operator()
         (
             const tmp<volSymmTensorField>&
         ) const;
-        tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
+
+        virtual tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
 };
 
 

src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H

@@ -76,27 +76,29 @@ public:
         simpleFilter(const fvMesh& mesh, const dictionary&);
 
 
-    // Destructor
-
-        ~simpleFilter()
-        {}
+    //- Destructor
+    virtual ~simpleFilter()
+    {}
 
 
     // Member Functions
 
         //- Read the LESfilter dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
 
     // Member Operators
 
-        tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
-        tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
-        tmp<volSymmTensorField> operator()
+        virtual tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
+
+        virtual tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
+
+        virtual tmp<volSymmTensorField> operator()
         (
             const tmp<volSymmTensorField>&
         ) const;
-        tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
+
+        virtual tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
 };
 
 

src/turbulenceModels/LES/incompressible/Make/options

@@ -1,12 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I../LESdeltas/lnInclude \
-    -I../LESfilters/lnInclude \
-    -I$(LIB_SRC)/transportModels
-
-LIB_LIBS = \
-    -lLESdeltas \
-    -lLESfilters\
-    -lfiniteVolume \
-    -lmeshTools

src/turbulenceModels/compressible/Allwmake

@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+#wmake libso turbulenceModel
+wmake libso RAS
+wmake libso LES
+
+# ----------------------------------------------------------------- end-of-file

src/turbulenceModels/compressible/LES/Make/options

@@ -1,8 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I../LESdeltas/lnInclude \
-    -I../LESfilters/lnInclude \
+    -I../../LES/LESdeltas/lnInclude \
+    -I../../LES/LESfilters/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \