From 420f06b193b99d489965a5c6e39f266223f3984b Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 15 Apr 2013 12:54:13 +0100
Subject: [PATCH] Minor clean-up

---
 .../fluxCorrectedVelocityFvPatchVectorField.C | 30 +++++++++----------
 .../inletOutlet/inletOutletFvPatchField.C     |  2 +-
 .../totalTemperatureFvPatchScalarField.C      | 10 +++----
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
index 395745a7c..8cf5cc57d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C
@@ -45,21 +45,6 @@ fluxCorrectedVelocityFvPatchVectorField
 {}
 
 
-Foam::fluxCorrectedVelocityFvPatchVectorField::
-fluxCorrectedVelocityFvPatchVectorField
-(
-    const fluxCorrectedVelocityFvPatchVectorField& ptf,
-    const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    zeroGradientFvPatchVectorField(ptf, p, iF, mapper),
-    phiName_(ptf.phiName_),
-    rhoName_(ptf.rhoName_)
-{}
-
-
 Foam::fluxCorrectedVelocityFvPatchVectorField::
 fluxCorrectedVelocityFvPatchVectorField
 (
@@ -76,6 +61,21 @@ fluxCorrectedVelocityFvPatchVectorField
 }
 
 
+Foam::fluxCorrectedVelocityFvPatchVectorField::
+fluxCorrectedVelocityFvPatchVectorField
+(
+    const fluxCorrectedVelocityFvPatchVectorField& ptf,
+    const fvPatch& p,
+    const DimensionedField<vector, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    zeroGradientFvPatchVectorField(ptf, p, iF, mapper),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_)
+{}
+
+
 Foam::fluxCorrectedVelocityFvPatchVectorField::
 fluxCorrectedVelocityFvPatchVectorField
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 25687101a..3a5f82655 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -127,7 +127,7 @@ void inletOutletFvPatchField<Type>::updateCoeffs()
         return;
     }
 
-    const Field<scalar>& phip = this->lookupPatchField
+    const scalarField& phip = this->lookupPatchField
     (
         phiName_,
         reinterpret_cast<const surfaceScalarField*>(0),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index 887a650d1..ee0960fea 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -30,8 +30,6 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
@@ -82,14 +80,14 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
 {
     if (dict.found("value"))
     {
-        fvPatchField<scalar>::operator=
+        fvPatchScalarField::operator=
         (
             scalarField("value", dict, p.size())
         );
     }
     else
     {
-        fvPatchField<scalar>::operator=(T0_);
+        fvPatchScalarField::operator=(T0_);
     }
 }
 
@@ -160,10 +158,10 @@ void Foam::totalTemperatureFvPatchScalarField::updateCoeffs()
     const fvPatchVectorField& Up =
         lookupPatchField<volVectorField, vector>(UName_);
 
-    const fvsPatchField<scalar>& phip =
+    const fvsPatchScalarField& phip =
         lookupPatchField<surfaceScalarField, scalar>(phiName_);
 
-    const fvPatchField<scalar>& psip =
+    const fvPatchScalarField& psip =
         lookupPatchField<volScalarField, scalar>(psiName_);
 
     scalar gM1ByG = (gamma_ - 1.0)/gamma_;