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 -mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField +Foam::mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +42,21 @@ mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField template -mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField +Foam::mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + transformFvPatchField(p, iF), + refValue_("refValue", dict, p.size()), + valueFraction_("valueFraction", dict, p.size()) +{} + + +template +Foam::mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField ( const mixedFixedValueSlipFvPatchField& ptf, const fvPatch& p, @@ -62,21 +71,7 @@ mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField template -mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - transformFvPatchField(p, iF), - refValue_("refValue", dict, p.size()), - valueFraction_("valueFraction", dict, p.size()) -{} - - -template -mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField +Foam::mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField ( const mixedFixedValueSlipFvPatchField& ptf ) @@ -86,8 +81,9 @@ mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField valueFraction_(ptf.valueFraction_) {} + template -mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField +Foam::mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField ( const mixedFixedValueSlipFvPatchField& ptf, const DimensionedField& iF @@ -101,9 +97,8 @@ mixedFixedValueSlipFvPatchField::mixedFixedValueSlipFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Map from self template -void mixedFixedValueSlipFvPatchField::autoMap +void Foam::mixedFixedValueSlipFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -114,9 +109,8 @@ void mixedFixedValueSlipFvPatchField::autoMap } -// Reverse-map the given fvPatchField onto this fvPatchField template -void mixedFixedValueSlipFvPatchField::rmap +void Foam::mixedFixedValueSlipFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -132,9 +126,9 @@ void mixedFixedValueSlipFvPatchField::rmap } -// Return gradient at boundary template -tmp > mixedFixedValueSlipFvPatchField::snGrad() const +Foam::tmp > +Foam::mixedFixedValueSlipFvPatchField::snGrad() const { tmp nHat = this->patch().nf(); Field pif(this->patchInternalField()); @@ -147,9 +141,11 @@ tmp > mixedFixedValueSlipFvPatchField::snGrad() const } -// Evaluate the field on the patch template -void mixedFixedValueSlipFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::mixedFixedValueSlipFvPatchField::evaluate +( + const Pstream::commsTypes +) { if (!this->updated()) { @@ -170,10 +166,9 @@ void mixedFixedValueSlipFvPatchField::evaluate(const Pstream::commsTypes) } -// Return defining fields template -tmp > -mixedFixedValueSlipFvPatchField::snGradTransformDiag() const +Foam::tmp > +Foam::mixedFixedValueSlipFvPatchField::snGradTransformDiag() const { vectorField nHat(this->patch().nf()); vectorField diag(nHat.size()); @@ -189,9 +184,8 @@ mixedFixedValueSlipFvPatchField::snGradTransformDiag() const } -// Write template -void mixedFixedValueSlipFvPatchField::write(Ostream& os) const +void Foam::mixedFixedValueSlipFvPatchField::write(Ostream& os) const { transformFvPatchField::write(os); refValue_.writeEntry("refValue", os); @@ -199,8 +193,4 @@ void mixedFixedValueSlipFvPatchField::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 -const word& pointPatchField::calculatedType() +const Foam::word& Foam::pointPatchField::calculatedType() { return calculatedPointPatchField::typeName; } @@ -40,7 +37,7 @@ const word& pointPatchField::calculatedType() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -calculatedPointPatchField::calculatedPointPatchField +Foam::calculatedPointPatchField::calculatedPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -51,7 +48,7 @@ calculatedPointPatchField::calculatedPointPatchField template -calculatedPointPatchField::calculatedPointPatchField +Foam::calculatedPointPatchField::calculatedPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -63,7 +60,7 @@ calculatedPointPatchField::calculatedPointPatchField template -calculatedPointPatchField::calculatedPointPatchField +Foam::calculatedPointPatchField::calculatedPointPatchField ( const calculatedPointPatchField& ptf, const pointPatch& p, @@ -76,7 +73,7 @@ calculatedPointPatchField::calculatedPointPatchField template -calculatedPointPatchField::calculatedPointPatchField +Foam::calculatedPointPatchField::calculatedPointPatchField ( const calculatedPointPatchField& ptf, const DimensionedField& iF @@ -88,8 +85,8 @@ calculatedPointPatchField::calculatedPointPatchField template template -autoPtr > -pointPatchField::NewCalculatedType +Foam::autoPtr > +Foam::pointPatchField::NewCalculatedType ( const pointPatchField& pf ) @@ -122,8 +119,4 @@ pointPatchField::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 -coupledPointPatchField::coupledPointPatchField +Foam::coupledPointPatchField::coupledPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -44,7 +39,7 @@ coupledPointPatchField::coupledPointPatchField template -coupledPointPatchField::coupledPointPatchField +Foam::coupledPointPatchField::coupledPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -56,7 +51,7 @@ coupledPointPatchField::coupledPointPatchField template -coupledPointPatchField::coupledPointPatchField +Foam::coupledPointPatchField::coupledPointPatchField ( const coupledPointPatchField& ptf, const pointPatch& p, @@ -69,7 +64,7 @@ coupledPointPatchField::coupledPointPatchField template -coupledPointPatchField::coupledPointPatchField +Foam::coupledPointPatchField::coupledPointPatchField ( const coupledPointPatchField& ptf, const DimensionedField& iF @@ -79,8 +74,4 @@ coupledPointPatchField::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 -fixedValuePointPatchField::fixedValuePointPatchField +Foam::fixedValuePointPatchField::fixedValuePointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -45,7 +40,7 @@ fixedValuePointPatchField::fixedValuePointPatchField template -fixedValuePointPatchField::fixedValuePointPatchField +Foam::fixedValuePointPatchField::fixedValuePointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -58,7 +53,7 @@ fixedValuePointPatchField::fixedValuePointPatchField template -fixedValuePointPatchField::fixedValuePointPatchField +Foam::fixedValuePointPatchField::fixedValuePointPatchField ( const fixedValuePointPatchField& ptf, const pointPatch& p, @@ -71,7 +66,7 @@ fixedValuePointPatchField::fixedValuePointPatchField template -fixedValuePointPatchField::fixedValuePointPatchField +Foam::fixedValuePointPatchField::fixedValuePointPatchField ( const fixedValuePointPatchField& ptf, const DimensionedField& iF @@ -81,8 +76,4 @@ fixedValuePointPatchField::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 -zeroGradientPointPatchField::zeroGradientPointPatchField +Foam::zeroGradientPointPatchField::zeroGradientPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -44,7 +39,7 @@ zeroGradientPointPatchField::zeroGradientPointPatchField template -zeroGradientPointPatchField::zeroGradientPointPatchField +Foam::zeroGradientPointPatchField::zeroGradientPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -56,7 +51,7 @@ zeroGradientPointPatchField::zeroGradientPointPatchField template -zeroGradientPointPatchField::zeroGradientPointPatchField +Foam::zeroGradientPointPatchField::zeroGradientPointPatchField ( const zeroGradientPointPatchField& ptf, const pointPatch& p, @@ -69,7 +64,7 @@ zeroGradientPointPatchField::zeroGradientPointPatchField template -zeroGradientPointPatchField::zeroGradientPointPatchField +Foam::zeroGradientPointPatchField::zeroGradientPointPatchField ( const zeroGradientPointPatchField& ptf, const DimensionedField& iF @@ -79,8 +74,4 @@ zeroGradientPointPatchField::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 -emptyPointPatchField::emptyPointPatchField +Foam::emptyPointPatchField::emptyPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -44,7 +39,7 @@ emptyPointPatchField::emptyPointPatchField template -emptyPointPatchField::emptyPointPatchField +Foam::emptyPointPatchField::emptyPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -66,7 +61,7 @@ emptyPointPatchField::emptyPointPatchField template -emptyPointPatchField::emptyPointPatchField +Foam::emptyPointPatchField::emptyPointPatchField ( const emptyPointPatchField& ptf, const pointPatch& p, @@ -89,7 +84,7 @@ emptyPointPatchField::emptyPointPatchField template -emptyPointPatchField::emptyPointPatchField +Foam::emptyPointPatchField::emptyPointPatchField ( const emptyPointPatchField& ptf, const DimensionedField& iF @@ -99,8 +94,4 @@ emptyPointPatchField::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 -processorPointPatchField::processorPointPatchField +Foam::processorPointPatchField::processorPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -46,7 +41,7 @@ processorPointPatchField::processorPointPatchField template -processorPointPatchField::processorPointPatchField +Foam::processorPointPatchField::processorPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -59,7 +54,7 @@ processorPointPatchField::processorPointPatchField template -processorPointPatchField::processorPointPatchField +Foam::processorPointPatchField::processorPointPatchField ( const processorPointPatchField& ptf, const pointPatch& p, @@ -73,7 +68,7 @@ processorPointPatchField::processorPointPatchField template -processorPointPatchField::processorPointPatchField +Foam::processorPointPatchField::processorPointPatchField ( const processorPointPatchField& ptf, const DimensionedField& iF @@ -87,12 +82,8 @@ processorPointPatchField::processorPointPatchField // * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // template -processorPointPatchField::~processorPointPatchField() +Foam::processorPointPatchField::~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 -symmetryPointPatchField::symmetryPointPatchField +Foam::symmetryPointPatchField::symmetryPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -44,7 +39,7 @@ symmetryPointPatchField::symmetryPointPatchField template -symmetryPointPatchField::symmetryPointPatchField +Foam::symmetryPointPatchField::symmetryPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -66,7 +61,7 @@ symmetryPointPatchField::symmetryPointPatchField template -symmetryPointPatchField::symmetryPointPatchField +Foam::symmetryPointPatchField::symmetryPointPatchField ( const symmetryPointPatchField& ptf, const pointPatch& p, @@ -89,7 +84,7 @@ symmetryPointPatchField::symmetryPointPatchField template -symmetryPointPatchField::symmetryPointPatchField +Foam::symmetryPointPatchField::symmetryPointPatchField ( const symmetryPointPatchField& ptf, const DimensionedField& iF @@ -99,8 +94,4 @@ symmetryPointPatchField::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 -symmetryPlanePointPatchField::symmetryPlanePointPatchField +Foam::symmetryPlanePointPatchField::symmetryPlanePointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -45,7 +40,7 @@ symmetryPlanePointPatchField::symmetryPlanePointPatchField template -symmetryPlanePointPatchField::symmetryPlanePointPatchField +Foam::symmetryPlanePointPatchField::symmetryPlanePointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -68,7 +63,7 @@ symmetryPlanePointPatchField::symmetryPlanePointPatchField template -symmetryPlanePointPatchField::symmetryPlanePointPatchField +Foam::symmetryPlanePointPatchField::symmetryPlanePointPatchField ( const symmetryPlanePointPatchField& ptf, const pointPatch& p, @@ -92,7 +87,7 @@ symmetryPlanePointPatchField::symmetryPlanePointPatchField template -symmetryPlanePointPatchField::symmetryPlanePointPatchField +Foam::symmetryPlanePointPatchField::symmetryPlanePointPatchField ( const symmetryPlanePointPatchField& ptf, const DimensionedField& iF @@ -128,8 +123,4 @@ void Foam::symmetryPlanePointPatchField::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 -slipPointPatchField::slipPointPatchField +Foam::slipPointPatchField::slipPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -44,7 +39,7 @@ slipPointPatchField::slipPointPatchField template -slipPointPatchField::slipPointPatchField +Foam::slipPointPatchField::slipPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -56,7 +51,7 @@ slipPointPatchField::slipPointPatchField template -slipPointPatchField::slipPointPatchField +Foam::slipPointPatchField::slipPointPatchField ( const slipPointPatchField& ptf, const pointPatch& p, @@ -69,7 +64,7 @@ slipPointPatchField::slipPointPatchField template -slipPointPatchField::slipPointPatchField +Foam::slipPointPatchField::slipPointPatchField ( const slipPointPatchField& ptf, const DimensionedField& iF @@ -79,8 +74,4 @@ slipPointPatchField::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 -uniformFixedValuePointPatchField:: +Foam::uniformFixedValuePointPatchField:: uniformFixedValuePointPatchField ( const pointPatch& p, @@ -46,7 +41,7 @@ uniformFixedValuePointPatchField template -uniformFixedValuePointPatchField:: +Foam::uniformFixedValuePointPatchField:: uniformFixedValuePointPatchField ( const pointPatch& p, @@ -73,7 +68,7 @@ uniformFixedValuePointPatchField template -uniformFixedValuePointPatchField:: +Foam::uniformFixedValuePointPatchField:: uniformFixedValuePointPatchField ( const uniformFixedValuePointPatchField& ptf, @@ -92,7 +87,7 @@ uniformFixedValuePointPatchField template -uniformFixedValuePointPatchField:: +Foam::uniformFixedValuePointPatchField:: uniformFixedValuePointPatchField ( const uniformFixedValuePointPatchField& ptf @@ -104,7 +99,7 @@ uniformFixedValuePointPatchField template -uniformFixedValuePointPatchField:: +Foam::uniformFixedValuePointPatchField:: uniformFixedValuePointPatchField ( const uniformFixedValuePointPatchField& ptf, @@ -123,7 +118,7 @@ uniformFixedValuePointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void uniformFixedValuePointPatchField::updateCoeffs() +void Foam::uniformFixedValuePointPatchField::updateCoeffs() { if (this->updated()) { @@ -138,7 +133,7 @@ void uniformFixedValuePointPatchField::updateCoeffs() template -void uniformFixedValuePointPatchField:: +void Foam::uniformFixedValuePointPatchField:: 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 -pointPatchField::pointPatchField +Foam::pointPatchField::pointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -49,7 +44,7 @@ pointPatchField::pointPatchField template -pointPatchField::pointPatchField +Foam::pointPatchField::pointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -80,7 +75,7 @@ Foam::pointPatchField::pointPatchField template -pointPatchField::pointPatchField +Foam::pointPatchField::pointPatchField ( const pointPatchField& ptf ) @@ -93,7 +88,7 @@ pointPatchField::pointPatchField template -pointPatchField::pointPatchField +Foam::pointPatchField::pointPatchField ( const pointPatchField& ptf, const DimensionedField& iF @@ -109,14 +104,14 @@ pointPatchField::pointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -const objectRegistry& pointPatchField::db() const +const Foam::objectRegistry& Foam::pointPatchField::db() const { return patch_.boundaryMesh().mesh()(); } template -void pointPatchField::write(Ostream& os) const +void Foam::pointPatchField::write(Ostream& os) const { os.writeKeyword("type") << type() << token::END_STATEMENT << nl; @@ -129,7 +124,8 @@ void pointPatchField::write(Ostream& os) const template -tmp > pointPatchField::patchInternalField() const +Foam::tmp > +Foam::pointPatchField::patchInternalField() const { return patchInternalField(internalField()); } @@ -137,7 +133,8 @@ tmp > pointPatchField::patchInternalField() const template template -tmp > pointPatchField::patchInternalField +Foam::tmp > +Foam::pointPatchField::patchInternalField ( const Field& iF, const labelList& meshPoints @@ -159,7 +156,8 @@ tmp > pointPatchField::patchInternalField template template -tmp > pointPatchField::patchInternalField +Foam::tmp > +Foam::pointPatchField::patchInternalField ( const Field& iF ) const @@ -170,7 +168,7 @@ tmp > pointPatchField::patchInternalField template template -void pointPatchField::addToInternalField +void Foam::pointPatchField::addToInternalField ( Field& iF, const Field& pF @@ -207,7 +205,7 @@ void pointPatchField::addToInternalField template template -void pointPatchField::addToInternalField +void Foam::pointPatchField::addToInternalField ( Field& iF, const Field& pF, @@ -246,7 +244,7 @@ void pointPatchField::addToInternalField template template -void pointPatchField::setInInternalField +void Foam::pointPatchField::setInInternalField ( Field& iF, const Field& pF, @@ -281,7 +279,7 @@ void pointPatchField::setInInternalField template template -void pointPatchField::setInInternalField +void Foam::pointPatchField::setInInternalField ( Field& iF, const Field& pF @@ -292,7 +290,7 @@ void pointPatchField::setInInternalField template -void pointPatchField::evaluate(const Pstream::commsTypes) +void Foam::pointPatchField::evaluate(const Pstream::commsTypes) { if (!updated_) { @@ -306,7 +304,7 @@ void pointPatchField::evaluate(const Pstream::commsTypes) // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // template -Ostream& operator<< +Foam::Ostream& Foam::operator<< ( Ostream& os, const pointPatchField& 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 -void kqRWallFunctionFvPatchField::checkType() +void Foam::kqRWallFunctionFvPatchField::checkType() { if (!isA(this->patch())) { @@ -54,7 +49,7 @@ void kqRWallFunctionFvPatchField::checkType() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField +Foam::kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -67,7 +62,21 @@ kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField template -kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField +Foam::kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + zeroGradientFvPatchField(p, iF, dict) +{ + checkType(); +} + + +template +Foam::kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField ( const kqRWallFunctionFvPatchField& ptf, const fvPatch& p, @@ -82,21 +91,7 @@ kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField template -kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - zeroGradientFvPatchField(p, iF, dict) -{ - checkType(); -} - - -template -kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField +Foam::kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField ( const kqRWallFunctionFvPatchField& tkqrwfpf ) @@ -108,7 +103,7 @@ kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField template -kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField +Foam::kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField ( const kqRWallFunctionFvPatchField& tkqrwfpf, const DimensionedField& iF @@ -123,7 +118,7 @@ kqRWallFunctionFvPatchField::kqRWallFunctionFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void kqRWallFunctionFvPatchField::evaluate +void Foam::kqRWallFunctionFvPatchField::evaluate ( const Pstream::commsTypes commsType ) @@ -133,15 +128,11 @@ void kqRWallFunctionFvPatchField::evaluate template -void kqRWallFunctionFvPatchField::write(Ostream& os) const +void Foam::kqRWallFunctionFvPatchField::write(Ostream& os) const { zeroGradientFvPatchField::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 -fixedGradientFvPatchField::fixedGradientFvPatchField +Foam::fixedGradientFvPatchField::fixedGradientFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -46,7 +41,22 @@ fixedGradientFvPatchField::fixedGradientFvPatchField template -fixedGradientFvPatchField::fixedGradientFvPatchField +Foam::fixedGradientFvPatchField::fixedGradientFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvPatchField(p, iF, dict), + gradient_("gradient", dict, p.size()) +{ + evaluate(); +} + + +template +Foam::fixedGradientFvPatchField::fixedGradientFvPatchField ( const fixedGradientFvPatchField& ptf, const fvPatch& p, @@ -70,22 +80,7 @@ fixedGradientFvPatchField::fixedGradientFvPatchField template -fixedGradientFvPatchField::fixedGradientFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvPatchField(p, iF, dict), - gradient_("gradient", dict, p.size()) -{ - evaluate(); -} - - -template -fixedGradientFvPatchField::fixedGradientFvPatchField +Foam::fixedGradientFvPatchField::fixedGradientFvPatchField ( const fixedGradientFvPatchField& ptf ) @@ -96,7 +91,7 @@ fixedGradientFvPatchField::fixedGradientFvPatchField template -fixedGradientFvPatchField::fixedGradientFvPatchField +Foam::fixedGradientFvPatchField::fixedGradientFvPatchField ( const fixedGradientFvPatchField& ptf, const DimensionedField& iF @@ -110,7 +105,7 @@ fixedGradientFvPatchField::fixedGradientFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void fixedGradientFvPatchField::autoMap +void Foam::fixedGradientFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -121,7 +116,7 @@ void fixedGradientFvPatchField::autoMap template -void fixedGradientFvPatchField::rmap +void Foam::fixedGradientFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -137,7 +132,7 @@ void fixedGradientFvPatchField::rmap template -void fixedGradientFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::fixedGradientFvPatchField::evaluate(const Pstream::commsTypes) { if (!this->updated()) { @@ -154,7 +149,8 @@ void fixedGradientFvPatchField::evaluate(const Pstream::commsTypes) template -tmp > fixedGradientFvPatchField::valueInternalCoeffs +Foam::tmp > +Foam::fixedGradientFvPatchField::valueInternalCoeffs ( const tmp& ) const @@ -164,7 +160,8 @@ tmp > fixedGradientFvPatchField::valueInternalCoeffs template -tmp > fixedGradientFvPatchField::valueBoundaryCoeffs +Foam::tmp > +Foam::fixedGradientFvPatchField::valueBoundaryCoeffs ( const tmp& ) const @@ -174,8 +171,8 @@ tmp > fixedGradientFvPatchField::valueBoundaryCoeffs template -tmp > fixedGradientFvPatchField:: -gradientInternalCoeffs() const +Foam::tmp > +Foam::fixedGradientFvPatchField::gradientInternalCoeffs() const { return tmp > ( @@ -185,23 +182,19 @@ gradientInternalCoeffs() const template -tmp > fixedGradientFvPatchField:: -gradientBoundaryCoeffs() const +Foam::tmp > +Foam::fixedGradientFvPatchField::gradientBoundaryCoeffs() const { return gradient(); } template -void fixedGradientFvPatchField::write(Ostream& os) const +void Foam::fixedGradientFvPatchField::write(Ostream& os) const { fvPatchField::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 -fixedValueFvPatchField::fixedValueFvPatchField +Foam::fixedValueFvPatchField::fixedValueFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,7 @@ fixedValueFvPatchField::fixedValueFvPatchField template -fixedValueFvPatchField::fixedValueFvPatchField +Foam::fixedValueFvPatchField::fixedValueFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -56,7 +51,7 @@ fixedValueFvPatchField::fixedValueFvPatchField template -fixedValueFvPatchField::fixedValueFvPatchField +Foam::fixedValueFvPatchField::fixedValueFvPatchField ( const fixedValueFvPatchField& ptf, const fvPatch& p, @@ -79,7 +74,7 @@ fixedValueFvPatchField::fixedValueFvPatchField template -fixedValueFvPatchField::fixedValueFvPatchField +Foam::fixedValueFvPatchField::fixedValueFvPatchField ( const fixedValueFvPatchField& ptf ) @@ -89,7 +84,7 @@ fixedValueFvPatchField::fixedValueFvPatchField template -fixedValueFvPatchField::fixedValueFvPatchField +Foam::fixedValueFvPatchField::fixedValueFvPatchField ( const fixedValueFvPatchField& ptf, const DimensionedField& iF @@ -102,7 +97,8 @@ fixedValueFvPatchField::fixedValueFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp > fixedValueFvPatchField::valueInternalCoeffs +Foam::tmp > +Foam::fixedValueFvPatchField::valueInternalCoeffs ( const tmp& ) const @@ -115,7 +111,8 @@ tmp > fixedValueFvPatchField::valueInternalCoeffs template -tmp > fixedValueFvPatchField::valueBoundaryCoeffs +Foam::tmp > +Foam::fixedValueFvPatchField::valueBoundaryCoeffs ( const tmp& ) const @@ -125,29 +122,27 @@ tmp > fixedValueFvPatchField::valueBoundaryCoeffs template -tmp > fixedValueFvPatchField::gradientInternalCoeffs() const +Foam::tmp > +Foam::fixedValueFvPatchField::gradientInternalCoeffs() const { return -pTraits::one*this->patch().deltaCoeffs(); } template -tmp > fixedValueFvPatchField::gradientBoundaryCoeffs() const +Foam::tmp > +Foam::fixedValueFvPatchField::gradientBoundaryCoeffs() const { return this->patch().deltaCoeffs()*(*this); } template -void fixedValueFvPatchField::write(Ostream& os) const +void Foam::fixedValueFvPatchField::write(Ostream& os) const { fvPatchField::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 -mixedFvPatchField::mixedFvPatchField +Foam::mixedFvPatchField::mixedFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +42,24 @@ mixedFvPatchField::mixedFvPatchField template -mixedFvPatchField::mixedFvPatchField +Foam::mixedFvPatchField::mixedFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvPatchField(p, iF, dict), + refValue_("refValue", dict, p.size()), + refGrad_("refGradient", dict, p.size()), + valueFraction_("valueFraction", dict, p.size()) +{ + evaluate(); +} + + +template +Foam::mixedFvPatchField::mixedFvPatchField ( const mixedFvPatchField& ptf, const fvPatch& p, @@ -73,24 +85,7 @@ mixedFvPatchField::mixedFvPatchField template -mixedFvPatchField::mixedFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvPatchField(p, iF, dict), - refValue_("refValue", dict, p.size()), - refGrad_("refGradient", dict, p.size()), - valueFraction_("valueFraction", dict, p.size()) -{ - evaluate(); -} - - -template -mixedFvPatchField::mixedFvPatchField +Foam::mixedFvPatchField::mixedFvPatchField ( const mixedFvPatchField& ptf ) @@ -103,7 +98,7 @@ mixedFvPatchField::mixedFvPatchField template -mixedFvPatchField::mixedFvPatchField +Foam::mixedFvPatchField::mixedFvPatchField ( const mixedFvPatchField& ptf, const DimensionedField& iF @@ -119,7 +114,7 @@ mixedFvPatchField::mixedFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void mixedFvPatchField::autoMap +void Foam::mixedFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -132,7 +127,7 @@ void mixedFvPatchField::autoMap template -void mixedFvPatchField::rmap +void Foam::mixedFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -150,7 +145,7 @@ void mixedFvPatchField::rmap template -void mixedFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::mixedFvPatchField::evaluate(const Pstream::commsTypes) { if (!this->updated()) { @@ -173,7 +168,8 @@ void mixedFvPatchField::evaluate(const Pstream::commsTypes) template -tmp > mixedFvPatchField::snGrad() const +Foam::tmp > +Foam::mixedFvPatchField::snGrad() const { return valueFraction_ @@ -184,7 +180,8 @@ tmp > mixedFvPatchField::snGrad() const template -tmp > mixedFvPatchField::valueInternalCoeffs +Foam::tmp > +Foam::mixedFvPatchField::valueInternalCoeffs ( const tmp& ) const @@ -195,7 +192,8 @@ tmp > mixedFvPatchField::valueInternalCoeffs template -tmp > mixedFvPatchField::valueBoundaryCoeffs +Foam::tmp > +Foam::mixedFvPatchField::valueBoundaryCoeffs ( const tmp& ) const @@ -207,14 +205,16 @@ tmp > mixedFvPatchField::valueBoundaryCoeffs template -tmp > mixedFvPatchField::gradientInternalCoeffs() const +Foam::tmp > +Foam::mixedFvPatchField::gradientInternalCoeffs() const { return -Type(pTraits::one)*valueFraction_*this->patch().deltaCoeffs(); } template -tmp > mixedFvPatchField::gradientBoundaryCoeffs() const +Foam::tmp > +Foam::mixedFvPatchField::gradientBoundaryCoeffs() const { return valueFraction_*this->patch().deltaCoeffs()*refValue_ @@ -223,7 +223,7 @@ tmp > mixedFvPatchField::gradientBoundaryCoeffs() const template -void mixedFvPatchField::write(Ostream& os) const +void Foam::mixedFvPatchField::write(Ostream& os) const { fvPatchField::write(os); refValue_.writeEntry("refValue", os); @@ -233,8 +233,4 @@ void mixedFvPatchField::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 -slicedFvPatchField::slicedFvPatchField +Foam::slicedFvPatchField::slicedFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -48,7 +43,7 @@ slicedFvPatchField::slicedFvPatchField template -slicedFvPatchField::slicedFvPatchField +Foam::slicedFvPatchField::slicedFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -59,7 +54,21 @@ slicedFvPatchField::slicedFvPatchField template -slicedFvPatchField::slicedFvPatchField +Foam::slicedFvPatchField::slicedFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvPatchField(p, iF, dict) +{ + NotImplemented; +} + + +template +Foam::slicedFvPatchField::slicedFvPatchField ( const slicedFvPatchField& ptf, const fvPatch& p, @@ -74,21 +83,7 @@ slicedFvPatchField::slicedFvPatchField template -slicedFvPatchField::slicedFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvPatchField(p, iF, dict) -{ - NotImplemented; -} - - -template -slicedFvPatchField::slicedFvPatchField +Foam::slicedFvPatchField::slicedFvPatchField ( const slicedFvPatchField& ptf, const DimensionedField& iF @@ -100,8 +95,10 @@ slicedFvPatchField::slicedFvPatchField UList::operator=(ptf); } + template -tmp > slicedFvPatchField::clone() const +Foam::tmp > +Foam::slicedFvPatchField::clone() const { return tmp > ( @@ -111,7 +108,7 @@ tmp > slicedFvPatchField::clone() const template -slicedFvPatchField::slicedFvPatchField +Foam::slicedFvPatchField::slicedFvPatchField ( const slicedFvPatchField& ptf ) @@ -129,7 +126,8 @@ slicedFvPatchField::slicedFvPatchField template -tmp > slicedFvPatchField::clone +Foam::tmp > +Foam::slicedFvPatchField::clone ( const DimensionedField& iF ) const @@ -142,7 +140,7 @@ tmp > slicedFvPatchField::clone template -slicedFvPatchField::~slicedFvPatchField() +Foam::slicedFvPatchField::~slicedFvPatchField() { // Set the fvPatchField storage pointer to NULL before its destruction // to protect the field it a slice of. @@ -153,7 +151,7 @@ slicedFvPatchField::~slicedFvPatchField() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp > slicedFvPatchField::snGrad() const +Foam::tmp > Foam::slicedFvPatchField::snGrad() const { NotImplemented; @@ -162,14 +160,15 @@ tmp > slicedFvPatchField::snGrad() const template -void slicedFvPatchField::updateCoeffs() +void Foam::slicedFvPatchField::updateCoeffs() { NotImplemented; } template -tmp > slicedFvPatchField::patchInternalField() const +Foam::tmp > +Foam::slicedFvPatchField::patchInternalField() const { NotImplemented; @@ -178,14 +177,15 @@ tmp > slicedFvPatchField::patchInternalField() const template -void slicedFvPatchField::patchInternalField(Field&) const +void Foam::slicedFvPatchField::patchInternalField(Field&) const { NotImplemented; } template -tmp > slicedFvPatchField::patchNeighbourField +Foam::tmp > +Foam::slicedFvPatchField::patchNeighbourField ( const Field& iField ) const @@ -197,7 +197,8 @@ tmp > slicedFvPatchField::patchNeighbourField template -tmp > slicedFvPatchField::patchNeighbourField() const +Foam::tmp > +Foam::slicedFvPatchField::patchNeighbourField() const { NotImplemented; @@ -206,7 +207,8 @@ tmp > slicedFvPatchField::patchNeighbourField() const template -tmp > slicedFvPatchField::valueInternalCoeffs +Foam::tmp > +Foam::slicedFvPatchField::valueInternalCoeffs ( const tmp& ) const @@ -218,7 +220,8 @@ tmp > slicedFvPatchField::valueInternalCoeffs template -tmp > slicedFvPatchField::valueBoundaryCoeffs +Foam::tmp > +Foam::slicedFvPatchField::valueBoundaryCoeffs ( const tmp& ) const @@ -230,7 +233,8 @@ tmp > slicedFvPatchField::valueBoundaryCoeffs template -tmp > slicedFvPatchField::gradientInternalCoeffs() const +Foam::tmp > +Foam::slicedFvPatchField::gradientInternalCoeffs() const { NotImplemented; @@ -239,7 +243,8 @@ tmp > slicedFvPatchField::gradientInternalCoeffs() const template -tmp > slicedFvPatchField::gradientBoundaryCoeffs() const +Foam::tmp > +Foam::slicedFvPatchField::gradientBoundaryCoeffs() const { NotImplemented; @@ -248,15 +253,11 @@ tmp > slicedFvPatchField::gradientBoundaryCoeffs() const template -void slicedFvPatchField::write(Ostream& os) const +void Foam::slicedFvPatchField::write(Ostream& os) const { fvPatchField::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 -zeroGradientFvPatchField::zeroGradientFvPatchField +Foam::zeroGradientFvPatchField::zeroGradientFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -45,20 +40,7 @@ zeroGradientFvPatchField::zeroGradientFvPatchField template -zeroGradientFvPatchField::zeroGradientFvPatchField -( - const zeroGradientFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fvPatchField(ptf, p, iF, mapper) -{} - - -template -zeroGradientFvPatchField::zeroGradientFvPatchField +Foam::zeroGradientFvPatchField::zeroGradientFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -72,7 +54,20 @@ zeroGradientFvPatchField::zeroGradientFvPatchField template -zeroGradientFvPatchField::zeroGradientFvPatchField +Foam::zeroGradientFvPatchField::zeroGradientFvPatchField +( + const zeroGradientFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fvPatchField(ptf, p, iF, mapper) +{} + + +template +Foam::zeroGradientFvPatchField::zeroGradientFvPatchField ( const zeroGradientFvPatchField& zgpf ) @@ -82,7 +77,7 @@ zeroGradientFvPatchField::zeroGradientFvPatchField template -zeroGradientFvPatchField::zeroGradientFvPatchField +Foam::zeroGradientFvPatchField::zeroGradientFvPatchField ( const zeroGradientFvPatchField& zgpf, const DimensionedField& iF @@ -95,7 +90,7 @@ zeroGradientFvPatchField::zeroGradientFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void zeroGradientFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::zeroGradientFvPatchField::evaluate(const Pstream::commsTypes) { if (!this->updated()) { @@ -108,7 +103,8 @@ void zeroGradientFvPatchField::evaluate(const Pstream::commsTypes) template -tmp > zeroGradientFvPatchField::valueInternalCoeffs +Foam::tmp > +Foam::zeroGradientFvPatchField::valueInternalCoeffs ( const tmp& ) const @@ -121,7 +117,8 @@ tmp > zeroGradientFvPatchField::valueInternalCoeffs template -tmp > zeroGradientFvPatchField::valueBoundaryCoeffs +Foam::tmp > +Foam::zeroGradientFvPatchField::valueBoundaryCoeffs ( const tmp& ) const @@ -134,7 +131,8 @@ tmp > zeroGradientFvPatchField::valueBoundaryCoeffs template -tmp > zeroGradientFvPatchField::gradientInternalCoeffs() const +Foam::tmp > +Foam::zeroGradientFvPatchField::gradientInternalCoeffs() const { return tmp > ( @@ -144,7 +142,8 @@ tmp > zeroGradientFvPatchField::gradientInternalCoeffs() const template -tmp > zeroGradientFvPatchField::gradientBoundaryCoeffs() const +Foam::tmp > +Foam::zeroGradientFvPatchField::gradientBoundaryCoeffs() const { return tmp > ( @@ -153,8 +152,4 @@ tmp > zeroGradientFvPatchField::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 -cyclicFvPatchField::cyclicFvPatchField +Foam::cyclicFvPatchField::cyclicFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -46,31 +41,7 @@ cyclicFvPatchField::cyclicFvPatchField template -cyclicFvPatchField::cyclicFvPatchField -( - const cyclicFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - coupledFvPatchField(ptf, p, iF, mapper), - cyclicPatch_(refCast(p)) -{ - if (!isA(this->patch())) - { - FatalErrorInFunction - << "' not constraint type '" << typeName << "'" - << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() - << exit(FatalIOError); - } -} - - -template -cyclicFvPatchField::cyclicFvPatchField +Foam::cyclicFvPatchField::cyclicFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -98,7 +69,31 @@ cyclicFvPatchField::cyclicFvPatchField template -cyclicFvPatchField::cyclicFvPatchField +Foam::cyclicFvPatchField::cyclicFvPatchField +( + const cyclicFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + coupledFvPatchField(ptf, p, iF, mapper), + cyclicPatch_(refCast(p)) +{ + if (!isA(this->patch())) + { + FatalErrorInFunction + << "' not constraint type '" << typeName << "'" + << "\n for patch " << p.name() + << " of field " << this->dimensionedInternalField().name() + << " in file " << this->dimensionedInternalField().objectPath() + << exit(FatalIOError); + } +} + + +template +Foam::cyclicFvPatchField::cyclicFvPatchField ( const cyclicFvPatchField& ptf ) @@ -110,7 +105,7 @@ cyclicFvPatchField::cyclicFvPatchField template -cyclicFvPatchField::cyclicFvPatchField +Foam::cyclicFvPatchField::cyclicFvPatchField ( const cyclicFvPatchField& ptf, const DimensionedField& iF @@ -124,7 +119,8 @@ cyclicFvPatchField::cyclicFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp > cyclicFvPatchField::patchNeighbourField() const +Foam::tmp > +Foam::cyclicFvPatchField::patchNeighbourField() const { const Field& iField = this->internalField(); const labelUList& nbrFaceCells = @@ -157,8 +153,8 @@ tmp > cyclicFvPatchField::patchNeighbourField() const template -const cyclicFvPatchField& cyclicFvPatchField::neighbourPatchField() -const +const Foam::cyclicFvPatchField& +Foam::cyclicFvPatchField::neighbourPatchField() const { const GeometricField& fld = static_cast&> @@ -174,7 +170,7 @@ const template -void cyclicFvPatchField::updateInterfaceMatrix +void Foam::cyclicFvPatchField::updateInterfaceMatrix ( scalarField& result, const scalarField& psiInternal, @@ -202,7 +198,7 @@ void cyclicFvPatchField::updateInterfaceMatrix template -void cyclicFvPatchField::updateInterfaceMatrix +void Foam::cyclicFvPatchField::updateInterfaceMatrix ( Field& result, const Field& psiInternal, @@ -229,14 +225,10 @@ void cyclicFvPatchField::updateInterfaceMatrix template -void cyclicFvPatchField::write(Ostream& os) const +void Foam::cyclicFvPatchField::write(Ostream& os) const { fvPatchField::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 -nonuniformTransformCyclicFvPatchField:: +Foam::nonuniformTransformCyclicFvPatchField:: nonuniformTransformCyclicFvPatchField ( const fvPatch& p, @@ -45,7 +40,20 @@ nonuniformTransformCyclicFvPatchField template -nonuniformTransformCyclicFvPatchField:: +Foam::nonuniformTransformCyclicFvPatchField:: +nonuniformTransformCyclicFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + cyclicFvPatchField(p, iF, dict) +{} + + +template +Foam::nonuniformTransformCyclicFvPatchField:: nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField& ptf, @@ -59,20 +67,7 @@ nonuniformTransformCyclicFvPatchField template -nonuniformTransformCyclicFvPatchField:: -nonuniformTransformCyclicFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - cyclicFvPatchField(p, iF, dict) -{} - - -template -nonuniformTransformCyclicFvPatchField:: +Foam::nonuniformTransformCyclicFvPatchField:: nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField& ptf @@ -83,7 +78,7 @@ nonuniformTransformCyclicFvPatchField template -nonuniformTransformCyclicFvPatchField:: +Foam::nonuniformTransformCyclicFvPatchField:: nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField& 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 -symmetryFvPatchField::symmetryFvPatchField +Foam::symmetryFvPatchField::symmetryFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,30 +39,7 @@ symmetryFvPatchField::symmetryFvPatchField template -symmetryFvPatchField::symmetryFvPatchField -( - const symmetryFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - basicSymmetryFvPatchField(ptf, p, iF, mapper) -{ - if (!isType(this->patch())) - { - FatalErrorInFunction - << "' not constraint type '" << typeName << "'" - << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() - << exit(FatalIOError); - } -} - - -template -symmetryFvPatchField::symmetryFvPatchField +Foam::symmetryFvPatchField::symmetryFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -92,7 +64,30 @@ symmetryFvPatchField::symmetryFvPatchField template -symmetryFvPatchField::symmetryFvPatchField +Foam::symmetryFvPatchField::symmetryFvPatchField +( + const symmetryFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + basicSymmetryFvPatchField(ptf, p, iF, mapper) +{ + if (!isType(this->patch())) + { + FatalErrorInFunction + << "' not constraint type '" << typeName << "'" + << "\n for patch " << p.name() + << " of field " << this->dimensionedInternalField().name() + << " in file " << this->dimensionedInternalField().objectPath() + << exit(FatalIOError); + } +} + + +template +Foam::symmetryFvPatchField::symmetryFvPatchField ( const symmetryFvPatchField& ptf ) @@ -102,7 +97,7 @@ symmetryFvPatchField::symmetryFvPatchField template -symmetryFvPatchField::symmetryFvPatchField +Foam::symmetryFvPatchField::symmetryFvPatchField ( const symmetryFvPatchField& ptf, const DimensionedField& iF @@ -112,8 +107,4 @@ symmetryFvPatchField::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 -freestreamFvPatchField::freestreamFvPatchField +Foam::freestreamFvPatchField::freestreamFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,20 +39,7 @@ freestreamFvPatchField::freestreamFvPatchField template -freestreamFvPatchField::freestreamFvPatchField -( - const freestreamFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - inletOutletFvPatchField(ptf, p, iF, mapper) -{} - - -template -freestreamFvPatchField::freestreamFvPatchField +Foam::freestreamFvPatchField::freestreamFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -85,7 +67,20 @@ freestreamFvPatchField::freestreamFvPatchField template -freestreamFvPatchField::freestreamFvPatchField +Foam::freestreamFvPatchField::freestreamFvPatchField +( + const freestreamFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + inletOutletFvPatchField(ptf, p, iF, mapper) +{} + + +template +Foam::freestreamFvPatchField::freestreamFvPatchField ( const freestreamFvPatchField& ptf ) @@ -95,7 +90,7 @@ freestreamFvPatchField::freestreamFvPatchField template -freestreamFvPatchField::freestreamFvPatchField +Foam::freestreamFvPatchField::freestreamFvPatchField ( const freestreamFvPatchField& ptf, const DimensionedField& iF @@ -108,7 +103,7 @@ freestreamFvPatchField::freestreamFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void freestreamFvPatchField::write(Ostream& os) const +void Foam::freestreamFvPatchField::write(Ostream& os) const { fvPatchField::write(os); if (this->phiName_ != "phi") @@ -121,8 +116,4 @@ void freestreamFvPatchField::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 -mappedFieldFvPatchField::mappedFieldFvPatchField +Foam::mappedFieldFvPatchField::mappedFieldFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -49,7 +43,21 @@ mappedFieldFvPatchField::mappedFieldFvPatchField template -mappedFieldFvPatchField::mappedFieldFvPatchField +Foam::mappedFieldFvPatchField::mappedFieldFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + mappedPatchBase(p.patch(), dict), + mappedPatchFieldBase(*this, *this, dict) +{} + + +template +Foam::mappedFieldFvPatchField::mappedFieldFvPatchField ( const mappedFieldFvPatchField& ptf, const fvPatch& p, @@ -64,21 +72,7 @@ mappedFieldFvPatchField::mappedFieldFvPatchField template -mappedFieldFvPatchField::mappedFieldFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - mappedPatchBase(p.patch(), dict), - mappedPatchFieldBase(*this, *this, dict) -{} - - -template -mappedFieldFvPatchField::mappedFieldFvPatchField +Foam::mappedFieldFvPatchField::mappedFieldFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -118,7 +112,7 @@ mappedFieldFvPatchField::mappedFieldFvPatchField template -mappedFieldFvPatchField::mappedFieldFvPatchField +Foam::mappedFieldFvPatchField::mappedFieldFvPatchField ( const mappedFieldFvPatchField& ptf ) @@ -130,7 +124,7 @@ mappedFieldFvPatchField::mappedFieldFvPatchField template -mappedFieldFvPatchField::mappedFieldFvPatchField +Foam::mappedFieldFvPatchField::mappedFieldFvPatchField ( const mappedFieldFvPatchField& ptf, const DimensionedField& iF @@ -145,7 +139,7 @@ mappedFieldFvPatchField::mappedFieldFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void mappedFieldFvPatchField::updateCoeffs() +void Foam::mappedFieldFvPatchField::updateCoeffs() { if (this->updated()) { @@ -169,7 +163,7 @@ void mappedFieldFvPatchField::updateCoeffs() template -void mappedFieldFvPatchField::write(Ostream& os) const +void Foam::mappedFieldFvPatchField::write(Ostream& os) const { fvPatchField::write(os); mappedPatchBase::write(os); @@ -178,8 +172,4 @@ void mappedFieldFvPatchField::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 -mappedFixedValueFvPatchField::mappedFixedValueFvPatchField +Foam::mappedFixedValueFvPatchField::mappedFixedValueFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +42,20 @@ mappedFixedValueFvPatchField::mappedFixedValueFvPatchField template -mappedFixedValueFvPatchField::mappedFixedValueFvPatchField +Foam::mappedFixedValueFvPatchField::mappedFixedValueFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + mappedPatchFieldBase(this->mapper(p, iF), *this, dict) +{} + + +template +Foam::mappedFixedValueFvPatchField::mappedFixedValueFvPatchField ( const mappedFixedValueFvPatchField& ptf, const fvPatch& p, @@ -61,20 +69,7 @@ mappedFixedValueFvPatchField::mappedFixedValueFvPatchField template -mappedFixedValueFvPatchField::mappedFixedValueFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - mappedPatchFieldBase(this->mapper(p, iF), *this, dict) -{} - - -template -mappedFixedValueFvPatchField::mappedFixedValueFvPatchField +Foam::mappedFixedValueFvPatchField::mappedFixedValueFvPatchField ( const mappedFixedValueFvPatchField& ptf ) @@ -85,7 +80,7 @@ mappedFixedValueFvPatchField::mappedFixedValueFvPatchField template -mappedFixedValueFvPatchField::mappedFixedValueFvPatchField +Foam::mappedFixedValueFvPatchField::mappedFixedValueFvPatchField ( const mappedFixedValueFvPatchField& ptf, const DimensionedField& iF @@ -99,7 +94,7 @@ mappedFixedValueFvPatchField::mappedFixedValueFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -const mappedPatchBase& mappedFixedValueFvPatchField::mapper +const Foam::mappedPatchBase& Foam::mappedFixedValueFvPatchField::mapper ( const fvPatch& p, const DimensionedField& iF @@ -119,7 +114,7 @@ const mappedPatchBase& mappedFixedValueFvPatchField::mapper template -void mappedFixedValueFvPatchField::updateCoeffs() +void Foam::mappedFixedValueFvPatchField::updateCoeffs() { if (this->updated()) { @@ -144,7 +139,7 @@ void mappedFixedValueFvPatchField::updateCoeffs() template -void mappedFixedValueFvPatchField::write(Ostream& os) const +void Foam::mappedFixedValueFvPatchField::write(Ostream& os) const { fvPatchField::write(os); mappedPatchFieldBase::write(os); @@ -152,8 +147,4 @@ void mappedFixedValueFvPatchField::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 -scalar oscillatingFixedValueFvPatchField::currentScale() const +Foam::scalar Foam::oscillatingFixedValueFvPatchField::currentScale() const { const scalar t = this->db().time().timeOutputValue(); const scalar a = amplitude_->value(t); @@ -47,7 +42,7 @@ scalar oscillatingFixedValueFvPatchField::currentScale() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField +Foam::oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -63,25 +58,7 @@ oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField template -oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField -( - const oscillatingFixedValueFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchField(ptf, p, iF, mapper), - refValue_(ptf.refValue_, mapper), - offset_(ptf.offset_), - amplitude_(ptf.amplitude_, false), - frequency_(ptf.frequency_, false), - curTimeIndex_(-1) -{} - - -template -oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField +Foam::oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -114,7 +91,25 @@ oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField template -oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField +Foam::oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField +( + const oscillatingFixedValueFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchField(ptf, p, iF, mapper), + refValue_(ptf.refValue_, mapper), + offset_(ptf.offset_), + amplitude_(ptf.amplitude_, false), + frequency_(ptf.frequency_, false), + curTimeIndex_(-1) +{} + + +template +Foam::oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField ( const oscillatingFixedValueFvPatchField& ptf ) @@ -129,7 +124,7 @@ oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField template -oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField +Foam::oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField ( const oscillatingFixedValueFvPatchField& ptf, const DimensionedField& iF @@ -147,7 +142,7 @@ oscillatingFixedValueFvPatchField::oscillatingFixedValueFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void oscillatingFixedValueFvPatchField::autoMap +void Foam::oscillatingFixedValueFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -158,7 +153,7 @@ void oscillatingFixedValueFvPatchField::autoMap template -void oscillatingFixedValueFvPatchField::rmap +void Foam::oscillatingFixedValueFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -174,7 +169,7 @@ void oscillatingFixedValueFvPatchField::rmap template -void oscillatingFixedValueFvPatchField::updateCoeffs() +void Foam::oscillatingFixedValueFvPatchField::updateCoeffs() { if (this->updated()) { @@ -197,7 +192,7 @@ void oscillatingFixedValueFvPatchField::updateCoeffs() template -void oscillatingFixedValueFvPatchField::write(Ostream& os) const +void Foam::oscillatingFixedValueFvPatchField::write(Ostream& os) const { fixedValueFvPatchField::write(os); refValue_.writeEntry("refValue", os); @@ -207,8 +202,4 @@ void oscillatingFixedValueFvPatchField::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 -slipFvPatchField::slipFvPatchField +Foam::slipFvPatchField::slipFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,19 @@ slipFvPatchField::slipFvPatchField template -slipFvPatchField::slipFvPatchField +Foam::slipFvPatchField::slipFvPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + basicSymmetryFvPatchField(p, iF, dict) +{} + + +template +Foam::slipFvPatchField::slipFvPatchField ( const slipFvPatchField& ptf, const fvPatch& p, @@ -57,19 +64,7 @@ slipFvPatchField::slipFvPatchField template -slipFvPatchField::slipFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - basicSymmetryFvPatchField(p, iF, dict) -{} - - -template -slipFvPatchField::slipFvPatchField +Foam::slipFvPatchField::slipFvPatchField ( const slipFvPatchField& ptf, const DimensionedField& iF @@ -80,7 +75,7 @@ slipFvPatchField::slipFvPatchField template -slipFvPatchField::slipFvPatchField +Foam::slipFvPatchField::slipFvPatchField ( const slipFvPatchField& ptf ) @@ -89,8 +84,4 @@ slipFvPatchField::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 -timeVaryingMappedFixedValueFvPatchField:: +Foam::timeVaryingMappedFixedValueFvPatchField:: timeVaryingMappedFixedValueFvPatchField ( const fvPatch& p, @@ -59,7 +54,7 @@ timeVaryingMappedFixedValueFvPatchField template -timeVaryingMappedFixedValueFvPatchField:: +Foam::timeVaryingMappedFixedValueFvPatchField:: timeVaryingMappedFixedValueFvPatchField ( const fvPatch& p, @@ -121,7 +116,7 @@ timeVaryingMappedFixedValueFvPatchField template -timeVaryingMappedFixedValueFvPatchField:: +Foam::timeVaryingMappedFixedValueFvPatchField:: timeVaryingMappedFixedValueFvPatchField ( const timeVaryingMappedFixedValueFvPatchField& ptf, @@ -148,7 +143,7 @@ timeVaryingMappedFixedValueFvPatchField template -timeVaryingMappedFixedValueFvPatchField:: +Foam::timeVaryingMappedFixedValueFvPatchField:: timeVaryingMappedFixedValueFvPatchField ( const timeVaryingMappedFixedValueFvPatchField& ptf @@ -172,7 +167,7 @@ timeVaryingMappedFixedValueFvPatchField template -timeVaryingMappedFixedValueFvPatchField:: +Foam::timeVaryingMappedFixedValueFvPatchField:: timeVaryingMappedFixedValueFvPatchField ( const timeVaryingMappedFixedValueFvPatchField& ptf, @@ -199,7 +194,7 @@ timeVaryingMappedFixedValueFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void timeVaryingMappedFixedValueFvPatchField::autoMap +void Foam::timeVaryingMappedFixedValueFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -218,7 +213,7 @@ void timeVaryingMappedFixedValueFvPatchField::autoMap template -void timeVaryingMappedFixedValueFvPatchField::rmap +void Foam::timeVaryingMappedFixedValueFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -240,7 +235,7 @@ void timeVaryingMappedFixedValueFvPatchField::rmap template -void timeVaryingMappedFixedValueFvPatchField::checkTable() +void Foam::timeVaryingMappedFixedValueFvPatchField::checkTable() { // Initialise if (mapperPtr_.empty()) @@ -451,7 +446,7 @@ void timeVaryingMappedFixedValueFvPatchField::checkTable() template -void timeVaryingMappedFixedValueFvPatchField::updateCoeffs() +void Foam::timeVaryingMappedFixedValueFvPatchField::updateCoeffs() { if (this->updated()) { @@ -556,7 +551,10 @@ void timeVaryingMappedFixedValueFvPatchField::updateCoeffs() template -void timeVaryingMappedFixedValueFvPatchField::write(Ostream& os) const +void Foam::timeVaryingMappedFixedValueFvPatchField::write +( + Ostream& os +) const { fvPatchField::write(os); os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl; @@ -589,8 +587,4 @@ void timeVaryingMappedFixedValueFvPatchField::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 -turbulentInletFvPatchField::turbulentInletFvPatchField +Foam::turbulentInletFvPatchField::turbulentInletFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -49,25 +44,7 @@ turbulentInletFvPatchField::turbulentInletFvPatchField template -turbulentInletFvPatchField::turbulentInletFvPatchField -( - const turbulentInletFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchField(ptf, p, iF, mapper), - ranGen_(label(0)), - fluctuationScale_(ptf.fluctuationScale_), - referenceField_(ptf.referenceField_, mapper), - alpha_(ptf.alpha_), - curTimeIndex_(-1) -{} - - -template -turbulentInletFvPatchField::turbulentInletFvPatchField +Foam::turbulentInletFvPatchField::turbulentInletFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -96,7 +73,25 @@ turbulentInletFvPatchField::turbulentInletFvPatchField template -turbulentInletFvPatchField::turbulentInletFvPatchField +Foam::turbulentInletFvPatchField::turbulentInletFvPatchField +( + const turbulentInletFvPatchField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchField(ptf, p, iF, mapper), + ranGen_(label(0)), + fluctuationScale_(ptf.fluctuationScale_), + referenceField_(ptf.referenceField_, mapper), + alpha_(ptf.alpha_), + curTimeIndex_(-1) +{} + + +template +Foam::turbulentInletFvPatchField::turbulentInletFvPatchField ( const turbulentInletFvPatchField& ptf ) @@ -111,7 +106,7 @@ turbulentInletFvPatchField::turbulentInletFvPatchField template -turbulentInletFvPatchField::turbulentInletFvPatchField +Foam::turbulentInletFvPatchField::turbulentInletFvPatchField ( const turbulentInletFvPatchField& ptf, const DimensionedField& iF @@ -129,7 +124,7 @@ turbulentInletFvPatchField::turbulentInletFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void turbulentInletFvPatchField::autoMap +void Foam::turbulentInletFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -140,7 +135,7 @@ void turbulentInletFvPatchField::autoMap template -void turbulentInletFvPatchField::rmap +void Foam::turbulentInletFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -156,7 +151,7 @@ void turbulentInletFvPatchField::rmap template -void turbulentInletFvPatchField::updateCoeffs() +void Foam::turbulentInletFvPatchField::updateCoeffs() { if (this->updated()) { @@ -198,7 +193,7 @@ void turbulentInletFvPatchField::updateCoeffs() template -void turbulentInletFvPatchField::write(Ostream& os) const +void Foam::turbulentInletFvPatchField::write(Ostream& os) const { fvPatchField::write(os); os.writeKeyword("fluctuationScale") @@ -209,8 +204,4 @@ void turbulentInletFvPatchField::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 -const word& fvsPatchField::calculatedType() +const Foam::word& Foam::fvsPatchField::calculatedType() { return calculatedFvsPatchField::typeName; } @@ -40,7 +37,7 @@ const word& fvsPatchField::calculatedType() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -calculatedFvsPatchField::calculatedFvsPatchField +Foam::calculatedFvsPatchField::calculatedFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -51,7 +48,19 @@ calculatedFvsPatchField::calculatedFvsPatchField template -calculatedFvsPatchField::calculatedFvsPatchField +Foam::calculatedFvsPatchField::calculatedFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, Field("value", dict, p.size())) +{} + + +template +Foam::calculatedFvsPatchField::calculatedFvsPatchField ( const calculatedFvsPatchField& ptf, const fvPatch& p, @@ -64,19 +73,7 @@ calculatedFvsPatchField::calculatedFvsPatchField template -calculatedFvsPatchField::calculatedFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, Field("value", dict, p.size())) -{} - - -template -calculatedFvsPatchField::calculatedFvsPatchField +Foam::calculatedFvsPatchField::calculatedFvsPatchField ( const calculatedFvsPatchField& ptf ) @@ -86,7 +83,7 @@ calculatedFvsPatchField::calculatedFvsPatchField template -calculatedFvsPatchField::calculatedFvsPatchField +Foam::calculatedFvsPatchField::calculatedFvsPatchField ( const calculatedFvsPatchField& ptf, const DimensionedField& iF @@ -97,7 +94,8 @@ calculatedFvsPatchField::calculatedFvsPatchField template -tmp > fvsPatchField::NewCalculatedType +Foam::tmp > +Foam::fvsPatchField::NewCalculatedType ( const fvPatch& p ) @@ -129,7 +127,8 @@ tmp > fvsPatchField::NewCalculatedType template template -tmp > fvsPatchField::NewCalculatedType +Foam::tmp > +Foam::fvsPatchField::NewCalculatedType ( const fvsPatchField& pf ) @@ -138,8 +137,4 @@ tmp > fvsPatchField::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 -coupledFvsPatchField::coupledFvsPatchField +Foam::coupledFvsPatchField::coupledFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,7 @@ coupledFvsPatchField::coupledFvsPatchField template -coupledFvsPatchField::coupledFvsPatchField +Foam::coupledFvsPatchField::coupledFvsPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -56,7 +51,19 @@ coupledFvsPatchField::coupledFvsPatchField template -coupledFvsPatchField::coupledFvsPatchField +Foam::coupledFvsPatchField::coupledFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, dict) +{} + + +template +Foam::coupledFvsPatchField::coupledFvsPatchField ( const coupledFvsPatchField& ptf, const fvPatch& p, @@ -69,19 +76,7 @@ coupledFvsPatchField::coupledFvsPatchField template -coupledFvsPatchField::coupledFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, dict) -{} - - -template -coupledFvsPatchField::coupledFvsPatchField +Foam::coupledFvsPatchField::coupledFvsPatchField ( const coupledFvsPatchField& ptf ) @@ -91,7 +86,7 @@ coupledFvsPatchField::coupledFvsPatchField template -coupledFvsPatchField::coupledFvsPatchField +Foam::coupledFvsPatchField::coupledFvsPatchField ( const coupledFvsPatchField& ptf, const DimensionedField& iF @@ -101,8 +96,4 @@ coupledFvsPatchField::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 -fixedValueFvsPatchField::fixedValueFvsPatchField +Foam::fixedValueFvsPatchField::fixedValueFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,19 @@ fixedValueFvsPatchField::fixedValueFvsPatchField template -fixedValueFvsPatchField::fixedValueFvsPatchField +Foam::fixedValueFvsPatchField::fixedValueFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, Field("value", dict, p.size())) +{} + + +template +Foam::fixedValueFvsPatchField::fixedValueFvsPatchField ( const fixedValueFvsPatchField& ptf, const fvPatch& p, @@ -57,19 +64,7 @@ fixedValueFvsPatchField::fixedValueFvsPatchField template -fixedValueFvsPatchField::fixedValueFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, Field("value", dict, p.size())) -{} - - -template -fixedValueFvsPatchField::fixedValueFvsPatchField +Foam::fixedValueFvsPatchField::fixedValueFvsPatchField ( const fixedValueFvsPatchField& ptf ) @@ -79,7 +74,7 @@ fixedValueFvsPatchField::fixedValueFvsPatchField template -fixedValueFvsPatchField::fixedValueFvsPatchField +Foam::fixedValueFvsPatchField::fixedValueFvsPatchField ( const fixedValueFvsPatchField& ptf, const DimensionedField& iF @@ -92,7 +87,8 @@ fixedValueFvsPatchField::fixedValueFvsPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp > fixedValueFvsPatchField::valueInternalCoeffs +Foam::tmp > +Foam::fixedValueFvsPatchField::valueInternalCoeffs ( const tmp& ) const @@ -105,7 +101,8 @@ tmp > fixedValueFvsPatchField::valueInternalCoeffs template -tmp > fixedValueFvsPatchField::valueBoundaryCoeffs +Foam::tmp > +Foam::fixedValueFvsPatchField::valueBoundaryCoeffs ( const tmp& ) const @@ -115,21 +112,19 @@ tmp > fixedValueFvsPatchField::valueBoundaryCoeffs template -tmp > fixedValueFvsPatchField::gradientInternalCoeffs() const +Foam::tmp > +Foam::fixedValueFvsPatchField::gradientInternalCoeffs() const { return -pTraits::one*this->patch().deltaCoeffs(); } template -tmp > fixedValueFvsPatchField::gradientBoundaryCoeffs() const +Foam::tmp > +Foam::fixedValueFvsPatchField::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 -slicedFvsPatchField::slicedFvsPatchField +Foam::slicedFvsPatchField::slicedFvsPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -48,7 +43,7 @@ slicedFvsPatchField::slicedFvsPatchField template -slicedFvsPatchField::slicedFvsPatchField +Foam::slicedFvsPatchField::slicedFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -59,7 +54,21 @@ slicedFvsPatchField::slicedFvsPatchField template -slicedFvsPatchField::slicedFvsPatchField +Foam::slicedFvsPatchField::slicedFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, Field("value", dict, p.size())) +{ + NotImplemented; +} + + +template +Foam::slicedFvsPatchField::slicedFvsPatchField ( const slicedFvsPatchField& ptf, const fvPatch& p, @@ -74,21 +83,7 @@ slicedFvsPatchField::slicedFvsPatchField template -slicedFvsPatchField::slicedFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, Field("value", dict, p.size())) -{ - NotImplemented; -} - - -template -slicedFvsPatchField::slicedFvsPatchField +Foam::slicedFvsPatchField::slicedFvsPatchField ( const slicedFvsPatchField& ptf, const DimensionedField& iF @@ -100,8 +95,10 @@ slicedFvsPatchField::slicedFvsPatchField UList::operator=(ptf); } + template -tmp > slicedFvsPatchField::clone() const +Foam::tmp > +Foam::slicedFvsPatchField::clone() const { return tmp > ( @@ -111,7 +108,7 @@ tmp > slicedFvsPatchField::clone() const template -slicedFvsPatchField::slicedFvsPatchField +Foam::slicedFvsPatchField::slicedFvsPatchField ( const slicedFvsPatchField& ptf ) @@ -129,7 +126,8 @@ slicedFvsPatchField::slicedFvsPatchField template -tmp > slicedFvsPatchField::clone +Foam::tmp > +Foam::slicedFvsPatchField::clone ( const DimensionedField& iF ) const @@ -142,7 +140,7 @@ tmp > slicedFvsPatchField::clone template -slicedFvsPatchField::~slicedFvsPatchField() +Foam::slicedFvsPatchField::~slicedFvsPatchField() { // Set the fvsPatchField storage pointer to NULL before its destruction // to protect the field it a slice of. @@ -150,8 +148,4 @@ slicedFvsPatchField::~slicedFvsPatchField() } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // 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 -cyclicFvsPatchField::cyclicFvsPatchField +Foam::cyclicFvsPatchField::cyclicFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -45,7 +40,30 @@ cyclicFvsPatchField::cyclicFvsPatchField template -cyclicFvsPatchField::cyclicFvsPatchField +Foam::cyclicFvsPatchField::cyclicFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + coupledFvsPatchField(p, iF, dict), + cyclicPatch_(refCast(p)) +{ + if (!isA(p)) + { + FatalIOErrorInFunction + ( + dict + ) << "patch " << this->patch().index() << " not cyclic type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +Foam::cyclicFvsPatchField::cyclicFvsPatchField ( const cyclicFvsPatchField& ptf, const fvPatch& p, @@ -69,30 +87,7 @@ cyclicFvsPatchField::cyclicFvsPatchField template -cyclicFvsPatchField::cyclicFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - coupledFvsPatchField(p, iF, dict), - cyclicPatch_(refCast(p)) -{ - if (!isA(p)) - { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not cyclic type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -cyclicFvsPatchField::cyclicFvsPatchField +Foam::cyclicFvsPatchField::cyclicFvsPatchField ( const cyclicFvsPatchField& ptf ) @@ -103,7 +98,7 @@ cyclicFvsPatchField::cyclicFvsPatchField template -cyclicFvsPatchField::cyclicFvsPatchField +Foam::cyclicFvsPatchField::cyclicFvsPatchField ( const cyclicFvsPatchField& ptf, const DimensionedField& iF @@ -114,8 +109,4 @@ cyclicFvsPatchField::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 -cyclicSlipFvsPatchField::cyclicSlipFvsPatchField +Foam::cyclicSlipFvsPatchField::cyclicSlipFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,19 @@ cyclicSlipFvsPatchField::cyclicSlipFvsPatchField template -cyclicSlipFvsPatchField::cyclicSlipFvsPatchField +Foam::cyclicSlipFvsPatchField::cyclicSlipFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + cyclicFvsPatchField(p, iF, dict) +{} + + +template +Foam::cyclicSlipFvsPatchField::cyclicSlipFvsPatchField ( const cyclicSlipFvsPatchField& ptf, const fvPatch& p, @@ -57,19 +64,7 @@ cyclicSlipFvsPatchField::cyclicSlipFvsPatchField template -cyclicSlipFvsPatchField::cyclicSlipFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - cyclicFvsPatchField(p, iF, dict) -{} - - -template -cyclicSlipFvsPatchField::cyclicSlipFvsPatchField +Foam::cyclicSlipFvsPatchField::cyclicSlipFvsPatchField ( const cyclicSlipFvsPatchField& ptf ) @@ -79,7 +74,7 @@ cyclicSlipFvsPatchField::cyclicSlipFvsPatchField template -cyclicSlipFvsPatchField::cyclicSlipFvsPatchField +Foam::cyclicSlipFvsPatchField::cyclicSlipFvsPatchField ( const cyclicSlipFvsPatchField& ptf, const DimensionedField& iF @@ -89,8 +84,4 @@ cyclicSlipFvsPatchField::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 -emptyFvsPatchField::emptyFvsPatchField +Foam::emptyFvsPatchField::emptyFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -46,7 +41,29 @@ emptyFvsPatchField::emptyFvsPatchField template -emptyFvsPatchField::emptyFvsPatchField +Foam::emptyFvsPatchField::emptyFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, Field(0)) +{ + if (!isType(p)) + { + FatalIOErrorInFunction + ( + dict + ) << "patch " << this->patch().index() << " not empty type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +Foam::emptyFvsPatchField::emptyFvsPatchField ( const emptyFvsPatchField&, const fvPatch& p, @@ -69,29 +86,7 @@ emptyFvsPatchField::emptyFvsPatchField template -emptyFvsPatchField::emptyFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, Field(0)) -{ - if (!isType(p)) - { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not empty type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -emptyFvsPatchField::emptyFvsPatchField +Foam::emptyFvsPatchField::emptyFvsPatchField ( const emptyFvsPatchField& ptf ) @@ -106,7 +101,7 @@ emptyFvsPatchField::emptyFvsPatchField template -emptyFvsPatchField::emptyFvsPatchField +Foam::emptyFvsPatchField::emptyFvsPatchField ( const emptyFvsPatchField& ptf, const DimensionedField& iF @@ -116,8 +111,4 @@ emptyFvsPatchField::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 -nonuniformTransformCyclicFvsPatchField:: +Foam::nonuniformTransformCyclicFvsPatchField:: nonuniformTransformCyclicFvsPatchField ( const fvPatch& p, @@ -45,7 +40,20 @@ nonuniformTransformCyclicFvsPatchField template -nonuniformTransformCyclicFvsPatchField:: +Foam::nonuniformTransformCyclicFvsPatchField:: +nonuniformTransformCyclicFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + cyclicFvsPatchField(p, iF, dict) +{} + + +template +Foam::nonuniformTransformCyclicFvsPatchField:: nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField& ptf, @@ -59,20 +67,7 @@ nonuniformTransformCyclicFvsPatchField template -nonuniformTransformCyclicFvsPatchField:: -nonuniformTransformCyclicFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - cyclicFvsPatchField(p, iF, dict) -{} - - -template -nonuniformTransformCyclicFvsPatchField:: +Foam::nonuniformTransformCyclicFvsPatchField:: nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField& ptf @@ -83,7 +78,7 @@ nonuniformTransformCyclicFvsPatchField template -nonuniformTransformCyclicFvsPatchField:: +Foam::nonuniformTransformCyclicFvsPatchField:: nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField& 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 -processorFvsPatchField::processorFvsPatchField +Foam::processorFvsPatchField::processorFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -45,7 +40,7 @@ processorFvsPatchField::processorFvsPatchField template -processorFvsPatchField::processorFvsPatchField +Foam::processorFvsPatchField::processorFvsPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -57,9 +52,31 @@ processorFvsPatchField::processorFvsPatchField {} -// Construct by mapping given processorFvsPatchField template -processorFvsPatchField::processorFvsPatchField +Foam::processorFvsPatchField::processorFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + coupledFvsPatchField(p, iF, dict), + procPatch_(refCast(p)) +{ + if (!isType(p)) + { + FatalIOErrorInFunction + ( + dict + ) << "patch " << this->patch().index() << " not processor type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +Foam::processorFvsPatchField::processorFvsPatchField ( const processorFvsPatchField& ptf, const fvPatch& p, @@ -83,30 +100,7 @@ processorFvsPatchField::processorFvsPatchField template -processorFvsPatchField::processorFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - coupledFvsPatchField(p, iF, dict), - procPatch_(refCast(p)) -{ - if (!isType(p)) - { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not processor type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -processorFvsPatchField::processorFvsPatchField +Foam::processorFvsPatchField::processorFvsPatchField ( const processorFvsPatchField& ptf ) @@ -117,7 +111,7 @@ processorFvsPatchField::processorFvsPatchField template -processorFvsPatchField::processorFvsPatchField +Foam::processorFvsPatchField::processorFvsPatchField ( const processorFvsPatchField& ptf, const DimensionedField& iF @@ -131,12 +125,8 @@ processorFvsPatchField::processorFvsPatchField // * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // template -processorFvsPatchField::~processorFvsPatchField() +Foam::processorFvsPatchField::~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 -processorCyclicFvsPatchField::processorCyclicFvsPatchField +Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -45,7 +40,7 @@ processorCyclicFvsPatchField::processorCyclicFvsPatchField template -processorCyclicFvsPatchField::processorCyclicFvsPatchField +Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -57,9 +52,31 @@ processorCyclicFvsPatchField::processorCyclicFvsPatchField {} -// Construct by mapping given processorCyclicFvsPatchField template -processorCyclicFvsPatchField::processorCyclicFvsPatchField +Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + coupledFvsPatchField(p, iF, dict), + procPatch_(refCast(p)) +{ + if (!isType(p)) + { + FatalIOErrorInFunction + ( + dict + ) << "patch " << this->patch().index() << " not processor type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField ( const processorCyclicFvsPatchField& ptf, const fvPatch& p, @@ -83,30 +100,7 @@ processorCyclicFvsPatchField::processorCyclicFvsPatchField template -processorCyclicFvsPatchField::processorCyclicFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - coupledFvsPatchField(p, iF, dict), - procPatch_(refCast(p)) -{ - if (!isType(p)) - { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not processor type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -processorCyclicFvsPatchField::processorCyclicFvsPatchField +Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField ( const processorCyclicFvsPatchField& ptf ) @@ -117,7 +111,7 @@ processorCyclicFvsPatchField::processorCyclicFvsPatchField template -processorCyclicFvsPatchField::processorCyclicFvsPatchField +Foam::processorCyclicFvsPatchField::processorCyclicFvsPatchField ( const processorCyclicFvsPatchField& ptf, const DimensionedField& iF @@ -131,12 +125,8 @@ processorCyclicFvsPatchField::processorCyclicFvsPatchField // * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // template -processorCyclicFvsPatchField::~processorCyclicFvsPatchField() +Foam::processorCyclicFvsPatchField::~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 -symmetryFvsPatchField::symmetryFvsPatchField +Foam::symmetryFvsPatchField::symmetryFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,29 @@ symmetryFvsPatchField::symmetryFvsPatchField template -symmetryFvsPatchField::symmetryFvsPatchField +Foam::symmetryFvsPatchField::symmetryFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, dict) +{ + if (!isType(p)) + { + FatalIOErrorInFunction + ( + dict + ) << "patch " << this->patch().index() << " not symmetry type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +Foam::symmetryFvsPatchField::symmetryFvsPatchField ( const symmetryFvsPatchField& ptf, const fvPatch& p, @@ -67,29 +84,7 @@ symmetryFvsPatchField::symmetryFvsPatchField template -symmetryFvsPatchField::symmetryFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, dict) -{ - if (!isType(p)) - { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not symmetry type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -symmetryFvsPatchField::symmetryFvsPatchField +Foam::symmetryFvsPatchField::symmetryFvsPatchField ( const symmetryFvsPatchField& ptf ) @@ -99,7 +94,7 @@ symmetryFvsPatchField::symmetryFvsPatchField template -symmetryFvsPatchField::symmetryFvsPatchField +Foam::symmetryFvsPatchField::symmetryFvsPatchField ( const symmetryFvsPatchField& ptf, const DimensionedField& iF @@ -109,8 +104,4 @@ symmetryFvsPatchField::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 -symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField +Foam::symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,29 @@ symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField template -symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField +Foam::symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, dict) +{ + if (!isType(p)) + { + FatalIOErrorInFunction + ( + dict + ) << "patch " << this->patch().index() << " not symmetryPlane type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +Foam::symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField ( const symmetryPlaneFvsPatchField& ptf, const fvPatch& p, @@ -67,29 +84,7 @@ symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField template -symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, dict) -{ - if (!isType(p)) - { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not symmetryPlane type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField +Foam::symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField ( const symmetryPlaneFvsPatchField& ptf ) @@ -99,7 +94,7 @@ symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField template -symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField +Foam::symmetryPlaneFvsPatchField::symmetryPlaneFvsPatchField ( const symmetryPlaneFvsPatchField& ptf, const DimensionedField& iF @@ -109,8 +104,4 @@ symmetryPlaneFvsPatchField::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 -wedgeFvsPatchField::wedgeFvsPatchField +Foam::wedgeFvsPatchField::wedgeFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +39,29 @@ wedgeFvsPatchField::wedgeFvsPatchField template -wedgeFvsPatchField::wedgeFvsPatchField +Foam::wedgeFvsPatchField::wedgeFvsPatchField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fvsPatchField(p, iF, dict) +{ + if (!isType(p)) + { + FatalIOErrorInFunction + ( + dict + ) << "patch " << this->patch().index() << " not wedge type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +Foam::wedgeFvsPatchField::wedgeFvsPatchField ( const wedgeFvsPatchField& ptf, const fvPatch& p, @@ -67,29 +84,7 @@ wedgeFvsPatchField::wedgeFvsPatchField template -wedgeFvsPatchField::wedgeFvsPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fvsPatchField(p, iF, dict) -{ - if (!isType(p)) - { - FatalIOErrorInFunction - ( - dict - ) << "patch " << this->patch().index() << " not wedge type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -wedgeFvsPatchField::wedgeFvsPatchField +Foam::wedgeFvsPatchField::wedgeFvsPatchField ( const wedgeFvsPatchField& ptf ) @@ -99,7 +94,7 @@ wedgeFvsPatchField::wedgeFvsPatchField template -wedgeFvsPatchField::wedgeFvsPatchField +Foam::wedgeFvsPatchField::wedgeFvsPatchField ( const wedgeFvsPatchField& ptf, const DimensionedField& iF @@ -109,8 +104,4 @@ wedgeFvsPatchField::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 -fvsPatchField::fvsPatchField +Foam::fvsPatchField::fvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -49,7 +44,7 @@ fvsPatchField::fvsPatchField template -fvsPatchField::fvsPatchField +Foam::fvsPatchField::fvsPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -63,7 +58,7 @@ fvsPatchField::fvsPatchField template -fvsPatchField::fvsPatchField +Foam::fvsPatchField::fvsPatchField ( const fvsPatchField& ptf, const fvPatch& p, @@ -78,7 +73,7 @@ fvsPatchField::fvsPatchField template -fvsPatchField::fvsPatchField +Foam::fvsPatchField::fvsPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -108,7 +103,7 @@ fvsPatchField::fvsPatchField template -fvsPatchField::fvsPatchField +Foam::fvsPatchField::fvsPatchField ( const fvsPatchField& ptf ) @@ -120,7 +115,7 @@ fvsPatchField::fvsPatchField template -fvsPatchField::fvsPatchField +Foam::fvsPatchField::fvsPatchField ( const fvsPatchField& ptf, const DimensionedField& iF @@ -135,14 +130,14 @@ fvsPatchField::fvsPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -const objectRegistry& fvsPatchField::db() const +const Foam::objectRegistry& Foam::fvsPatchField::db() const { return patch_.boundaryMesh().mesh(); } template -void fvsPatchField::check(const fvsPatchField& ptf) const +void Foam::fvsPatchField::check(const fvsPatchField& ptf) const { if (&patch_ != &(ptf.patch_)) { @@ -153,9 +148,8 @@ void fvsPatchField::check(const fvsPatchField& ptf) const } -// Map from self template -void fvsPatchField::autoMap +void Foam::fvsPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -164,9 +158,8 @@ void fvsPatchField::autoMap } -// Reverse-map the given fvsPatchField onto this fvsPatchField template -void fvsPatchField::rmap +void Foam::fvsPatchField::rmap ( const fvsPatchField& ptf, const labelList& addr @@ -176,9 +169,8 @@ void fvsPatchField::rmap } -// Write template -void fvsPatchField::write(Ostream& os) const +void Foam::fvsPatchField::write(Ostream& os) const { os.writeKeyword("type") << type() << token::END_STATEMENT << nl; this->writeEntry("value", os); @@ -188,7 +180,7 @@ void fvsPatchField::write(Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template -void fvsPatchField::operator= +void Foam::fvsPatchField::operator= ( const UList& ul ) @@ -198,7 +190,7 @@ void fvsPatchField::operator= template -void fvsPatchField::operator= +void Foam::fvsPatchField::operator= ( const fvsPatchField& ptf ) @@ -209,7 +201,7 @@ void fvsPatchField::operator= template -void fvsPatchField::operator+= +void Foam::fvsPatchField::operator+= ( const fvsPatchField& ptf ) @@ -220,7 +212,7 @@ void fvsPatchField::operator+= template -void fvsPatchField::operator-= +void Foam::fvsPatchField::operator-= ( const fvsPatchField& ptf ) @@ -231,7 +223,7 @@ void fvsPatchField::operator-= template -void fvsPatchField::operator*= +void Foam::fvsPatchField::operator*= ( const fvsPatchField& ptf ) @@ -248,7 +240,7 @@ void fvsPatchField::operator*= template -void fvsPatchField::operator/= +void Foam::fvsPatchField::operator/= ( const fvsPatchField& ptf ) @@ -264,7 +256,7 @@ void fvsPatchField::operator/= template -void fvsPatchField::operator+= +void Foam::fvsPatchField::operator+= ( const Field& tf ) @@ -274,7 +266,7 @@ void fvsPatchField::operator+= template -void fvsPatchField::operator-= +void Foam::fvsPatchField::operator-= ( const Field& tf ) @@ -284,7 +276,7 @@ void fvsPatchField::operator-= template -void fvsPatchField::operator*= +void Foam::fvsPatchField::operator*= ( const scalarField& tf ) @@ -294,7 +286,7 @@ void fvsPatchField::operator*= template -void fvsPatchField::operator/= +void Foam::fvsPatchField::operator/= ( const scalarField& tf ) @@ -304,7 +296,7 @@ void fvsPatchField::operator/= template -void fvsPatchField::operator= +void Foam::fvsPatchField::operator= ( const Type& t ) @@ -314,7 +306,7 @@ void fvsPatchField::operator= template -void fvsPatchField::operator+= +void Foam::fvsPatchField::operator+= ( const Type& t ) @@ -324,7 +316,7 @@ void fvsPatchField::operator+= template -void fvsPatchField::operator-= +void Foam::fvsPatchField::operator-= ( const Type& t ) @@ -334,7 +326,7 @@ void fvsPatchField::operator-= template -void fvsPatchField::operator*= +void Foam::fvsPatchField::operator*= ( const scalar s ) @@ -344,7 +336,7 @@ void fvsPatchField::operator*= template -void fvsPatchField::operator/= +void Foam::fvsPatchField::operator/= ( const scalar s ) @@ -353,9 +345,8 @@ void fvsPatchField::operator/= } -// Force an assignment, overriding fixedValue status template -void fvsPatchField::operator== +void Foam::fvsPatchField::operator== ( const fvsPatchField& ptf ) @@ -365,7 +356,7 @@ void fvsPatchField::operator== template -void fvsPatchField::operator== +void Foam::fvsPatchField::operator== ( const Field& tf ) @@ -375,7 +366,7 @@ void fvsPatchField::operator== template -void fvsPatchField::operator== +void Foam::fvsPatchField::operator== ( const Type& t ) @@ -387,7 +378,7 @@ void fvsPatchField::operator== // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // template -Ostream& operator<<(Ostream& os, const fvsPatchField& ptf) +Foam::Ostream& Foam::operator<<(Ostream& os, const fvsPatchField& ptf) { ptf.write(os); @@ -399,10 +390,6 @@ Ostream& operator<<(Ostream& os, const fvsPatchField& 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 -genericPointPatchField::genericPointPatchField +Foam::genericPointPatchField::genericPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -47,7 +42,7 @@ genericPointPatchField::genericPointPatchField template -genericPointPatchField::genericPointPatchField +Foam::genericPointPatchField::genericPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -308,7 +303,7 @@ genericPointPatchField::genericPointPatchField template -genericPointPatchField::genericPointPatchField +Foam::genericPointPatchField::genericPointPatchField ( const genericPointPatchField& ptf, const pointPatch& p, @@ -393,7 +388,7 @@ genericPointPatchField::genericPointPatchField template -genericPointPatchField::genericPointPatchField +Foam::genericPointPatchField::genericPointPatchField ( const genericPointPatchField& ptf, const DimensionedField& iF @@ -413,7 +408,7 @@ genericPointPatchField::genericPointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void genericPointPatchField::autoMap +void Foam::genericPointPatchField::autoMap ( const pointPatchFieldMapper& m ) @@ -471,7 +466,7 @@ void genericPointPatchField::autoMap template -void genericPointPatchField::rmap +void Foam::genericPointPatchField::rmap ( const pointPatchField& ptf, const labelList& addr @@ -563,7 +558,7 @@ void genericPointPatchField::rmap template -void genericPointPatchField::write(Ostream& os) const +void Foam::genericPointPatchField::write(Ostream& os) const { os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl; @@ -614,8 +609,4 @@ void genericPointPatchField::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 -zeroFixedValuePointPatchField:: +Foam::zeroFixedValuePointPatchField:: zeroFixedValuePointPatchField ( const pointPatch& p, @@ -45,7 +40,7 @@ zeroFixedValuePointPatchField template -zeroFixedValuePointPatchField:: +Foam::zeroFixedValuePointPatchField:: zeroFixedValuePointPatchField ( const pointPatch& p, @@ -60,7 +55,7 @@ zeroFixedValuePointPatchField template -zeroFixedValuePointPatchField:: +Foam::zeroFixedValuePointPatchField:: zeroFixedValuePointPatchField ( const zeroFixedValuePointPatchField& ptf, @@ -77,7 +72,7 @@ zeroFixedValuePointPatchField template -zeroFixedValuePointPatchField:: +Foam::zeroFixedValuePointPatchField:: zeroFixedValuePointPatchField ( const zeroFixedValuePointPatchField& ptf @@ -88,7 +83,7 @@ zeroFixedValuePointPatchField template -zeroFixedValuePointPatchField:: +Foam::zeroFixedValuePointPatchField:: zeroFixedValuePointPatchField ( const zeroFixedValuePointPatchField& ptf, @@ -102,8 +97,4 @@ zeroFixedValuePointPatchField } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* //