From 2a424fddab3dc7510ce746e42fb6e55322677d3d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 24 Jul 2008 14:40:53 +0100
Subject: [PATCH 1/2] using Graham's latest CGAL wmake rules

---
 wmake/rules/General/CGAL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 061db72a36..4e7e3b4ef9 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,4 +1,4 @@
-CGAL_PATH = ${WM_PROJECT_INST_DIR}/${WM_ARCH}/CGAL-${CGAL_VERSION}
+CGAL_PATH = ${WM_THIRD_PARTY_DIR}/CGAL-${CGAL_VERSION}
 
 CGAL_INC = \
     -Wno-old-style-cast \

From 9cd8339e5cfa33422680ddab1574d031594ad5ff Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 24 Jul 2008 16:02:02 +0100
Subject: [PATCH 2/2] Minor tidy-up

---
 .../wallHeatTransferFvPatchScalarField.C      | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index 6549a14614..44cd21b0ea 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -30,14 +30,9 @@ License
 #include "volFields.H"
 #include "basicThermo.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -53,7 +48,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 }
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const wallHeatTransferFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -67,7 +62,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 {}
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -96,7 +91,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 }
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const wallHeatTransferFvPatchScalarField& tppsf
 )
@@ -107,7 +102,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 {}
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const wallHeatTransferFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
@@ -121,7 +116,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void wallHeatTransferFvPatchScalarField::autoMap
+void Foam::wallHeatTransferFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -132,7 +127,7 @@ void wallHeatTransferFvPatchScalarField::autoMap
 }
 
 
-void wallHeatTransferFvPatchScalarField::rmap
+void Foam::wallHeatTransferFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
@@ -148,7 +143,7 @@ void wallHeatTransferFvPatchScalarField::rmap
 }
 
 
-void wallHeatTransferFvPatchScalarField::updateCoeffs()
+void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -159,13 +154,13 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
     (
         "thermophysicalProperties"
     );
-    
+
     const label patchi = patch().index();
 
     const scalarField& Tw = thermo.T().boundaryField()[patchi];
     scalarField Cpw = thermo.Cp(Tw, patchi);
 
-    valueFraction() = 
+    valueFraction() =
         1.0/
         (
             1.0
@@ -177,7 +172,7 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
 }
 
 
-void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
+void Foam::wallHeatTransferFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
     Tinf_.writeEntry("Tinf", os);
@@ -188,10 +183,9 @@ void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
+}
 
 // ************************************************************************* //