From efa28279b8e35a8a39fa121b6dea6b719f13c5d5 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 8 Dec 2015 22:29:05 +0000
Subject: [PATCH] fvPatchFields, fvsPatchFields, pointPatchFields: specifically
declare namespace of functions
It is better to declare the namespace of each function in the C file
rather than "open" the namespace as this may lead to inconsistencies
between the declaration in the H files and definition in the C file.
---
.../mixedFixedValueSlipFvPatchField.C | 64 +++++++---------
.../calculated/calculatedPointPatchField.C | 23 ++----
.../basic/coupled/coupledPointPatchField.C | 19 ++---
.../fixedValue/fixedValuePointPatchField.C | 19 ++---
.../zeroGradientPointPatchField.C | 19 ++---
.../constraint/empty/emptyPointPatchField.C | 17 +----
.../processor/processorPointPatchField.C | 21 ++----
.../symmetry/symmetryPointPatchField.C | 17 +----
.../symmetryPlanePointPatchField.C | 17 +----
.../derived/slip/slipPointPatchField.C | 19 ++---
.../uniformFixedValuePointPatchField.C | 25 ++-----
.../pointPatchField/pointPatchField.C | 42 +++++------
.../kqRWallFunctionFvPatchField.C | 35 ++++-----
.../fixedGradient/fixedGradientFvPatchField.C | 69 ++++++++---------
.../basic/fixedValue/fixedValueFvPatchField.C | 33 ++++----
.../basic/mixed/mixedFvPatchField.C | 74 +++++++++---------
.../basic/sliced/slicedFvPatchField.C | 69 ++++++++---------
.../zeroGradient/zeroGradientFvPatchField.C | 53 ++++++-------
.../constraint/cyclic/cyclicFvPatchField.C | 60 +++++++--------
.../nonuniformTransformCyclicFvPatchField.C | 31 +++-----
.../symmetry/symmetryFvPatchField.C | 43 +++++------
.../freestream/freestreamFvPatchField.C | 47 +++++-------
.../mappedField/mappedFieldFvPatchField.C | 46 +++++-------
.../mappedFixedValueFvPatchField.C | 39 ++++------
.../oscillatingFixedValueFvPatchField.C | 63 +++++++---------
.../derived/slip/slipFvPatchField.C | 31 +++-----
.../timeVaryingMappedFixedValueFvPatchField.C | 32 ++++----
.../turbulentInletFvPatchField.C | 63 +++++++---------
.../calculated/calculatedFvsPatchField.C | 37 ++++-----
.../basic/coupled/coupledFvsPatchField.C | 33 +++-----
.../fixedValue/fixedValueFvsPatchField.C | 43 +++++------
.../basic/sliced/slicedFvsPatchField.C | 40 +++++-----
.../constraint/cyclic/cyclicFvsPatchField.C | 57 ++++++--------
.../cyclicSlip/cyclicSlipFvsPatchField.C | 31 +++-----
.../constraint/empty/emptyFvsPatchField.C | 53 ++++++-------
.../nonuniformTransformCyclicFvsPatchField.C | 31 +++-----
.../processor/processorFvsPatchField.C | 62 +++++++--------
.../processorCyclicFvsPatchField.C | 62 +++++++--------
.../symmetry/symmetryFvsPatchField.C | 57 ++++++--------
.../symmetryPlaneFvsPatchField.C | 57 ++++++--------
.../constraint/wedge/wedgeFvsPatchField.C | 57 ++++++--------
.../fvsPatchField/fvsPatchField.C | 75 ++++++++-----------
.../genericPointPatchField.C | 23 ++----
.../zeroFixedValuePointPatchField.C | 21 ++----
44 files changed, 735 insertions(+), 1094 deletions(-)
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
index 5c1459381f..18155d5bca 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,15 +26,10 @@ License
#include "mixedFixedValueSlipFvPatchField.H"
#include "symmTransformField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -47,36 +42,36 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
(
- const mixedFixedValueSlipFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- transformFvPatchField<Type>(ptf, p, iF, mapper),
- refValue_(ptf.refValue_, mapper),
- valueFraction_(ptf.valueFraction_, mapper)
+ transformFvPatchField<Type>(p, iF),
+ refValue_("refValue", dict, p.size()),
+ valueFraction_("valueFraction", dict, p.size())
{}
template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
(
+ const mixedFixedValueSlipFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- transformFvPatchField<Type>(p, iF),
- refValue_("refValue", dict, p.size()),
- valueFraction_("valueFraction", dict, p.size())
+ transformFvPatchField<Type>(ptf, p, iF, mapper),
+ refValue_(ptf.refValue_, mapper),
+ valueFraction_(ptf.valueFraction_, mapper)
{}
template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
(
const mixedFixedValueSlipFvPatchField<Type>& ptf
)
@@ -86,8 +81,9 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
valueFraction_(ptf.valueFraction_)
{}
+
template<class Type>
-mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
+Foam::mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
(
const mixedFixedValueSlipFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -101,9 +97,8 @@ mixedFixedValueSlipFvPatchField<Type>::mixedFixedValueSlipFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Map from self
template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::autoMap
+void Foam::mixedFixedValueSlipFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -114,9 +109,8 @@ void mixedFixedValueSlipFvPatchField<Type>::autoMap
}
-// Reverse-map the given fvPatchField onto this fvPatchField
template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::rmap
+void Foam::mixedFixedValueSlipFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -132,9 +126,9 @@ void mixedFixedValueSlipFvPatchField<Type>::rmap
}
-// Return gradient at boundary
template<class Type>
-tmp<Field<Type> > mixedFixedValueSlipFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFixedValueSlipFvPatchField<Type>::snGrad() const
{
tmp<vectorField> nHat = this->patch().nf();
Field<Type> pif(this->patchInternalField());
@@ -147,9 +141,11 @@ tmp<Field<Type> > mixedFixedValueSlipFvPatchField<Type>::snGrad() const
}
-// Evaluate the field on the patch
template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::mixedFixedValueSlipFvPatchField<Type>::evaluate
+(
+ const Pstream::commsTypes
+)
{
if (!this->updated())
{
@@ -170,10 +166,9 @@ void mixedFixedValueSlipFvPatchField<Type>::evaluate(const Pstream::commsTypes)
}
-// Return defining fields
template<class Type>
-tmp<Field<Type> >
-mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
{
vectorField nHat(this->patch().nf());
vectorField diag(nHat.size());
@@ -189,9 +184,8 @@ mixedFixedValueSlipFvPatchField<Type>::snGradTransformDiag() const
}
-// Write
template<class Type>
-void mixedFixedValueSlipFvPatchField<Type>::write(Ostream& os) const
+void Foam::mixedFixedValueSlipFvPatchField<Type>::write(Ostream& os) const
{
transformFvPatchField<Type>::write(os);
refValue_.writeEntry("refValue", os);
@@ -199,8 +193,4 @@ void mixedFixedValueSlipFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
index 45f98495db..74846139eb 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,11 +27,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
template<class Type>
-const word& pointPatchField<Type>::calculatedType()
+const Foam::word& Foam::pointPatchField<Type>::calculatedType()
{
return calculatedPointPatchField<Type>::typeName;
}
@@ -40,7 +37,7 @@ const word& pointPatchField<Type>::calculatedType()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -51,7 +48,7 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -63,7 +60,7 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
(
const calculatedPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -76,7 +73,7 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
template<class Type>
-calculatedPointPatchField<Type>::calculatedPointPatchField
+Foam::calculatedPointPatchField<Type>::calculatedPointPatchField
(
const calculatedPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -88,8 +85,8 @@ calculatedPointPatchField<Type>::calculatedPointPatchField
template<class Type>
template<class Type2>
-autoPtr<pointPatchField<Type> >
-pointPatchField<Type>::NewCalculatedType
+Foam::autoPtr<Foam::pointPatchField<Type> >
+Foam::pointPatchField<Type>::NewCalculatedType
(
const pointPatchField<Type2>& pf
)
@@ -122,8 +119,4 @@ pointPatchField<Type>::NewCalculatedType
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C
index 434b6873f4..635f9b665e 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "coupledPointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ coupledPointPatchField<Type>::coupledPointPatchField
template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -56,7 +51,7 @@ coupledPointPatchField<Type>::coupledPointPatchField
template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
(
const coupledPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -69,7 +64,7 @@ coupledPointPatchField<Type>::coupledPointPatchField
template<class Type>
-coupledPointPatchField<Type>::coupledPointPatchField
+Foam::coupledPointPatchField<Type>::coupledPointPatchField
(
const coupledPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -79,8 +74,4 @@ coupledPointPatchField<Type>::coupledPointPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
index 19bb6d8af5..2ef21cfdd2 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,15 +26,10 @@ License
#include "fixedValuePointPatchField.H"
#include "boolList.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -45,7 +40,7 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -58,7 +53,7 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
(
const fixedValuePointPatchField<Type>& ptf,
const pointPatch& p,
@@ -71,7 +66,7 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
template<class Type>
-fixedValuePointPatchField<Type>::fixedValuePointPatchField
+Foam::fixedValuePointPatchField<Type>::fixedValuePointPatchField
(
const fixedValuePointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -81,8 +76,4 @@ fixedValuePointPatchField<Type>::fixedValuePointPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
index 754ba28d75..9ca14e2ca5 100644
--- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "zeroGradientPointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -56,7 +51,7 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
(
const zeroGradientPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -69,7 +64,7 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
template<class Type>
-zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
+Foam::zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
(
const zeroGradientPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -79,8 +74,4 @@ zeroGradientPointPatchField<Type>::zeroGradientPointPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
index 6435a72c12..8fbbaadd07 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.C
@@ -25,15 +25,10 @@ License
#include "emptyPointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ emptyPointPatchField<Type>::emptyPointPatchField
template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -66,7 +61,7 @@ emptyPointPatchField<Type>::emptyPointPatchField
template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
(
const emptyPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -89,7 +84,7 @@ emptyPointPatchField<Type>::emptyPointPatchField
template<class Type>
-emptyPointPatchField<Type>::emptyPointPatchField
+Foam::emptyPointPatchField<Type>::emptyPointPatchField
(
const emptyPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -99,8 +94,4 @@ emptyPointPatchField<Type>::emptyPointPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
index 8a647b6db0..011129adc8 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,15 +26,10 @@ License
#include "processorPointPatchField.H"
#include "processorPolyPatch.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -46,7 +41,7 @@ processorPointPatchField<Type>::processorPointPatchField
template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -59,7 +54,7 @@ processorPointPatchField<Type>::processorPointPatchField
template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
(
const processorPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -73,7 +68,7 @@ processorPointPatchField<Type>::processorPointPatchField
template<class Type>
-processorPointPatchField<Type>::processorPointPatchField
+Foam::processorPointPatchField<Type>::processorPointPatchField
(
const processorPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -87,12 +82,8 @@ processorPointPatchField<Type>::processorPointPatchField
// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
template<class Type>
-processorPointPatchField<Type>::~processorPointPatchField()
+Foam::processorPointPatchField<Type>::~processorPointPatchField()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
index 4e11109261..250b438ff9 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.C
@@ -25,15 +25,10 @@ License
#include "symmetryPointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -66,7 +61,7 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
(
const symmetryPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -89,7 +84,7 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
template<class Type>
-symmetryPointPatchField<Type>::symmetryPointPatchField
+Foam::symmetryPointPatchField<Type>::symmetryPointPatchField
(
const symmetryPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -99,8 +94,4 @@ symmetryPointPatchField<Type>::symmetryPointPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
index c988248e2e..c402bad230 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C
@@ -25,15 +25,10 @@ License
#include "symmetryPlanePointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -45,7 +40,7 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -68,7 +63,7 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
(
const symmetryPlanePointPatchField<Type>& ptf,
const pointPatch& p,
@@ -92,7 +87,7 @@ symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
template<class Type>
-symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
+Foam::symmetryPlanePointPatchField<Type>::symmetryPlanePointPatchField
(
const symmetryPlanePointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -128,8 +123,4 @@ void Foam::symmetryPlanePointPatchField<Type>::evaluate
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C
index 62f95b4eb5..902e73f6f7 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "slipPointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -44,7 +39,7 @@ slipPointPatchField<Type>::slipPointPatchField
template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -56,7 +51,7 @@ slipPointPatchField<Type>::slipPointPatchField
template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
(
const slipPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -69,7 +64,7 @@ slipPointPatchField<Type>::slipPointPatchField
template<class Type>
-slipPointPatchField<Type>::slipPointPatchField
+Foam::slipPointPatchField<Type>::slipPointPatchField
(
const slipPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -79,8 +74,4 @@ slipPointPatchField<Type>::slipPointPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
index 0b626d888c..ae42db3989 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "uniformFixedValuePointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
uniformFixedValuePointPatchField
(
const pointPatch& p,
@@ -46,7 +41,7 @@ uniformFixedValuePointPatchField
template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
uniformFixedValuePointPatchField
(
const pointPatch& p,
@@ -73,7 +68,7 @@ uniformFixedValuePointPatchField
template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
uniformFixedValuePointPatchField
(
const uniformFixedValuePointPatchField<Type>& ptf,
@@ -92,7 +87,7 @@ uniformFixedValuePointPatchField
template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
uniformFixedValuePointPatchField
(
const uniformFixedValuePointPatchField<Type>& ptf
@@ -104,7 +99,7 @@ uniformFixedValuePointPatchField
template<class Type>
-uniformFixedValuePointPatchField<Type>::
+Foam::uniformFixedValuePointPatchField<Type>::
uniformFixedValuePointPatchField
(
const uniformFixedValuePointPatchField<Type>& ptf,
@@ -123,7 +118,7 @@ uniformFixedValuePointPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void uniformFixedValuePointPatchField<Type>::updateCoeffs()
+void Foam::uniformFixedValuePointPatchField<Type>::updateCoeffs()
{
if (this->updated())
{
@@ -138,7 +133,7 @@ void uniformFixedValuePointPatchField<Type>::updateCoeffs()
template<class Type>
-void uniformFixedValuePointPatchField<Type>::
+void Foam::uniformFixedValuePointPatchField<Type>::
write(Ostream& os) const
{
// Note: write value
@@ -147,8 +142,4 @@ write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 64daf799fd..92c62d0703 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -27,15 +27,10 @@ License
#include "pointMesh.H"
#include "dictionary.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -49,7 +44,7 @@ pointPatchField<Type>::pointPatchField
template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -80,7 +75,7 @@ Foam::pointPatchField<Type>::pointPatchField
template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
(
const pointPatchField<Type>& ptf
)
@@ -93,7 +88,7 @@ pointPatchField<Type>::pointPatchField
template<class Type>
-pointPatchField<Type>::pointPatchField
+Foam::pointPatchField<Type>::pointPatchField
(
const pointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -109,14 +104,14 @@ pointPatchField<Type>::pointPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-const objectRegistry& pointPatchField<Type>::db() const
+const Foam::objectRegistry& Foam::pointPatchField<Type>::db() const
{
return patch_.boundaryMesh().mesh()();
}
template<class Type>
-void pointPatchField<Type>::write(Ostream& os) const
+void Foam::pointPatchField<Type>::write(Ostream& os) const
{
os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
@@ -129,7 +124,8 @@ void pointPatchField<Type>::write(Ostream& os) const
template<class Type>
-tmp<Field<Type> > pointPatchField<Type>::patchInternalField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::pointPatchField<Type>::patchInternalField() const
{
return patchInternalField(internalField());
}
@@ -137,7 +133,8 @@ tmp<Field<Type> > pointPatchField<Type>::patchInternalField() const
template<class Type>
template<class Type1>
-tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
+Foam::tmp<Foam::Field<Type1> >
+Foam::pointPatchField<Type>::patchInternalField
(
const Field<Type1>& iF,
const labelList& meshPoints
@@ -159,7 +156,8 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
template<class Type>
template<class Type1>
-tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
+Foam::tmp<Foam::Field<Type1> >
+Foam::pointPatchField<Type>::patchInternalField
(
const Field<Type1>& iF
) const
@@ -170,7 +168,7 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
template<class Type>
template<class Type1>
-void pointPatchField<Type>::addToInternalField
+void Foam::pointPatchField<Type>::addToInternalField
(
Field<Type1>& iF,
const Field<Type1>& pF
@@ -207,7 +205,7 @@ void pointPatchField<Type>::addToInternalField
template<class Type>
template<class Type1>
-void pointPatchField<Type>::addToInternalField
+void Foam::pointPatchField<Type>::addToInternalField
(
Field<Type1>& iF,
const Field<Type1>& pF,
@@ -246,7 +244,7 @@ void pointPatchField<Type>::addToInternalField
template<class Type>
template<class Type1>
-void pointPatchField<Type>::setInInternalField
+void Foam::pointPatchField<Type>::setInInternalField
(
Field<Type1>& iF,
const Field<Type1>& pF,
@@ -281,7 +279,7 @@ void pointPatchField<Type>::setInInternalField
template<class Type>
template<class Type1>
-void pointPatchField<Type>::setInInternalField
+void Foam::pointPatchField<Type>::setInInternalField
(
Field<Type1>& iF,
const Field<Type1>& pF
@@ -292,7 +290,7 @@ void pointPatchField<Type>::setInInternalField
template<class Type>
-void pointPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::pointPatchField<Type>::evaluate(const Pstream::commsTypes)
{
if (!updated_)
{
@@ -306,7 +304,7 @@ void pointPatchField<Type>::evaluate(const Pstream::commsTypes)
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class Type>
-Ostream& operator<<
+Foam::Ostream& Foam::operator<<
(
Ostream& os,
const pointPatchField<Type>& ptf
@@ -320,10 +318,6 @@ Ostream& operator<<
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "pointPatchFieldNew.C"
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
index 6afabdcc6c..4ecd27f1d6 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -28,15 +28,10 @@ License
#include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
-void kqRWallFunctionFvPatchField<Type>::checkType()
+void Foam::kqRWallFunctionFvPatchField<Type>::checkType()
{
if (!isA<wallFvPatch>(this->patch()))
{
@@ -54,7 +49,7 @@ void kqRWallFunctionFvPatchField<Type>::checkType()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -67,36 +62,36 @@ kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
- const kqRWallFunctionFvPatchField& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- zeroGradientFvPatchField<Type>(ptf, p, iF, mapper)
+ zeroGradientFvPatchField<Type>(p, iF, dict)
{
checkType();
}
template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
+ const kqRWallFunctionFvPatchField& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- zeroGradientFvPatchField<Type>(p, iF, dict)
+ zeroGradientFvPatchField<Type>(ptf, p, iF, mapper)
{
checkType();
}
template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kqRWallFunctionFvPatchField& tkqrwfpf
)
@@ -108,7 +103,7 @@ kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
template<class Type>
-kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+Foam::kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
(
const kqRWallFunctionFvPatchField& tkqrwfpf,
const DimensionedField<Type, volMesh>& iF
@@ -123,7 +118,7 @@ kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void kqRWallFunctionFvPatchField<Type>::evaluate
+void Foam::kqRWallFunctionFvPatchField<Type>::evaluate
(
const Pstream::commsTypes commsType
)
@@ -133,15 +128,11 @@ void kqRWallFunctionFvPatchField<Type>::evaluate
template<class Type>
-void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
+void Foam::kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
{
zeroGradientFvPatchField<Type>::write(os);
this->writeEntry("value", os);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
index 112ddb42f4..2165282197 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C
@@ -26,15 +26,10 @@ License
#include "fixedGradientFvPatchField.H"
#include "dictionary.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -46,7 +41,22 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fvPatchField<Type>(p, iF, dict),
+ gradient_("gradient", dict, p.size())
+{
+ evaluate();
+}
+
+
+template<class Type>
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
(
const fixedGradientFvPatchField<Type>& ptf,
const fvPatch& p,
@@ -70,22 +80,7 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
-(
- const fvPatch& p,
- const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
-)
-:
- fvPatchField<Type>(p, iF, dict),
- gradient_("gradient", dict, p.size())
-{
- evaluate();
-}
-
-
-template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
(
const fixedGradientFvPatchField<Type>& ptf
)
@@ -96,7 +91,7 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
template<class Type>
-fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
+Foam::fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
(
const fixedGradientFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -110,7 +105,7 @@ fixedGradientFvPatchField<Type>::fixedGradientFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void fixedGradientFvPatchField<Type>::autoMap
+void Foam::fixedGradientFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -121,7 +116,7 @@ void fixedGradientFvPatchField<Type>::autoMap
template<class Type>
-void fixedGradientFvPatchField<Type>::rmap
+void Foam::fixedGradientFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -137,7 +132,7 @@ void fixedGradientFvPatchField<Type>::rmap
template<class Type>
-void fixedGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::fixedGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
{
if (!this->updated())
{
@@ -154,7 +149,8 @@ void fixedGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::valueInternalCoeffs
(
const tmp<scalarField>&
) const
@@ -164,7 +160,8 @@ tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueInternalCoeffs
template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
(
const tmp<scalarField>&
) const
@@ -174,8 +171,8 @@ tmp<Field<Type> > fixedGradientFvPatchField<Type>::valueBoundaryCoeffs
template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::
-gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::gradientInternalCoeffs() const
{
return tmp<Field<Type> >
(
@@ -185,23 +182,19 @@ gradientInternalCoeffs() const
template<class Type>
-tmp<Field<Type> > fixedGradientFvPatchField<Type>::
-gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
{
return gradient();
}
template<class Type>
-void fixedGradientFvPatchField<Type>::write(Ostream& os) const
+void Foam::fixedGradientFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
gradient_.writeEntry("gradient", os);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
index 6ab4ce6e13..442d1b0fea 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C
@@ -25,15 +25,10 @@ License
#include "fixedValueFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -44,7 +39,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -56,7 +51,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
(
const fixedValueFvPatchField<Type>& ptf,
const fvPatch& p,
@@ -79,7 +74,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
(
const fixedValueFvPatchField<Type>& ptf
)
@@ -89,7 +84,7 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
template<class Type>
-fixedValueFvPatchField<Type>::fixedValueFvPatchField
+Foam::fixedValueFvPatchField<Type>::fixedValueFvPatchField
(
const fixedValueFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -102,7 +97,8 @@ fixedValueFvPatchField<Type>::fixedValueFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::valueInternalCoeffs
(
const tmp<scalarField>&
) const
@@ -115,7 +111,8 @@ tmp<Field<Type> > fixedValueFvPatchField<Type>::valueInternalCoeffs
template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::valueBoundaryCoeffs
(
const tmp<scalarField>&
) const
@@ -125,29 +122,27 @@ tmp<Field<Type> > fixedValueFvPatchField<Type>::valueBoundaryCoeffs
template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::gradientInternalCoeffs() const
{
return -pTraits<Type>::one*this->patch().deltaCoeffs();
}
template<class Type>
-tmp<Field<Type> > fixedValueFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvPatchField<Type>::gradientBoundaryCoeffs() const
{
return this->patch().deltaCoeffs()*(*this);
}
template<class Type>
-void fixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::fixedValueFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
this->writeEntry("value", os);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
index 23eef7e24b..fca0149d0c 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
@@ -25,15 +25,10 @@ License
#include "mixedFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -47,7 +42,24 @@ mixedFvPatchField<Type>::mixedFvPatchField
template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
+(
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const dictionary& dict
+)
+:
+ fvPatchField<Type>(p, iF, dict),
+ refValue_("refValue", dict, p.size()),
+ refGrad_("refGradient", dict, p.size()),
+ valueFraction_("valueFraction", dict, p.size())
+{
+ evaluate();
+}
+
+
+template<class Type>
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
(
const mixedFvPatchField<Type>& ptf,
const fvPatch& p,
@@ -73,24 +85,7 @@ mixedFvPatchField<Type>::mixedFvPatchField
template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
-(
- const fvPatch& p,
- const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
-)
-:
- fvPatchField<Type>(p, iF, dict),
- refValue_("refValue", dict, p.size()),
- refGrad_("refGradient", dict, p.size()),
- valueFraction_("valueFraction", dict, p.size())
-{
- evaluate();
-}
-
-
-template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
(
const mixedFvPatchField<Type>& ptf
)
@@ -103,7 +98,7 @@ mixedFvPatchField<Type>::mixedFvPatchField
template<class Type>
-mixedFvPatchField<Type>::mixedFvPatchField
+Foam::mixedFvPatchField<Type>::mixedFvPatchField
(
const mixedFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -119,7 +114,7 @@ mixedFvPatchField<Type>::mixedFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void mixedFvPatchField<Type>::autoMap
+void Foam::mixedFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -132,7 +127,7 @@ void mixedFvPatchField<Type>::autoMap
template<class Type>
-void mixedFvPatchField<Type>::rmap
+void Foam::mixedFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -150,7 +145,7 @@ void mixedFvPatchField<Type>::rmap
template<class Type>
-void mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
{
if (!this->updated())
{
@@ -173,7 +168,8 @@ void mixedFvPatchField<Type>::evaluate(const Pstream::commsTypes)
template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::snGrad() const
{
return
valueFraction_
@@ -184,7 +180,8 @@ tmp<Field<Type> > mixedFvPatchField<Type>::snGrad() const
template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::valueInternalCoeffs
(
const tmp<scalarField>&
) const
@@ -195,7 +192,8 @@ tmp<Field<Type> > mixedFvPatchField<Type>::valueInternalCoeffs
template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::valueBoundaryCoeffs
(
const tmp<scalarField>&
) const
@@ -207,14 +205,16 @@ tmp<Field<Type> > mixedFvPatchField<Type>::valueBoundaryCoeffs
template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::gradientInternalCoeffs() const
{
return -Type(pTraits<Type>::one)*valueFraction_*this->patch().deltaCoeffs();
}
template<class Type>
-tmp<Field<Type> > mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
{
return
valueFraction_*this->patch().deltaCoeffs()*refValue_
@@ -223,7 +223,7 @@ tmp<Field<Type> > mixedFvPatchField<Type>::gradientBoundaryCoeffs() const
template<class Type>
-void mixedFvPatchField<Type>::write(Ostream& os) const
+void Foam::mixedFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
refValue_.writeEntry("refValue", os);
@@ -233,8 +233,4 @@ void mixedFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
index 9e581c6e90..9938891051 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C
@@ -25,15 +25,10 @@ License
#include "slicedFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -48,7 +43,7 @@ slicedFvPatchField<Type>::slicedFvPatchField
template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -59,36 +54,36 @@ slicedFvPatchField<Type>::slicedFvPatchField
template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
(
- const slicedFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvPatchField<Type>(ptf, p, iF, mapper)
+ fvPatchField<Type>(p, iF, dict)
{
NotImplemented;
}
template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
(
+ const slicedFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvPatchField<Type>(p, iF, dict)
+ fvPatchField<Type>(ptf, p, iF, mapper)
{
NotImplemented;
}
template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
(
const slicedFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -100,8 +95,10 @@ slicedFvPatchField<Type>::slicedFvPatchField
UList<Type>::operator=(ptf);
}
+
template<class Type>
-tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone() const
+Foam::tmp<Foam::fvPatchField<Type> >
+Foam::slicedFvPatchField<Type>::clone() const
{
return tmp<fvPatchField<Type> >
(
@@ -111,7 +108,7 @@ tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone() const
template<class Type>
-slicedFvPatchField<Type>::slicedFvPatchField
+Foam::slicedFvPatchField<Type>::slicedFvPatchField
(
const slicedFvPatchField<Type>& ptf
)
@@ -129,7 +126,8 @@ slicedFvPatchField<Type>::slicedFvPatchField
template<class Type>
-tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone
+Foam::tmp<Foam::fvPatchField<Type> >
+Foam::slicedFvPatchField<Type>::clone
(
const DimensionedField<Type, volMesh>& iF
) const
@@ -142,7 +140,7 @@ tmp<fvPatchField<Type> > slicedFvPatchField<Type>::clone
template<class Type>
-slicedFvPatchField<Type>::~slicedFvPatchField<Type>()
+Foam::slicedFvPatchField<Type>::~slicedFvPatchField()
{
// Set the fvPatchField storage pointer to NULL before its destruction
// to protect the field it a slice of.
@@ -153,7 +151,7 @@ slicedFvPatchField<Type>::~slicedFvPatchField<Type>()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::snGrad() const
+Foam::tmp<Foam::Field<Type> > Foam::slicedFvPatchField<Type>::snGrad() const
{
NotImplemented;
@@ -162,14 +160,15 @@ tmp<Field<Type> > slicedFvPatchField<Type>::snGrad() const
template<class Type>
-void slicedFvPatchField<Type>::updateCoeffs()
+void Foam::slicedFvPatchField<Type>::updateCoeffs()
{
NotImplemented;
}
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::patchInternalField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::patchInternalField() const
{
NotImplemented;
@@ -178,14 +177,15 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchInternalField() const
template<class Type>
-void slicedFvPatchField<Type>::patchInternalField(Field<Type>&) const
+void Foam::slicedFvPatchField<Type>::patchInternalField(Field<Type>&) const
{
NotImplemented;
}
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::patchNeighbourField
(
const Field<Type>& iField
) const
@@ -197,7 +197,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::patchNeighbourField() const
{
NotImplemented;
@@ -206,7 +207,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::patchNeighbourField() const
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::valueInternalCoeffs
(
const tmp<scalarField>&
) const
@@ -218,7 +220,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::valueInternalCoeffs
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::valueBoundaryCoeffs
(
const tmp<scalarField>&
) const
@@ -230,7 +233,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::valueBoundaryCoeffs
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::gradientInternalCoeffs() const
{
NotImplemented;
@@ -239,7 +243,8 @@ tmp<Field<Type> > slicedFvPatchField<Type>::gradientInternalCoeffs() const
template<class Type>
-tmp<Field<Type> > slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
{
NotImplemented;
@@ -248,15 +253,11 @@ tmp<Field<Type> > slicedFvPatchField<Type>::gradientBoundaryCoeffs() const
template<class Type>
-void slicedFvPatchField<Type>::write(Ostream& os) const
+void Foam::slicedFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
this->writeEntry("value", os);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
index b33e00277b..af57247f24 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,15 +26,10 @@ License
#include "zeroGradientFvPatchField.H"
#include "fvPatchFieldMapper.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -45,34 +40,34 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
(
- const zeroGradientFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvPatchField<Type>(ptf, p, iF, mapper)
-{}
+ fvPatchField<Type>(p, iF, dict)
+{
+ fvPatchField<Type>::operator=(this->patchInternalField());
+}
template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
(
+ const zeroGradientFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvPatchField<Type>(p, iF, dict)
-{
- fvPatchField<Type>::operator=(this->patchInternalField());
-}
+ fvPatchField<Type>(ptf, p, iF, mapper)
+{}
template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
(
const zeroGradientFvPatchField& zgpf
)
@@ -82,7 +77,7 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
template<class Type>
-zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
+Foam::zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
(
const zeroGradientFvPatchField& zgpf,
const DimensionedField<Type, volMesh>& iF
@@ -95,7 +90,7 @@ zeroGradientFvPatchField<Type>::zeroGradientFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
+void Foam::zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
{
if (!this->updated())
{
@@ -108,7 +103,8 @@ void zeroGradientFvPatchField<Type>::evaluate(const Pstream::commsTypes)
template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::valueInternalCoeffs
(
const tmp<scalarField>&
) const
@@ -121,7 +117,8 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueInternalCoeffs
template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
(
const tmp<scalarField>&
) const
@@ -134,7 +131,8 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::valueBoundaryCoeffs
template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
{
return tmp<Field<Type> >
(
@@ -144,7 +142,8 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientInternalCoeffs() const
template<class Type>
-tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
{
return tmp<Field<Type> >
(
@@ -153,8 +152,4 @@ tmp<Field<Type> > zeroGradientFvPatchField<Type>::gradientBoundaryCoeffs() const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index 9090ec02bb..2e404f3a4a 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -26,15 +26,10 @@ License
#include "cyclicFvPatchField.H"
#include "transformField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -46,59 +41,59 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
(
- const cyclicFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- coupledFvPatchField<Type>(ptf, p, iF, mapper),
+ coupledFvPatchField<Type>(p, iF, dict),
cyclicPatch_(refCast<const cyclicFvPatch>(p))
{
- if (!isA<cyclicFvPatch>(this->patch()))
+ if (!isA<cyclicFvPatch>(p))
{
- FatalErrorInFunction
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << " patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< exit(FatalIOError);
}
+
+ this->evaluate(Pstream::blocking);
}
template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
(
+ const cyclicFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- coupledFvPatchField<Type>(p, iF, dict),
+ coupledFvPatchField<Type>(ptf, p, iF, mapper),
cyclicPatch_(refCast<const cyclicFvPatch>(p))
{
- if (!isA<cyclicFvPatch>(p))
+ if (!isA<cyclicFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << " patch type '" << p.type()
+ FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
<< " in file " << this->dimensionedInternalField().objectPath()
<< exit(FatalIOError);
}
-
- this->evaluate(Pstream::blocking);
}
template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
(
const cyclicFvPatchField<Type>& ptf
)
@@ -110,7 +105,7 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
template<class Type>
-cyclicFvPatchField<Type>::cyclicFvPatchField
+Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
(
const cyclicFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -124,7 +119,8 @@ cyclicFvPatchField<Type>::cyclicFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
+Foam::tmp<Foam::Field<Type> >
+Foam::cyclicFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
const labelUList& nbrFaceCells =
@@ -157,8 +153,8 @@ tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
template<class Type>
-const cyclicFvPatchField<Type>& cyclicFvPatchField<Type>::neighbourPatchField()
-const
+const Foam::cyclicFvPatchField<Type>&
+Foam::cyclicFvPatchField<Type>::neighbourPatchField() const
{
const GeometricField<Type, fvPatchField, volMesh>& fld =
static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
@@ -174,7 +170,7 @@ const
template<class Type>
-void cyclicFvPatchField<Type>::updateInterfaceMatrix
+void Foam::cyclicFvPatchField<Type>::updateInterfaceMatrix
(
scalarField& result,
const scalarField& psiInternal,
@@ -202,7 +198,7 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
template<class Type>
-void cyclicFvPatchField<Type>::updateInterfaceMatrix
+void Foam::cyclicFvPatchField<Type>::updateInterfaceMatrix
(
Field<Type>& result,
const Field<Type>& psiInternal,
@@ -229,14 +225,10 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
template<class Type>
-void cyclicFvPatchField<Type>::write(Ostream& os) const
+void Foam::cyclicFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
index 9f828449ad..a8d4712b16 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "nonuniformTransformCyclicFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
nonuniformTransformCyclicFvPatchField
(
const fvPatch& p,
@@ -45,34 +40,34 @@ nonuniformTransformCyclicFvPatchField
template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
nonuniformTransformCyclicFvPatchField
(
- const nonuniformTransformCyclicFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- cyclicFvPatchField<Type>(ptf, p, iF, mapper)
+ cyclicFvPatchField<Type>(p, iF, dict)
{}
template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
nonuniformTransformCyclicFvPatchField
(
+ const nonuniformTransformCyclicFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- cyclicFvPatchField<Type>(p, iF, dict)
+ cyclicFvPatchField<Type>(ptf, p, iF, mapper)
{}
template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
nonuniformTransformCyclicFvPatchField
(
const nonuniformTransformCyclicFvPatchField<Type>& ptf
@@ -83,7 +78,7 @@ nonuniformTransformCyclicFvPatchField
template<class Type>
-nonuniformTransformCyclicFvPatchField<Type>::
+Foam::nonuniformTransformCyclicFvPatchField<Type>::
nonuniformTransformCyclicFvPatchField
(
const nonuniformTransformCyclicFvPatchField<Type>& ptf,
@@ -94,8 +89,4 @@ nonuniformTransformCyclicFvPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
index c6a2dc126a..4f27422ccd 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C
@@ -25,15 +25,10 @@ License
#include "symmetryFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -44,19 +39,21 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
(
- const symmetryFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper)
+ basicSymmetryFvPatchField<Type>(p, iF, dict)
{
- if (!isType<symmetryFvPatch>(this->patch()))
+ if (!isType<symmetryFvPatch>(p))
{
- FatalErrorInFunction
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "\n patch type '" << p.type()
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@@ -67,21 +64,19 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
(
+ const symmetryFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- basicSymmetryFvPatchField<Type>(p, iF, dict)
+ basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper)
{
- if (!isType<symmetryFvPatch>(p))
+ if (!isType<symmetryFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "\n patch type '" << p.type()
+ FatalErrorInFunction
<< "' not constraint type '" << typeName << "'"
<< "\n for patch " << p.name()
<< " of field " << this->dimensionedInternalField().name()
@@ -92,7 +87,7 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
(
const symmetryFvPatchField<Type>& ptf
)
@@ -102,7 +97,7 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
template<class Type>
-symmetryFvPatchField<Type>::symmetryFvPatchField
+Foam::symmetryFvPatchField<Type>::symmetryFvPatchField
(
const symmetryFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -112,8 +107,4 @@ symmetryFvPatchField<Type>::symmetryFvPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
index 00396a7090..99dad9c4d9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/freestream/freestreamFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "freestreamFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -44,20 +39,7 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
-(
- const freestreamFvPatchField<Type>& ptf,
- const fvPatch& p,
- const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
-)
-:
- inletOutletFvPatchField<Type>(ptf, p, iF, mapper)
-{}
-
-
-template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -85,7 +67,20 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
+(
+ const freestreamFvPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ inletOutletFvPatchField<Type>(ptf, p, iF, mapper)
+{}
+
+
+template<class Type>
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
(
const freestreamFvPatchField<Type>& ptf
)
@@ -95,7 +90,7 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
template<class Type>
-freestreamFvPatchField<Type>::freestreamFvPatchField
+Foam::freestreamFvPatchField<Type>::freestreamFvPatchField
(
const freestreamFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -108,7 +103,7 @@ freestreamFvPatchField<Type>::freestreamFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void freestreamFvPatchField<Type>::write(Ostream& os) const
+void Foam::freestreamFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
if (this->phiName_ != "phi")
@@ -121,8 +116,4 @@ void freestreamFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
index 5d359bc691..06047dcebd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -24,19 +24,13 @@ License
\*---------------------------------------------------------------------------*/
#include "mappedFieldFvPatchField.H"
-
#include "volFields.H"
#include "interpolationCell.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -49,36 +43,36 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
(
- const mappedFieldFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
- mappedPatchBase(p.patch(), ptf),
- mappedPatchFieldBase<Type>(*this, *this, ptf)
+ fixedValueFvPatchField<Type>(p, iF, dict),
+ mappedPatchBase(p.patch(), dict),
+ mappedPatchFieldBase<Type>(*this, *this, dict)
{}
template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
(
+ const mappedFieldFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<Type>(p, iF, dict),
- mappedPatchBase(p.patch(), dict),
- mappedPatchFieldBase<Type>(*this, *this, dict)
+ fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+ mappedPatchBase(p.patch(), ptf),
+ mappedPatchFieldBase<Type>(*this, *this, ptf)
{}
template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -118,7 +112,7 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
(
const mappedFieldFvPatchField<Type>& ptf
)
@@ -130,7 +124,7 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
template<class Type>
-mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
+Foam::mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
(
const mappedFieldFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -145,7 +139,7 @@ mappedFieldFvPatchField<Type>::mappedFieldFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void mappedFieldFvPatchField<Type>::updateCoeffs()
+void Foam::mappedFieldFvPatchField<Type>::updateCoeffs()
{
if (this->updated())
{
@@ -169,7 +163,7 @@ void mappedFieldFvPatchField<Type>::updateCoeffs()
template<class Type>
-void mappedFieldFvPatchField<Type>::write(Ostream& os) const
+void Foam::mappedFieldFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
mappedPatchBase::write(os);
@@ -178,8 +172,4 @@ void mappedFieldFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
index 0100f09730..a1a80c7342 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C
@@ -27,15 +27,10 @@ License
#include "mappedPatchBase.H"
#include "volFields.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -47,34 +42,34 @@ mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
(
- const mappedFixedValueFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
- mappedPatchFieldBase<Type>(this->mapper(p, iF), *this, ptf)
+ fixedValueFvPatchField<Type>(p, iF, dict),
+ mappedPatchFieldBase<Type>(this->mapper(p, iF), *this, dict)
{}
template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
(
+ const mappedFixedValueFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fixedValueFvPatchField<Type>(p, iF, dict),
- mappedPatchFieldBase<Type>(this->mapper(p, iF), *this, dict)
+ fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+ mappedPatchFieldBase<Type>(this->mapper(p, iF), *this, ptf)
{}
template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
(
const mappedFixedValueFvPatchField<Type>& ptf
)
@@ -85,7 +80,7 @@ mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
template<class Type>
-mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
+Foam::mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
(
const mappedFixedValueFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -99,7 +94,7 @@ mappedFixedValueFvPatchField<Type>::mappedFixedValueFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-const mappedPatchBase& mappedFixedValueFvPatchField<Type>::mapper
+const Foam::mappedPatchBase& Foam::mappedFixedValueFvPatchField<Type>::mapper
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -119,7 +114,7 @@ const mappedPatchBase& mappedFixedValueFvPatchField<Type>::mapper
template<class Type>
-void mappedFixedValueFvPatchField<Type>::updateCoeffs()
+void Foam::mappedFixedValueFvPatchField<Type>::updateCoeffs()
{
if (this->updated())
{
@@ -144,7 +139,7 @@ void mappedFixedValueFvPatchField<Type>::updateCoeffs()
template<class Type>
-void mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
mappedPatchFieldBase<Type>::write(os);
@@ -152,8 +147,4 @@ void mappedFixedValueFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
index 715586a369..141c69522e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
@@ -26,15 +26,10 @@ License
#include "oscillatingFixedValueFvPatchField.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
-scalar oscillatingFixedValueFvPatchField<Type>::currentScale() const
+Foam::scalar Foam::oscillatingFixedValueFvPatchField<Type>::currentScale() const
{
const scalar t = this->db().time().timeOutputValue();
const scalar a = amplitude_->value(t);
@@ -47,7 +42,7 @@ scalar oscillatingFixedValueFvPatchField<Type>::currentScale() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -63,25 +58,7 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
-(
- const oscillatingFixedValueFvPatchField<Type>& ptf,
- const fvPatch& p,
- const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
-)
-:
- fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
- refValue_(ptf.refValue_, mapper),
- offset_(ptf.offset_),
- amplitude_(ptf.amplitude_, false),
- frequency_(ptf.frequency_, false),
- curTimeIndex_(-1)
-{}
-
-
-template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -114,7 +91,25 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+(
+ const oscillatingFixedValueFvPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+ refValue_(ptf.refValue_, mapper),
+ offset_(ptf.offset_),
+ amplitude_(ptf.amplitude_, false),
+ frequency_(ptf.frequency_, false),
+ curTimeIndex_(-1)
+{}
+
+
+template<class Type>
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
(
const oscillatingFixedValueFvPatchField<Type>& ptf
)
@@ -129,7 +124,7 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
template<class Type>
-oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
+Foam::oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
(
const oscillatingFixedValueFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -147,7 +142,7 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::autoMap
+void Foam::oscillatingFixedValueFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -158,7 +153,7 @@ void oscillatingFixedValueFvPatchField<Type>::autoMap
template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::rmap
+void Foam::oscillatingFixedValueFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -174,7 +169,7 @@ void oscillatingFixedValueFvPatchField<Type>::rmap
template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
+void Foam::oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
{
if (this->updated())
{
@@ -197,7 +192,7 @@ void oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
template<class Type>
-void oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
{
fixedValueFvPatchField<Type>::write(os);
refValue_.writeEntry("refValue", os);
@@ -207,8 +202,4 @@ void oscillatingFixedValueFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C
index c7f30b6e10..83340f3fe5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/slip/slipFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "slipFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -44,32 +39,32 @@ slipFvPatchField<Type>::slipFvPatchField
template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
(
- const slipFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper)
+ basicSymmetryFvPatchField<Type>(p, iF, dict)
{}
template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
(
+ const slipFvPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- basicSymmetryFvPatchField<Type>(p, iF, dict)
+ basicSymmetryFvPatchField<Type>(ptf, p, iF, mapper)
{}
template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
(
const slipFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -80,7 +75,7 @@ slipFvPatchField<Type>::slipFvPatchField
template<class Type>
-slipFvPatchField<Type>::slipFvPatchField
+Foam::slipFvPatchField<Type>::slipFvPatchField
(
const slipFvPatchField<Type>& ptf
)
@@ -89,8 +84,4 @@ slipFvPatchField<Type>::slipFvPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 3e2f43965b..1ef4675d4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -27,15 +27,10 @@ License
#include "Time.H"
#include "AverageIOField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
timeVaryingMappedFixedValueFvPatchField
(
const fvPatch& p,
@@ -59,7 +54,7 @@ timeVaryingMappedFixedValueFvPatchField
template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
timeVaryingMappedFixedValueFvPatchField
(
const fvPatch& p,
@@ -121,7 +116,7 @@ timeVaryingMappedFixedValueFvPatchField
template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
timeVaryingMappedFixedValueFvPatchField
(
const timeVaryingMappedFixedValueFvPatchField<Type>& ptf,
@@ -148,7 +143,7 @@ timeVaryingMappedFixedValueFvPatchField
template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
timeVaryingMappedFixedValueFvPatchField
(
const timeVaryingMappedFixedValueFvPatchField<Type>& ptf
@@ -172,7 +167,7 @@ timeVaryingMappedFixedValueFvPatchField
template<class Type>
-timeVaryingMappedFixedValueFvPatchField<Type>::
+Foam::timeVaryingMappedFixedValueFvPatchField<Type>::
timeVaryingMappedFixedValueFvPatchField
(
const timeVaryingMappedFixedValueFvPatchField<Type>& ptf,
@@ -199,7 +194,7 @@ timeVaryingMappedFixedValueFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -218,7 +213,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::rmap
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -240,7 +235,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::rmap
template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
{
// Initialise
if (mapperPtr_.empty())
@@ -451,7 +446,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
{
if (this->updated())
{
@@ -556,7 +551,10 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::updateCoeffs()
template<class Type>
-void timeVaryingMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
+void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::write
+(
+ Ostream& os
+) const
{
fvPatchField<Type>::write(os);
os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
@@ -589,8 +587,4 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index 4ad86d3c3f..55a3cda1db 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "turbulentInletFvPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF
@@ -49,25 +44,7 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
-(
- const turbulentInletFvPatchField<Type>& ptf,
- const fvPatch& p,
- const DimensionedField<Type, volMesh>& iF,
- const fvPatchFieldMapper& mapper
-)
-:
- fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
- ranGen_(label(0)),
- fluctuationScale_(ptf.fluctuationScale_),
- referenceField_(ptf.referenceField_, mapper),
- alpha_(ptf.alpha_),
- curTimeIndex_(-1)
-{}
-
-
-template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
@@ -96,7 +73,25 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+(
+ const turbulentInletFvPatchField<Type>& ptf,
+ const fvPatch& p,
+ const DimensionedField<Type, volMesh>& iF,
+ const fvPatchFieldMapper& mapper
+)
+:
+ fixedValueFvPatchField<Type>(ptf, p, iF, mapper),
+ ranGen_(label(0)),
+ fluctuationScale_(ptf.fluctuationScale_),
+ referenceField_(ptf.referenceField_, mapper),
+ alpha_(ptf.alpha_),
+ curTimeIndex_(-1)
+{}
+
+
+template<class Type>
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
(
const turbulentInletFvPatchField<Type>& ptf
)
@@ -111,7 +106,7 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
template<class Type>
-turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
+Foam::turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
(
const turbulentInletFvPatchField<Type>& ptf,
const DimensionedField<Type, volMesh>& iF
@@ -129,7 +124,7 @@ turbulentInletFvPatchField<Type>::turbulentInletFvPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void turbulentInletFvPatchField<Type>::autoMap
+void Foam::turbulentInletFvPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -140,7 +135,7 @@ void turbulentInletFvPatchField<Type>::autoMap
template<class Type>
-void turbulentInletFvPatchField<Type>::rmap
+void Foam::turbulentInletFvPatchField<Type>::rmap
(
const fvPatchField<Type>& ptf,
const labelList& addr
@@ -156,7 +151,7 @@ void turbulentInletFvPatchField<Type>::rmap
template<class Type>
-void turbulentInletFvPatchField<Type>::updateCoeffs()
+void Foam::turbulentInletFvPatchField<Type>::updateCoeffs()
{
if (this->updated())
{
@@ -198,7 +193,7 @@ void turbulentInletFvPatchField<Type>::updateCoeffs()
template<class Type>
-void turbulentInletFvPatchField<Type>::write(Ostream& os) const
+void Foam::turbulentInletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
os.writeKeyword("fluctuationScale")
@@ -209,8 +204,4 @@ void turbulentInletFvPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index efe80d2f73..e6e1735fa1 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,11 +28,8 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
template<class Type>
-const word& fvsPatchField<Type>::calculatedType()
+const Foam::word& Foam::fvsPatchField<Type>::calculatedType()
{
return calculatedFvsPatchField<Type>::typeName;
}
@@ -40,7 +37,7 @@ const word& fvsPatchField<Type>::calculatedType()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -51,32 +48,32 @@ calculatedFvsPatchField<Type>::calculatedFvsPatchField
template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
(
- const calculatedFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvsPatchField<Type>(ptf, p, iF, mapper)
+ fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
{}
template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
(
+ const calculatedFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+ fvsPatchField<Type>(ptf, p, iF, mapper)
{}
template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
(
const calculatedFvsPatchField<Type>& ptf
)
@@ -86,7 +83,7 @@ calculatedFvsPatchField<Type>::calculatedFvsPatchField
template<class Type>
-calculatedFvsPatchField<Type>::calculatedFvsPatchField
+Foam::calculatedFvsPatchField<Type>::calculatedFvsPatchField
(
const calculatedFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -97,7 +94,8 @@ calculatedFvsPatchField<Type>::calculatedFvsPatchField
template<class Type>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::fvsPatchField<Type>::NewCalculatedType
(
const fvPatch& p
)
@@ -129,7 +127,8 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
template<class Type>
template<class Type2>
-tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::fvsPatchField<Type>::NewCalculatedType
(
const fvsPatchField<Type2>& pf
)
@@ -138,8 +137,4 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
index 0a619f50a4..13cc738613 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "coupledFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -44,7 +39,7 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
@@ -56,32 +51,32 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
(
- const coupledFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvsPatchField<Type>(ptf, p, iF, mapper)
+ fvsPatchField<Type>(p, iF, dict)
{}
template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
(
+ const coupledFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvsPatchField<Type>(p, iF, dict)
+ fvsPatchField<Type>(ptf, p, iF, mapper)
{}
template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
(
const coupledFvsPatchField<Type>& ptf
)
@@ -91,7 +86,7 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
template<class Type>
-coupledFvsPatchField<Type>::coupledFvsPatchField
+Foam::coupledFvsPatchField<Type>::coupledFvsPatchField
(
const coupledFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -101,8 +96,4 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index b791dca272..cf8f46bfa3 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "fixedValueFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -44,32 +39,32 @@ fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
(
- const fixedValueFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvsPatchField<Type>(ptf, p, iF, mapper)
+ fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
{}
template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
(
+ const fixedValueFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+ fvsPatchField<Type>(ptf, p, iF, mapper)
{}
template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
(
const fixedValueFvsPatchField<Type>& ptf
)
@@ -79,7 +74,7 @@ fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
template<class Type>
-fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
+Foam::fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
(
const fixedValueFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -92,7 +87,8 @@ fixedValueFvsPatchField<Type>::fixedValueFvsPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueInternalCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::valueInternalCoeffs
(
const tmp<scalarField>&
) const
@@ -105,7 +101,8 @@ tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueInternalCoeffs
template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
(
const tmp<scalarField>&
) const
@@ -115,21 +112,19 @@ tmp<Field<Type> > fixedValueFvsPatchField<Type>::valueBoundaryCoeffs
template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::gradientInternalCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::gradientInternalCoeffs() const
{
return -pTraits<Type>::one*this->patch().deltaCoeffs();
}
template<class Type>
-tmp<Field<Type> > fixedValueFvsPatchField<Type>::gradientBoundaryCoeffs() const
+Foam::tmp<Foam::Field<Type> >
+Foam::fixedValueFvsPatchField<Type>::gradientBoundaryCoeffs() const
{
return this->patch().deltaCoeffs()*(*this);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
index acef68f928..84182ccdfc 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
@@ -25,15 +25,10 @@ License
#include "slicedFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
@@ -48,7 +43,7 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -59,36 +54,36 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
(
- const slicedFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvsPatchField<Type>(ptf, p, iF, mapper)
+ fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
{
NotImplemented;
}
template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
(
+ const slicedFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvsPatchField<Type>(p, iF, Field<Type>("value", dict, p.size()))
+ fvsPatchField<Type>(ptf, p, iF, mapper)
{
NotImplemented;
}
template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
(
const slicedFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -100,8 +95,10 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
UList<Type>::operator=(ptf);
}
+
template<class Type>
-tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone() const
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::slicedFvsPatchField<Type>::clone() const
{
return tmp<fvsPatchField<Type> >
(
@@ -111,7 +108,7 @@ tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone() const
template<class Type>
-slicedFvsPatchField<Type>::slicedFvsPatchField
+Foam::slicedFvsPatchField<Type>::slicedFvsPatchField
(
const slicedFvsPatchField<Type>& ptf
)
@@ -129,7 +126,8 @@ slicedFvsPatchField<Type>::slicedFvsPatchField
template<class Type>
-tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone
+Foam::tmp<Foam::fvsPatchField<Type> >
+Foam::slicedFvsPatchField<Type>::clone
(
const DimensionedField<Type, surfaceMesh>& iF
) const
@@ -142,7 +140,7 @@ tmp<fvsPatchField<Type> > slicedFvsPatchField<Type>::clone
template<class Type>
-slicedFvsPatchField<Type>::~slicedFvsPatchField<Type>()
+Foam::slicedFvsPatchField<Type>::~slicedFvsPatchField()
{
// Set the fvsPatchField storage pointer to NULL before its destruction
// to protect the field it a slice of.
@@ -150,8 +148,4 @@ slicedFvsPatchField<Type>::~slicedFvsPatchField<Type>()
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
index 6134ed61fa..15fe2d9df7 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
@@ -25,15 +25,10 @@ License
#include "cyclicFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -45,54 +40,54 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
(
- const cyclicFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- coupledFvsPatchField<Type>(ptf, p, iF, mapper),
+ coupledFvsPatchField<Type>(p, iF, dict),
cyclicPatch_(refCast<const cyclicFvPatch>(p))
{
- if (!isA<cyclicFvPatch>(this->patch()))
+ if (!isA<cyclicFvPatch>(p))
{
- FatalErrorInFunction
- << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "patch " << this->patch().index() << " not cyclic type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
}
}
template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
(
+ const cyclicFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- coupledFvsPatchField<Type>(p, iF, dict),
+ coupledFvsPatchField<Type>(ptf, p, iF, mapper),
cyclicPatch_(refCast<const cyclicFvPatch>(p))
{
- if (!isA<cyclicFvPatch>(p))
+ if (!isA<cyclicFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "patch " << this->patch().index() << " not cyclic type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
+ FatalErrorInFunction
+ << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
}
}
template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
(
const cyclicFvsPatchField<Type>& ptf
)
@@ -103,7 +98,7 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
template<class Type>
-cyclicFvsPatchField<Type>::cyclicFvsPatchField
+Foam::cyclicFvsPatchField<Type>::cyclicFvsPatchField
(
const cyclicFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -114,8 +109,4 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
index 1e2425befb..8caad80e69 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclicSlip/cyclicSlipFvsPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "cyclicSlipFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -44,32 +39,32 @@ cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
(
- const cyclicSlipFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- cyclicFvsPatchField<Type>(ptf, p, iF, mapper)
+ cyclicFvsPatchField<Type>(p, iF, dict)
{}
template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
(
+ const cyclicSlipFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- cyclicFvsPatchField<Type>(p, iF, dict)
+ cyclicFvsPatchField<Type>(ptf, p, iF, mapper)
{}
template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
(
const cyclicSlipFvsPatchField<Type>& ptf
)
@@ -79,7 +74,7 @@ cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
template<class Type>
-cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
+Foam::cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
(
const cyclicSlipFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -89,8 +84,4 @@ cyclicSlipFvsPatchField<Type>::cyclicSlipFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
index 3af9ea3168..160d3e9365 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C
@@ -27,15 +27,10 @@ License
#include "fvPatchFieldMapper.H"
#include "surfaceMesh.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -46,52 +41,52 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
(
- const emptyFvsPatchField<Type>&,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper&
+ const dictionary& dict
)
:
fvsPatchField<Type>(p, iF, Field<Type>(0))
{
- if (!isType<emptyFvPatch>(this->patch()))
+ if (!isType<emptyFvPatch>(p))
{
- FatalErrorInFunction
- << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "patch " << this->patch().index() << " not empty type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
}
}
template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
(
+ const emptyFvsPatchField<Type>&,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper&
)
:
fvsPatchField<Type>(p, iF, Field<Type>(0))
{
- if (!isType<emptyFvPatch>(p))
+ if (!isType<emptyFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "patch " << this->patch().index() << " not empty type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
+ FatalErrorInFunction
+ << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
}
}
template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
(
const emptyFvsPatchField<Type>& ptf
)
@@ -106,7 +101,7 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
template<class Type>
-emptyFvsPatchField<Type>::emptyFvsPatchField
+Foam::emptyFvsPatchField<Type>::emptyFvsPatchField
(
const emptyFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -116,8 +111,4 @@ emptyFvsPatchField<Type>::emptyFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
index 8540298cf0..ed83712884 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "nonuniformTransformCyclicFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
nonuniformTransformCyclicFvsPatchField
(
const fvPatch& p,
@@ -45,34 +40,34 @@ nonuniformTransformCyclicFvsPatchField
template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
nonuniformTransformCyclicFvsPatchField
(
- const nonuniformTransformCyclicFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- cyclicFvsPatchField<Type>(ptf, p, iF, mapper)
+ cyclicFvsPatchField<Type>(p, iF, dict)
{}
template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
nonuniformTransformCyclicFvsPatchField
(
+ const nonuniformTransformCyclicFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- cyclicFvsPatchField<Type>(p, iF, dict)
+ cyclicFvsPatchField<Type>(ptf, p, iF, mapper)
{}
template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
nonuniformTransformCyclicFvsPatchField
(
const nonuniformTransformCyclicFvsPatchField<Type>& ptf
@@ -83,7 +78,7 @@ nonuniformTransformCyclicFvsPatchField
template<class Type>
-nonuniformTransformCyclicFvsPatchField<Type>::
+Foam::nonuniformTransformCyclicFvsPatchField<Type>::
nonuniformTransformCyclicFvsPatchField
(
const nonuniformTransformCyclicFvsPatchField<Type>& ptf,
@@ -94,8 +89,4 @@ nonuniformTransformCyclicFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
index 68eaf04816..a6fa161790 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.C
@@ -25,15 +25,10 @@ License
#include "processorFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -45,7 +40,7 @@ processorFvsPatchField<Type>::processorFvsPatchField
template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
@@ -57,56 +52,55 @@ processorFvsPatchField<Type>::processorFvsPatchField
{}
-// Construct by mapping given processorFvsPatchField<Type>
template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
(
- const processorFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- coupledFvsPatchField<Type>(ptf, p, iF, mapper),
+ coupledFvsPatchField<Type>(p, iF, dict),
procPatch_(refCast<const processorFvPatch>(p))
{
- if (!isType<processorFvPatch>(this->patch()))
+ if (!isType<processorFvPatch>(p))
{
- FatalErrorInFunction
- << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "patch " << this->patch().index() << " not processor type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
}
}
template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
(
+ const processorFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- coupledFvsPatchField<Type>(p, iF, dict),
+ coupledFvsPatchField<Type>(ptf, p, iF, mapper),
procPatch_(refCast<const processorFvPatch>(p))
{
- if (!isType<processorFvPatch>(p))
+ if (!isType<processorFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "patch " << this->patch().index() << " not processor type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
+ FatalErrorInFunction
+ << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
}
}
template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
(
const processorFvsPatchField<Type>& ptf
)
@@ -117,7 +111,7 @@ processorFvsPatchField<Type>::processorFvsPatchField
template<class Type>
-processorFvsPatchField<Type>::processorFvsPatchField
+Foam::processorFvsPatchField<Type>::processorFvsPatchField
(
const processorFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -131,12 +125,8 @@ processorFvsPatchField<Type>::processorFvsPatchField
// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
template<class Type>
-processorFvsPatchField<Type>::~processorFvsPatchField()
+Foam::processorFvsPatchField<Type>::~processorFvsPatchField()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
index e633442aca..0cfa469404 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.C
@@ -25,15 +25,10 @@ License
#include "processorCyclicFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -45,7 +40,7 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
@@ -57,56 +52,55 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
{}
-// Construct by mapping given processorCyclicFvsPatchField<Type>
template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
(
- const processorCyclicFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- coupledFvsPatchField<Type>(ptf, p, iF, mapper),
+ coupledFvsPatchField<Type>(p, iF, dict),
procPatch_(refCast<const processorCyclicFvPatch>(p))
{
- if (!isType<processorCyclicFvPatch>(this->patch()))
+ if (!isType<processorCyclicFvPatch>(p))
{
- FatalErrorInFunction
- << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "patch " << this->patch().index() << " not processor type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
}
}
template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
(
+ const processorCyclicFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- coupledFvsPatchField<Type>(p, iF, dict),
+ coupledFvsPatchField<Type>(ptf, p, iF, mapper),
procPatch_(refCast<const processorCyclicFvPatch>(p))
{
- if (!isType<processorCyclicFvPatch>(p))
+ if (!isType<processorCyclicFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "patch " << this->patch().index() << " not processor type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
+ FatalErrorInFunction
+ << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
}
}
template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
(
const processorCyclicFvsPatchField<Type>& ptf
)
@@ -117,7 +111,7 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
template<class Type>
-processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
+Foam::processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
(
const processorCyclicFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -131,12 +125,8 @@ processorCyclicFvsPatchField<Type>::processorCyclicFvsPatchField
// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
template<class Type>
-processorCyclicFvsPatchField<Type>::~processorCyclicFvsPatchField()
+Foam::processorCyclicFvsPatchField<Type>::~processorCyclicFvsPatchField()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
index 104052a54b..fef8848e67 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetry/symmetryFvsPatchField.C
@@ -25,15 +25,10 @@ License
#include "symmetryFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -44,52 +39,52 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
(
- const symmetryFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvsPatchField<Type>(ptf, p, iF, mapper)
+ fvsPatchField<Type>(p, iF, dict)
{
- if (!isType<symmetryFvPatch>(this->patch()))
+ if (!isType<symmetryFvPatch>(p))
{
- FatalErrorInFunction
- << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "patch " << this->patch().index() << " not symmetry type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
}
}
template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
(
+ const symmetryFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvsPatchField<Type>(p, iF, dict)
+ fvsPatchField<Type>(ptf, p, iF, mapper)
{
- if (!isType<symmetryFvPatch>(p))
+ if (!isType<symmetryFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "patch " << this->patch().index() << " not symmetry type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
+ FatalErrorInFunction
+ << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
}
}
template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
(
const symmetryFvsPatchField<Type>& ptf
)
@@ -99,7 +94,7 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
template<class Type>
-symmetryFvsPatchField<Type>::symmetryFvsPatchField
+Foam::symmetryFvsPatchField<Type>::symmetryFvsPatchField
(
const symmetryFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -109,8 +104,4 @@ symmetryFvsPatchField<Type>::symmetryFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
index ade5b53c0e..c1d2d3d3c5 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/symmetryPlane/symmetryPlaneFvsPatchField.C
@@ -25,15 +25,10 @@ License
#include "symmetryPlaneFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -44,52 +39,52 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
(
- const symmetryPlaneFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvsPatchField<Type>(ptf, p, iF, mapper)
+ fvsPatchField<Type>(p, iF, dict)
{
- if (!isType<symmetryPlaneFvPatch>(this->patch()))
+ if (!isType<symmetryPlaneFvPatch>(p))
{
- FatalErrorInFunction
- << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "patch " << this->patch().index() << " not symmetryPlane type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
}
}
template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
(
+ const symmetryPlaneFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvsPatchField<Type>(p, iF, dict)
+ fvsPatchField<Type>(ptf, p, iF, mapper)
{
- if (!isType<symmetryPlaneFvPatch>(p))
+ if (!isType<symmetryPlaneFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "patch " << this->patch().index() << " not symmetryPlane type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
+ FatalErrorInFunction
+ << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
}
}
template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
(
const symmetryPlaneFvsPatchField<Type>& ptf
)
@@ -99,7 +94,7 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
template<class Type>
-symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
+Foam::symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
(
const symmetryPlaneFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -109,8 +104,4 @@ symmetryPlaneFvsPatchField<Type>::symmetryPlaneFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
index ec31c57f1b..5c5ada449e 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/wedge/wedgeFvsPatchField.C
@@ -25,15 +25,10 @@ License
#include "wedgeFvsPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -44,52 +39,52 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
(
- const wedgeFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const fvPatchFieldMapper& mapper
+ const dictionary& dict
)
:
- fvsPatchField<Type>(ptf, p, iF, mapper)
+ fvsPatchField<Type>(p, iF, dict)
{
- if (!isType<wedgeFvPatch>(this->patch()))
+ if (!isType<wedgeFvPatch>(p))
{
- FatalErrorInFunction
- << "Field type does not correspond to patch type for patch "
- << this->patch().index() << "." << endl
- << "Field type: " << typeName << endl
- << "Patch type: " << this->patch().type()
- << exit(FatalError);
+ FatalIOErrorInFunction
+ (
+ dict
+ ) << "patch " << this->patch().index() << " not wedge type. "
+ << "Patch type = " << p.type()
+ << exit(FatalIOError);
}
}
template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
(
+ const wedgeFvsPatchField<Type>& ptf,
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
- const dictionary& dict
+ const fvPatchFieldMapper& mapper
)
:
- fvsPatchField<Type>(p, iF, dict)
+ fvsPatchField<Type>(ptf, p, iF, mapper)
{
- if (!isType<wedgeFvPatch>(p))
+ if (!isType<wedgeFvPatch>(this->patch()))
{
- FatalIOErrorInFunction
- (
- dict
- ) << "patch " << this->patch().index() << " not wedge type. "
- << "Patch type = " << p.type()
- << exit(FatalIOError);
+ FatalErrorInFunction
+ << "Field type does not correspond to patch type for patch "
+ << this->patch().index() << "." << endl
+ << "Field type: " << typeName << endl
+ << "Patch type: " << this->patch().type()
+ << exit(FatalError);
}
}
template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
(
const wedgeFvsPatchField<Type>& ptf
)
@@ -99,7 +94,7 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
template<class Type>
-wedgeFvsPatchField<Type>::wedgeFvsPatchField
+Foam::wedgeFvsPatchField<Type>::wedgeFvsPatchField
(
const wedgeFvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -109,8 +104,4 @@ wedgeFvsPatchField<Type>::wedgeFvsPatchField
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 713f876c7d..cb0276cc7c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -28,15 +28,10 @@ License
#include "fvMesh.H"
#include "fvPatchFieldMapper.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF
@@ -49,7 +44,7 @@ fvsPatchField<Type>::fvsPatchField
template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
@@ -63,7 +58,7 @@ fvsPatchField<Type>::fvsPatchField
template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
(
const fvsPatchField<Type>& ptf,
const fvPatch& p,
@@ -78,7 +73,7 @@ fvsPatchField<Type>::fvsPatchField
template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
(
const fvPatch& p,
const DimensionedField<Type, surfaceMesh>& iF,
@@ -108,7 +103,7 @@ fvsPatchField<Type>::fvsPatchField
template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
(
const fvsPatchField<Type>& ptf
)
@@ -120,7 +115,7 @@ fvsPatchField<Type>::fvsPatchField
template<class Type>
-fvsPatchField<Type>::fvsPatchField
+Foam::fvsPatchField<Type>::fvsPatchField
(
const fvsPatchField<Type>& ptf,
const DimensionedField<Type, surfaceMesh>& iF
@@ -135,14 +130,14 @@ fvsPatchField<Type>::fvsPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-const objectRegistry& fvsPatchField<Type>::db() const
+const Foam::objectRegistry& Foam::fvsPatchField<Type>::db() const
{
return patch_.boundaryMesh().mesh();
}
template<class Type>
-void fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
+void Foam::fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
{
if (&patch_ != &(ptf.patch_))
{
@@ -153,9 +148,8 @@ void fvsPatchField<Type>::check(const fvsPatchField<Type>& ptf) const
}
-// Map from self
template<class Type>
-void fvsPatchField<Type>::autoMap
+void Foam::fvsPatchField<Type>::autoMap
(
const fvPatchFieldMapper& m
)
@@ -164,9 +158,8 @@ void fvsPatchField<Type>::autoMap
}
-// Reverse-map the given fvsPatchField onto this fvsPatchField
template<class Type>
-void fvsPatchField<Type>::rmap
+void Foam::fvsPatchField<Type>::rmap
(
const fvsPatchField<Type>& ptf,
const labelList& addr
@@ -176,9 +169,8 @@ void fvsPatchField<Type>::rmap
}
-// Write
template<class Type>
-void fvsPatchField<Type>::write(Ostream& os) const
+void Foam::fvsPatchField<Type>::write(Ostream& os) const
{
os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
this->writeEntry("value", os);
@@ -188,7 +180,7 @@ void fvsPatchField<Type>::write(Ostream& os) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Type>
-void fvsPatchField<Type>::operator=
+void Foam::fvsPatchField<Type>::operator=
(
const UList<Type>& ul
)
@@ -198,7 +190,7 @@ void fvsPatchField<Type>::operator=
template<class Type>
-void fvsPatchField<Type>::operator=
+void Foam::fvsPatchField<Type>::operator=
(
const fvsPatchField<Type>& ptf
)
@@ -209,7 +201,7 @@ void fvsPatchField<Type>::operator=
template<class Type>
-void fvsPatchField<Type>::operator+=
+void Foam::fvsPatchField<Type>::operator+=
(
const fvsPatchField<Type>& ptf
)
@@ -220,7 +212,7 @@ void fvsPatchField<Type>::operator+=
template<class Type>
-void fvsPatchField<Type>::operator-=
+void Foam::fvsPatchField<Type>::operator-=
(
const fvsPatchField<Type>& ptf
)
@@ -231,7 +223,7 @@ void fvsPatchField<Type>::operator-=
template<class Type>
-void fvsPatchField<Type>::operator*=
+void Foam::fvsPatchField<Type>::operator*=
(
const fvsPatchField<scalar>& ptf
)
@@ -248,7 +240,7 @@ void fvsPatchField<Type>::operator*=
template<class Type>
-void fvsPatchField<Type>::operator/=
+void Foam::fvsPatchField<Type>::operator/=
(
const fvsPatchField<scalar>& ptf
)
@@ -264,7 +256,7 @@ void fvsPatchField<Type>::operator/=
template<class Type>
-void fvsPatchField<Type>::operator+=
+void Foam::fvsPatchField<Type>::operator+=
(
const Field<Type>& tf
)
@@ -274,7 +266,7 @@ void fvsPatchField<Type>::operator+=
template<class Type>
-void fvsPatchField<Type>::operator-=
+void Foam::fvsPatchField<Type>::operator-=
(
const Field<Type>& tf
)
@@ -284,7 +276,7 @@ void fvsPatchField<Type>::operator-=
template<class Type>
-void fvsPatchField<Type>::operator*=
+void Foam::fvsPatchField<Type>::operator*=
(
const scalarField& tf
)
@@ -294,7 +286,7 @@ void fvsPatchField<Type>::operator*=
template<class Type>
-void fvsPatchField<Type>::operator/=
+void Foam::fvsPatchField<Type>::operator/=
(
const scalarField& tf
)
@@ -304,7 +296,7 @@ void fvsPatchField<Type>::operator/=
template<class Type>
-void fvsPatchField<Type>::operator=
+void Foam::fvsPatchField<Type>::operator=
(
const Type& t
)
@@ -314,7 +306,7 @@ void fvsPatchField<Type>::operator=
template<class Type>
-void fvsPatchField<Type>::operator+=
+void Foam::fvsPatchField<Type>::operator+=
(
const Type& t
)
@@ -324,7 +316,7 @@ void fvsPatchField<Type>::operator+=
template<class Type>
-void fvsPatchField<Type>::operator-=
+void Foam::fvsPatchField<Type>::operator-=
(
const Type& t
)
@@ -334,7 +326,7 @@ void fvsPatchField<Type>::operator-=
template<class Type>
-void fvsPatchField<Type>::operator*=
+void Foam::fvsPatchField<Type>::operator*=
(
const scalar s
)
@@ -344,7 +336,7 @@ void fvsPatchField<Type>::operator*=
template<class Type>
-void fvsPatchField<Type>::operator/=
+void Foam::fvsPatchField<Type>::operator/=
(
const scalar s
)
@@ -353,9 +345,8 @@ void fvsPatchField<Type>::operator/=
}
-// Force an assignment, overriding fixedValue status
template<class Type>
-void fvsPatchField<Type>::operator==
+void Foam::fvsPatchField<Type>::operator==
(
const fvsPatchField<Type>& ptf
)
@@ -365,7 +356,7 @@ void fvsPatchField<Type>::operator==
template<class Type>
-void fvsPatchField<Type>::operator==
+void Foam::fvsPatchField<Type>::operator==
(
const Field<Type>& tf
)
@@ -375,7 +366,7 @@ void fvsPatchField<Type>::operator==
template<class Type>
-void fvsPatchField<Type>::operator==
+void Foam::fvsPatchField<Type>::operator==
(
const Type& t
)
@@ -387,7 +378,7 @@ void fvsPatchField<Type>::operator==
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
template<class Type>
-Ostream& operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
+Foam::Ostream& Foam::operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
{
ptf.write(os);
@@ -399,10 +390,6 @@ Ostream& operator<<(Ostream& os, const fvsPatchField<Type>& ptf)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-# include "fvsPatchFieldNew.C"
+#include "fvsPatchFieldNew.C"
// ************************************************************************* //
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index 08b254e658..bb7598b26a 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -26,15 +26,10 @@ License
#include "genericPointPatchField.H"
#include "pointPatchFieldMapper.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF
@@ -47,7 +42,7 @@ genericPointPatchField<Type>::genericPointPatchField
template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
(
const pointPatch& p,
const DimensionedField<Type, pointMesh>& iF,
@@ -308,7 +303,7 @@ genericPointPatchField<Type>::genericPointPatchField
template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
(
const genericPointPatchField<Type>& ptf,
const pointPatch& p,
@@ -393,7 +388,7 @@ genericPointPatchField<Type>::genericPointPatchField
template<class Type>
-genericPointPatchField<Type>::genericPointPatchField
+Foam::genericPointPatchField<Type>::genericPointPatchField
(
const genericPointPatchField<Type>& ptf,
const DimensionedField<Type, pointMesh>& iF
@@ -413,7 +408,7 @@ genericPointPatchField<Type>::genericPointPatchField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-void genericPointPatchField<Type>::autoMap
+void Foam::genericPointPatchField<Type>::autoMap
(
const pointPatchFieldMapper& m
)
@@ -471,7 +466,7 @@ void genericPointPatchField<Type>::autoMap
template<class Type>
-void genericPointPatchField<Type>::rmap
+void Foam::genericPointPatchField<Type>::rmap
(
const pointPatchField<Type>& ptf,
const labelList& addr
@@ -563,7 +558,7 @@ void genericPointPatchField<Type>::rmap
template<class Type>
-void genericPointPatchField<Type>::write(Ostream& os) const
+void Foam::genericPointPatchField<Type>::write(Ostream& os) const
{
os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
@@ -614,8 +609,4 @@ void genericPointPatchField<Type>::write(Ostream& os) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
index 4e3b6745ec..8ee5b49f04 100644
--- a/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
+++ b/src/mesh/autoMesh/autoHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,15 +25,10 @@ License
#include "zeroFixedValuePointPatchField.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
zeroFixedValuePointPatchField
(
const pointPatch& p,
@@ -45,7 +40,7 @@ zeroFixedValuePointPatchField
template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
zeroFixedValuePointPatchField
(
const pointPatch& p,
@@ -60,7 +55,7 @@ zeroFixedValuePointPatchField
template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
zeroFixedValuePointPatchField
(
const zeroFixedValuePointPatchField<Type>& ptf,
@@ -77,7 +72,7 @@ zeroFixedValuePointPatchField
template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
zeroFixedValuePointPatchField
(
const zeroFixedValuePointPatchField<Type>& ptf
@@ -88,7 +83,7 @@ zeroFixedValuePointPatchField
template<class Type>
-zeroFixedValuePointPatchField<Type>::
+Foam::zeroFixedValuePointPatchField<Type>::
zeroFixedValuePointPatchField
(
const zeroFixedValuePointPatchField<Type>& ptf,
@@ -102,8 +97,4 @@ zeroFixedValuePointPatchField
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
--
GitLab