From c62c54c9eb086063a8fcd13cb79904989e2b9ee1 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 24 Jun 2008 18:08:46 +0100
Subject: [PATCH] Bug fix
 http://openfoam.cfd-online.com/cgi-bin/forum/show.cgi?126/8122

---
 ...namicGammaContactAngleFvPatchScalarField.C | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C
index 28ec33e01c..74c7743d8e 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C
@@ -29,14 +29,9 @@ License
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-dynamicGammaContactAngleFvPatchScalarField::
+Foam::dynamicGammaContactAngleFvPatchScalarField::
 dynamicGammaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
@@ -51,7 +46,7 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-dynamicGammaContactAngleFvPatchScalarField::
+Foam::dynamicGammaContactAngleFvPatchScalarField::
 dynamicGammaContactAngleFvPatchScalarField
 (
     const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
@@ -64,11 +59,11 @@ dynamicGammaContactAngleFvPatchScalarField
     theta0_(gcpsf.theta0_),
     uTheta_(gcpsf.uTheta_),
     thetaA_(gcpsf.thetaA_),
-    thetaR_(gcpsf.thetaA_)
+    thetaR_(gcpsf.thetaR_)
 {}
 
 
-dynamicGammaContactAngleFvPatchScalarField::
+Foam::dynamicGammaContactAngleFvPatchScalarField::
 dynamicGammaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
@@ -86,7 +81,7 @@ dynamicGammaContactAngleFvPatchScalarField
 }
 
 
-dynamicGammaContactAngleFvPatchScalarField::
+Foam::dynamicGammaContactAngleFvPatchScalarField::
 dynamicGammaContactAngleFvPatchScalarField
 (
     const dynamicGammaContactAngleFvPatchScalarField& gcpsf
@@ -100,7 +95,7 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-dynamicGammaContactAngleFvPatchScalarField::
+Foam::dynamicGammaContactAngleFvPatchScalarField::
 dynamicGammaContactAngleFvPatchScalarField
 (
     const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
@@ -117,7 +112,8 @@ dynamicGammaContactAngleFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField> dynamicGammaContactAngleFvPatchScalarField::theta
+Foam::tmp<Foam::scalarField>
+Foam::dynamicGammaContactAngleFvPatchScalarField::theta
 (
     const fvPatchVectorField& Up,
     const fvsPatchVectorField& nHat
@@ -133,22 +129,22 @@ tmp<scalarField> dynamicGammaContactAngleFvPatchScalarField::theta
     // Calculated the component of the velocity parallel to the wall
     vectorField Uwall = Up.patchInternalField() - Up;
     Uwall -= (nf & Uwall)*nf;
-    
+
     // Find the direction of the interface parallel to the wall
     vectorField nWall = nHat - (nf & nHat)*nf;
-    
+
     // Normalise nWall
     nWall /= (mag(nWall) + SMALL);
-    
+
     // Calculate Uwall resolved normal to the interface parallel to
     // the interface
     scalarField uwall = nWall & Uwall;
-    
+
     return theta0_ + (thetaA_ - thetaR_)*tanh(uwall/uTheta_);
 }
 
 
-void dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const
+void Foam::dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
@@ -161,10 +157,14 @@ void dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, dynamicGammaContactAngleFvPatchScalarField);
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        dynamicGammaContactAngleFvPatchScalarField
+    );
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //