From 5f9d20e1d8d4457c446a82b687cb1d632aaeceaf Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 17 Dec 2010 15:15:08 +0100 Subject: [PATCH] STYLE: add Foam:: qualifier to some method names --- .../DimensionedField/DimensionedFieldIO.C | 29 ++-- src/OpenFOAM/fields/Fields/Field/Field.C | 124 +++++++++--------- .../basicSymmetryPointPatchField.C | 21 ++- .../basic/mixed/mixedPointPatchField.C | 26 ++-- .../basic/value/valuePointPatchField.C | 45 +++---- .../constraint/cyclic/cyclicPointPatchField.C | 19 +-- .../cyclicSlip/cyclicSlipPointPatchField.C | 18 +-- ...nonuniformTransformCyclicPointPatchField.C | 18 +-- .../processorCyclicPointPatchField.C | 22 +--- .../constraint/wedge/wedgePointPatchField.C | 18 +-- .../fixedNormalSlipPointPatchField.C | 24 ++-- .../SRFVelocityFvPatchVectorField.C | 40 +++--- .../basicSymmetry/basicSymmetryFvPatchField.C | 26 ++-- .../constraint/wedge/wedgeFvPatchField.C | 25 ++-- .../derived/advective/advectiveFvPatchField.C | 25 ++-- .../buoyantPressureFvPatchScalarField.C | 34 +++-- ...MappedVelocityFluxFixedValueFvPatchField.C | 38 +++--- .../derived/fan/fanFvPatchField.C | 25 ++-- .../fixedNormalSlipFvPatchField.C | 35 +++-- ...ureCompressibleDensityFvPatchScalarField.C | 37 +++--- .../freestreamPressureFvPatchScalarField.C | 33 +++-- .../movingWallVelocityFvPatchVectorField.C | 40 +++--- .../outletMappedUniformInletFvPatchField.C | 23 +--- .../partialSlip/partialSlipFvPatchField.C | 36 +++-- ...tedInletOutletVelocityFvPatchVectorField.C | 46 +++---- ...eDirectedInletVelocityFvPatchVectorField.C | 45 +++---- ...ureInletOutletVelocityFvPatchVectorField.C | 47 ++++--- ...reInletUniformVelocityFvPatchVectorField.C | 36 +++-- .../pressureInletVelocityFvPatchVectorField.C | 43 +++--- ...malInletOutletVelocityFvPatchVectorField.C | 41 +++--- ...ureInletOutletVelocityFvPatchVectorField.C | 48 ++++--- .../rotatingTotalPressureFvPatchScalarField.C | 41 +++--- .../rotatingWallVelocityFvPatchVectorField.C | 42 +++--- .../supersonicFreestreamFvPatchVectorField.C | 41 +++--- ...urfaceNormalFixedValueFvPatchVectorField.C | 39 +++--- .../syringePressureFvPatchScalarField.C | 38 +++--- ...ranslatingWallVelocityFvPatchVectorField.C | 37 +++--- .../waveTransmissiveFvPatchField.C | 24 ++-- .../constraint/cyclic/cyclicFvPatch.C | 26 ++-- .../LimitedScheme/LimitedScheme.C | 12 +- .../limitedSchemes/PhiScheme/PhiScheme.C | 12 +- .../multivariateScheme/multivariateScheme.C | 11 +- .../multivariateSelectionScheme.C | 10 +- .../cellMotion/cellMotionFvPatchField.C | 23 +--- .../LiquidEvaporation/LiquidEvaporation.C | 2 +- .../abortCalculation/abortCalculation.C | 4 +- src/randomProcesses/turbulence/turbGen.C | 15 +-- .../fixedInternalEnergyFvPatchScalarField.C | 35 ++--- ...gradientInternalEnergyFvPatchScalarField.C | 34 ++--- .../mixedInternalEnergyFvPatchScalarField.C | 34 ++--- .../fixedUnburntEnthalpyFvPatchScalarField.C | 34 ++--- ...radientUnburntEnthalpyFvPatchScalarField.C | 34 ++--- .../mixedUnburntEnthalpyFvPatchScalarField.C | 35 ++--- 53 files changed, 718 insertions(+), 952 deletions(-) diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C index 86be3e985e..3450e31d4a 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C @@ -26,15 +26,11 @@ License #include "DimensionedField.H" #include "IOstreams.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -void DimensionedField::readField +void Foam::DimensionedField::readField ( const dictionary& fieldDict, const word& fieldDictEntry @@ -48,7 +44,10 @@ void DimensionedField::readField template -void DimensionedField::readIfPresent(const word& fieldDictEntry) +void Foam::DimensionedField::readIfPresent +( + const word& fieldDictEntry +) { if ( @@ -65,7 +64,7 @@ void DimensionedField::readIfPresent(const word& fieldDictEntry) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -DimensionedField::DimensionedField +Foam::DimensionedField::DimensionedField ( const IOobject& io, const Mesh& mesh, @@ -84,7 +83,7 @@ DimensionedField::DimensionedField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -bool DimensionedField::writeData +bool Foam::DimensionedField::writeData ( Ostream& os, const word& fieldDictEntry @@ -107,7 +106,7 @@ bool DimensionedField::writeData template -bool DimensionedField::writeData(Ostream& os) const +bool Foam::DimensionedField::writeData(Ostream& os) const { return writeData(os, "value"); } @@ -116,7 +115,11 @@ bool DimensionedField::writeData(Ostream& os) const // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // template -Ostream& operator<<(Ostream& os, const DimensionedField& df) +Foam::Ostream& Foam::operator<< +( + Ostream& os, + const DimensionedField& df +) { df.writeData(os); @@ -125,7 +128,7 @@ Ostream& operator<<(Ostream& os, const DimensionedField& df) template -Ostream& operator<< +Foam::Ostream& Foam::operator<< ( Ostream& os, const tmp >& tdf @@ -138,8 +141,4 @@ Ostream& operator<< } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C index 979442ac86..c70f051281 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.C +++ b/src/OpenFOAM/fields/Fields/Field/Field.C @@ -28,42 +28,37 @@ License #include "dictionary.H" #include "contiguous.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * Static Members * * * * * * * * * * * * * * // template -const char* const Field::typeName("Field"); +const char* const Foam::Field::typeName("Field"); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Field::Field() +Foam::Field::Field() : List() {} template -Field::Field(const label size) +Foam::Field::Field(const label size) : List(size) {} template -Field::Field(const label size, const Type& t) +Foam::Field::Field(const label size, const Type& t) : List(size, t) {} template -Field::Field +Foam::Field::Field ( const UList& mapF, const labelUList& mapAddressing @@ -74,8 +69,9 @@ Field::Field map(mapF, mapAddressing); } + template -Field::Field +Foam::Field::Field ( const tmp >& tmapF, const labelUList& mapAddressing @@ -88,7 +84,7 @@ Field::Field template -Field::Field +Foam::Field::Field ( const UList& mapF, const labelListList& mapAddressing, @@ -100,8 +96,9 @@ Field::Field map(mapF, mapAddressing, mapWeights); } + template -Field::Field +Foam::Field::Field ( const tmp >& tmapF, const labelListList& mapAddressing, @@ -115,7 +112,7 @@ Field::Field template -Field::Field +Foam::Field::Field ( const UList& mapF, const FieldMapper& mapper @@ -126,8 +123,9 @@ Field::Field map(mapF, mapper); } + template -Field::Field +Foam::Field::Field ( const tmp >& tmapF, const FieldMapper& mapper @@ -140,7 +138,7 @@ Field::Field template -Field::Field(const Field& f) +Foam::Field::Field(const Field& f) : refCount(), List(f) @@ -148,35 +146,38 @@ Field::Field(const Field& f) template -Field::Field(Field& f, bool reUse) +Foam::Field::Field(Field& f, bool reUse) : List(f, reUse) {} template -Field::Field(const Xfer >& f) +Foam::Field::Field(const Xfer >& f) : List(f) {} template -Field::Field(const Xfer >& f) +Foam::Field::Field(const Xfer >& f) : List(f) {} +#ifndef __GNUC__ +// Not needed for clang/gcc template -Field::Field(const typename Field::subField& sf) +Foam::Field::Field(const typename Field::subField& sf) : List(sf) {} +#endif template -Field::Field(const UList& list) +Foam::Field::Field(const UList& list) : List(list) {} @@ -185,7 +186,7 @@ Field::Field(const UList& list) // Construct as copy of tmp #ifdef ConstructFromTmp template -Field::Field(const tmp >& tf) +Foam::Field::Field(const tmp >& tf) : List(const_cast&>(tf()), tf.isTmp()) { @@ -195,14 +196,14 @@ Field::Field(const tmp >& tf) template -Field::Field(Istream& is) +Foam::Field::Field(Istream& is) : List(is) {} template -Field::Field +Foam::Field::Field ( const word& keyword, const dictionary& dict, @@ -285,7 +286,7 @@ Field::Field template -tmp > Field::clone() const +Foam::tmp > Foam::Field::clone() const { return tmp >(new Field(*this)); } @@ -294,7 +295,7 @@ tmp > Field::clone() const // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void Field::map +void Foam::Field::map ( const UList& mapF, const labelUList& mapAddressing @@ -323,7 +324,7 @@ void Field::map template -void Field::map +void Foam::Field::map ( const tmp >& tmapF, const labelUList& mapAddressing @@ -335,7 +336,7 @@ void Field::map template -void Field::map +void Foam::Field::map ( const UList& mapF, const labelListList& mapAddressing, @@ -378,8 +379,9 @@ void Field::map } } + template -void Field::map +void Foam::Field::map ( const tmp >& tmapF, const labelListList& mapAddressing, @@ -392,7 +394,7 @@ void Field::map template -void Field::map +void Foam::Field::map ( const UList& mapF, const FieldMapper& mapper @@ -413,8 +415,9 @@ void Field::map } } + template -void Field::map +void Foam::Field::map ( const tmp >& tmapF, const FieldMapper& mapper @@ -426,7 +429,7 @@ void Field::map template -void Field::autoMap +void Foam::Field::autoMap ( const FieldMapper& mapper ) @@ -452,7 +455,7 @@ void Field::autoMap template -void Field::rmap +void Foam::Field::rmap ( const UList& mapF, const labelUList& mapAddressing @@ -471,8 +474,9 @@ void Field::rmap } } + template -void Field::rmap +void Foam::Field::rmap ( const tmp >& tmapF, const labelUList& mapAddressing @@ -484,7 +488,7 @@ void Field::rmap template -void Field::rmap +void Foam::Field::rmap ( const UList& mapF, const labelUList& mapAddressing, @@ -501,8 +505,9 @@ void Field::rmap } } + template -void Field::rmap +void Foam::Field::rmap ( const tmp >& tmapF, const labelUList& mapAddressing, @@ -515,14 +520,15 @@ void Field::rmap template -void Field::negate() +void Foam::Field::negate() { TFOR_ALL_F_OP_OP_F(Type, *this, =, -, Type, *this) } template -tmp::cmptType> > Field::component +Foam::tmp::cmptType> > +Foam::Field::component ( const direction d ) const @@ -534,7 +540,7 @@ tmp::cmptType> > Field::component template -void Field::replace +void Foam::Field::replace ( const direction d, const UList& sf @@ -546,7 +552,7 @@ void Field::replace template -void Field::replace +void Foam::Field::replace ( const direction d, const tmp >& tsf @@ -558,7 +564,7 @@ void Field::replace template -void Field::replace +void Foam::Field::replace ( const direction d, const cmptType& c @@ -570,7 +576,7 @@ void Field::replace template -tmp > Field::T() const +Foam::tmp > Foam::Field::T() const { tmp > transpose(new Field(this->size())); ::Foam::T(transpose(), *this); @@ -579,7 +585,7 @@ tmp > Field::T() const template -void Field::writeEntry(const word& keyword, Ostream& os) const +void Foam::Field::writeEntry(const word& keyword, Ostream& os) const { os.writeKeyword(keyword); @@ -617,7 +623,7 @@ void Field::writeEntry(const word& keyword, Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template -void Field::operator=(const Field& rhs) +void Foam::Field::operator=(const Field& rhs) { if (this == &rhs) { @@ -631,21 +637,21 @@ void Field::operator=(const Field& rhs) template -void Field::operator=(const SubField& rhs) +void Foam::Field::operator=(const SubField& rhs) { List::operator=(rhs); } template -void Field::operator=(const UList& rhs) +void Foam::Field::operator=(const UList& rhs) { List::operator=(rhs); } template -void Field::operator=(const tmp& rhs) +void Foam::Field::operator=(const tmp& rhs) { if (this == &(rhs())) { @@ -662,7 +668,7 @@ void Field::operator=(const tmp& rhs) template -void Field::operator=(const Type& t) +void Foam::Field::operator=(const Type& t) { List::operator=(t); } @@ -670,7 +676,7 @@ void Field::operator=(const Type& t) template template -void Field::operator=(const VectorSpace& vs) +void Foam::Field::operator=(const VectorSpace& vs) { typedef VectorSpace VSType; TFOR_ALL_F_OP_S(Type, *this, =, VSType, vs) @@ -680,20 +686,20 @@ void Field::operator=(const VectorSpace& vs) #define COMPUTED_ASSIGNMENT(TYPE, op) \ \ template \ -void Field::operator op(const UList& f) \ +void Foam::Field::operator op(const UList& f) \ { \ TFOR_ALL_F_OP_F(Type, *this, op, TYPE, f) \ } \ \ template \ -void Field::operator op(const tmp >& tf) \ +void Foam::Field::operator op(const tmp >& tf) \ { \ operator op(tf()); \ tf.clear(); \ } \ \ template \ -void Field::operator op(const TYPE& t) \ +void Foam::Field::operator op(const TYPE& t) \ { \ TFOR_ALL_F_OP_S(Type, *this, op, TYPE, t) \ } @@ -709,17 +715,17 @@ COMPUTED_ASSIGNMENT(scalar, /=) // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // template -Ostream& operator<<(Ostream& os, const Field& f) +Foam::Ostream& Foam::operator<<(Ostream& os, const Field& f) { - os << static_cast&>(f); + os << static_cast&>(f); return os; } template -Ostream& operator<<(Ostream& os, const tmp >& tf) +Foam::Ostream& Foam::operator<<(Ostream& os, const tmp >& tf) { - os << tf(); + os << tf(); tf.clear(); return os; } @@ -727,10 +733,6 @@ Ostream& operator<<(Ostream& os, const tmp >& tf) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -# include "FieldFunctions.C" +#include "FieldFunctions.C" // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C index 6ea1a1cef8..15c7a2a56e 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C @@ -27,15 +27,11 @@ License #include "transformField.H" #include "symmTransformField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -basicSymmetryPointPatchField::basicSymmetryPointPatchField +Foam::basicSymmetryPointPatchField::basicSymmetryPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -46,7 +42,7 @@ basicSymmetryPointPatchField::basicSymmetryPointPatchField template -basicSymmetryPointPatchField::basicSymmetryPointPatchField +Foam::basicSymmetryPointPatchField::basicSymmetryPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -58,7 +54,7 @@ basicSymmetryPointPatchField::basicSymmetryPointPatchField template -basicSymmetryPointPatchField::basicSymmetryPointPatchField +Foam::basicSymmetryPointPatchField::basicSymmetryPointPatchField ( const basicSymmetryPointPatchField& ptf, const pointPatch& p, @@ -71,7 +67,7 @@ basicSymmetryPointPatchField::basicSymmetryPointPatchField template -basicSymmetryPointPatchField::basicSymmetryPointPatchField +Foam::basicSymmetryPointPatchField::basicSymmetryPointPatchField ( const basicSymmetryPointPatchField& ptf, const DimensionedField& iF @@ -84,7 +80,10 @@ basicSymmetryPointPatchField::basicSymmetryPointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void basicSymmetryPointPatchField::evaluate(const Pstream::commsTypes) +void Foam::basicSymmetryPointPatchField::evaluate +( + const Pstream::commsTypes +) { const vectorField& nHat = this->patch().pointNormals(); @@ -103,8 +102,4 @@ void basicSymmetryPointPatchField::evaluate(const Pstream::commsTypes) } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.C index 103ff7197f..9e087d0394 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/mixed/mixedPointPatchField.C @@ -26,15 +26,11 @@ License #include "mixedPointPatchField.H" #include "pointPatchFieldMapper.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -void mixedPointPatchField::checkFieldSize() const +void Foam::mixedPointPatchField::checkFieldSize() const { if ( @@ -59,7 +55,7 @@ void mixedPointPatchField::checkFieldSize() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -mixedPointPatchField::mixedPointPatchField +Foam::mixedPointPatchField::mixedPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -72,7 +68,7 @@ mixedPointPatchField::mixedPointPatchField template -mixedPointPatchField::mixedPointPatchField +Foam::mixedPointPatchField::mixedPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -86,7 +82,7 @@ mixedPointPatchField::mixedPointPatchField template -mixedPointPatchField::mixedPointPatchField +Foam::mixedPointPatchField::mixedPointPatchField ( const mixedPointPatchField& ptf, const pointPatch& p, @@ -108,7 +104,7 @@ mixedPointPatchField::mixedPointPatchField template -mixedPointPatchField::mixedPointPatchField +Foam::mixedPointPatchField::mixedPointPatchField ( const mixedPointPatchField& ptf, const DimensionedField& iF @@ -124,7 +120,7 @@ mixedPointPatchField::mixedPointPatchField // Map and resize from self given a mapper template -void mixedPointPatchField::autoMap +void Foam::mixedPointPatchField::autoMap ( const pointPatchFieldMapper& m ) @@ -137,7 +133,7 @@ void mixedPointPatchField::autoMap // Grab the values using rmap template -void mixedPointPatchField::rmap +void Foam::mixedPointPatchField::rmap ( const pointPatchField& ptf, const labelList& addr @@ -154,7 +150,7 @@ void mixedPointPatchField::rmap // Evaluate patch field template -void mixedPointPatchField::evaluate(const Pstream::commsTypes) +void Foam::mixedPointPatchField::evaluate(const Pstream::commsTypes) { Field::operator= ( @@ -171,7 +167,7 @@ void mixedPointPatchField::evaluate(const Pstream::commsTypes) // Write template -void mixedPointPatchField::write(Ostream& os) const +void Foam::mixedPointPatchField::write(Ostream& os) const { pointPatchField::write(os); refValue_.writeEntry("refValue", os); @@ -179,8 +175,4 @@ void mixedPointPatchField::write(Ostream& os) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C index 0afbf02f97..eb01dc7b63 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C @@ -26,15 +26,10 @@ License #include "valuePointPatchField.H" #include "pointPatchFieldMapper.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -void valuePointPatchField::checkFieldSize() const +void Foam::valuePointPatchField::checkFieldSize() const { if (size() != this->patch().size()) { @@ -52,7 +47,7 @@ void valuePointPatchField::checkFieldSize() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // template -valuePointPatchField::valuePointPatchField +Foam::valuePointPatchField::valuePointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -64,7 +59,7 @@ valuePointPatchField::valuePointPatchField template -valuePointPatchField::valuePointPatchField +Foam::valuePointPatchField::valuePointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -105,7 +100,7 @@ valuePointPatchField::valuePointPatchField template -valuePointPatchField::valuePointPatchField +Foam::valuePointPatchField::valuePointPatchField ( const valuePointPatchField& ptf, const pointPatch& p, @@ -119,7 +114,7 @@ valuePointPatchField::valuePointPatchField template -valuePointPatchField::valuePointPatchField +Foam::valuePointPatchField::valuePointPatchField ( const valuePointPatchField& ptf, const DimensionedField& iF @@ -133,7 +128,7 @@ valuePointPatchField::valuePointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void valuePointPatchField::autoMap +void Foam::valuePointPatchField::autoMap ( const pointPatchFieldMapper& m ) @@ -143,7 +138,7 @@ void valuePointPatchField::autoMap template -void valuePointPatchField::rmap +void Foam::valuePointPatchField::rmap ( const pointPatchField& ptf, const labelList& addr @@ -161,7 +156,7 @@ void valuePointPatchField::rmap template -void valuePointPatchField::updateCoeffs() +void Foam::valuePointPatchField::updateCoeffs() { if (this->updated()) { @@ -178,7 +173,7 @@ void valuePointPatchField::updateCoeffs() template -void valuePointPatchField::evaluate(const Pstream::commsTypes) +void Foam::valuePointPatchField::evaluate(const Pstream::commsTypes) { // Get internal field to insert values into Field& iF = const_cast&>(this->internalField()); @@ -190,7 +185,7 @@ void valuePointPatchField::evaluate(const Pstream::commsTypes) template -void valuePointPatchField::write(Ostream& os) const +void Foam::valuePointPatchField::write(Ostream& os) const { pointPatchField::write(os); this->writeEntry("value", os); @@ -200,7 +195,7 @@ void valuePointPatchField::write(Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template -void valuePointPatchField::operator= +void Foam::valuePointPatchField::operator= ( const valuePointPatchField& ptf ) @@ -210,7 +205,7 @@ void valuePointPatchField::operator= template -void valuePointPatchField::operator= +void Foam::valuePointPatchField::operator= ( const pointPatchField& ptf ) @@ -220,7 +215,7 @@ void valuePointPatchField::operator= template -void valuePointPatchField::operator= +void Foam::valuePointPatchField::operator= ( const Field& tf ) @@ -230,7 +225,7 @@ void valuePointPatchField::operator= template -void valuePointPatchField::operator= +void Foam::valuePointPatchField::operator= ( const Type& t ) @@ -241,7 +236,7 @@ void valuePointPatchField::operator= // Force an assignment template -void valuePointPatchField::operator== +void Foam::valuePointPatchField::operator== ( const valuePointPatchField& ptf ) @@ -251,7 +246,7 @@ void valuePointPatchField::operator== template -void valuePointPatchField::operator== +void Foam::valuePointPatchField::operator== ( const pointPatchField& ptf ) @@ -261,7 +256,7 @@ void valuePointPatchField::operator== template -void valuePointPatchField::operator== +void Foam::valuePointPatchField::operator== ( const Field& tf ) @@ -271,7 +266,7 @@ void valuePointPatchField::operator== template -void valuePointPatchField::operator== +void Foam::valuePointPatchField::operator== ( const Type& t ) @@ -280,8 +275,4 @@ void valuePointPatchField::operator== } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C index 611f0f8ba9..c95745c707 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C @@ -28,15 +28,10 @@ License #include "transformField.H" #include "pointFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -cyclicPointPatchField::cyclicPointPatchField +Foam::cyclicPointPatchField::cyclicPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -48,7 +43,7 @@ cyclicPointPatchField::cyclicPointPatchField template -cyclicPointPatchField::cyclicPointPatchField +Foam::cyclicPointPatchField::cyclicPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -77,7 +72,7 @@ cyclicPointPatchField::cyclicPointPatchField template -cyclicPointPatchField::cyclicPointPatchField +Foam::cyclicPointPatchField::cyclicPointPatchField ( const cyclicPointPatchField& ptf, const pointPatch& p, @@ -109,7 +104,7 @@ cyclicPointPatchField::cyclicPointPatchField template -cyclicPointPatchField::cyclicPointPatchField +Foam::cyclicPointPatchField::cyclicPointPatchField ( const cyclicPointPatchField& ptf, const DimensionedField& iF @@ -123,7 +118,7 @@ cyclicPointPatchField::cyclicPointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void cyclicPointPatchField::swapAddSeparated +void Foam::cyclicPointPatchField::swapAddSeparated ( const Pstream::commsTypes, Field& pField @@ -183,8 +178,4 @@ void cyclicPointPatchField::swapAddSeparated } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C index 25bafe394f..7fd5b57caa 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C @@ -27,15 +27,11 @@ License #include "transformField.H" #include "symmTransformField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -cyclicSlipPointPatchField::cyclicSlipPointPatchField +Foam::cyclicSlipPointPatchField::cyclicSlipPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -46,7 +42,7 @@ cyclicSlipPointPatchField::cyclicSlipPointPatchField template -cyclicSlipPointPatchField::cyclicSlipPointPatchField +Foam::cyclicSlipPointPatchField::cyclicSlipPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -58,7 +54,7 @@ cyclicSlipPointPatchField::cyclicSlipPointPatchField template -cyclicSlipPointPatchField::cyclicSlipPointPatchField +Foam::cyclicSlipPointPatchField::cyclicSlipPointPatchField ( const cyclicSlipPointPatchField& ptf, const pointPatch& p, @@ -71,7 +67,7 @@ cyclicSlipPointPatchField::cyclicSlipPointPatchField template -cyclicSlipPointPatchField::cyclicSlipPointPatchField +Foam::cyclicSlipPointPatchField::cyclicSlipPointPatchField ( const cyclicSlipPointPatchField& ptf, const DimensionedField& iF @@ -84,7 +80,7 @@ cyclicSlipPointPatchField::cyclicSlipPointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void cyclicSlipPointPatchField::evaluate(const Pstream::commsTypes) +void Foam::cyclicSlipPointPatchField::evaluate(const Pstream::commsTypes) { const vectorField& nHat = this->patch().pointNormals(); @@ -103,8 +99,4 @@ void cyclicSlipPointPatchField::evaluate(const Pstream::commsTypes) } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C index 129b9822cf..f345a6e223 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C @@ -27,15 +27,11 @@ License #include "transformField.H" #include "symmTransformField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -nonuniformTransformCyclicPointPatchField:: +Foam::nonuniformTransformCyclicPointPatchField:: nonuniformTransformCyclicPointPatchField ( const pointPatch& p, @@ -47,7 +43,7 @@ nonuniformTransformCyclicPointPatchField template -nonuniformTransformCyclicPointPatchField:: +Foam::nonuniformTransformCyclicPointPatchField:: nonuniformTransformCyclicPointPatchField ( const pointPatch& p, @@ -60,7 +56,7 @@ nonuniformTransformCyclicPointPatchField template -nonuniformTransformCyclicPointPatchField:: +Foam::nonuniformTransformCyclicPointPatchField:: nonuniformTransformCyclicPointPatchField ( const nonuniformTransformCyclicPointPatchField& ptf, @@ -74,7 +70,7 @@ nonuniformTransformCyclicPointPatchField template -nonuniformTransformCyclicPointPatchField:: +Foam::nonuniformTransformCyclicPointPatchField:: nonuniformTransformCyclicPointPatchField ( const nonuniformTransformCyclicPointPatchField& ptf, @@ -88,7 +84,7 @@ nonuniformTransformCyclicPointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void nonuniformTransformCyclicPointPatchField::evaluate +void Foam::nonuniformTransformCyclicPointPatchField::evaluate ( const Pstream::commsTypes ) @@ -110,8 +106,4 @@ void nonuniformTransformCyclicPointPatchField::evaluate } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C index 68a64544d7..1e55a56810 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.C @@ -27,15 +27,11 @@ License #include "transformField.H" #include "processorPolyPatch.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -processorCyclicPointPatchField::processorCyclicPointPatchField +Foam::processorCyclicPointPatchField::processorCyclicPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -47,7 +43,7 @@ processorCyclicPointPatchField::processorCyclicPointPatchField template -processorCyclicPointPatchField::processorCyclicPointPatchField +Foam::processorCyclicPointPatchField::processorCyclicPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -60,7 +56,7 @@ processorCyclicPointPatchField::processorCyclicPointPatchField template -processorCyclicPointPatchField::processorCyclicPointPatchField +Foam::processorCyclicPointPatchField::processorCyclicPointPatchField ( const processorCyclicPointPatchField& ptf, const pointPatch& p, @@ -74,7 +70,7 @@ processorCyclicPointPatchField::processorCyclicPointPatchField template -processorCyclicPointPatchField::processorCyclicPointPatchField +Foam::processorCyclicPointPatchField::processorCyclicPointPatchField ( const processorCyclicPointPatchField& ptf, const DimensionedField& iF @@ -88,14 +84,14 @@ processorCyclicPointPatchField::processorCyclicPointPatchField // * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // template -processorCyclicPointPatchField::~processorCyclicPointPatchField() +Foam::processorCyclicPointPatchField::~processorCyclicPointPatchField() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void processorCyclicPointPatchField::initSwapAddSeparated +void Foam::processorCyclicPointPatchField::initSwapAddSeparated ( const Pstream::commsTypes commsType, Field& pField @@ -126,7 +122,7 @@ void processorCyclicPointPatchField::initSwapAddSeparated template -void processorCyclicPointPatchField::swapAddSeparated +void Foam::processorCyclicPointPatchField::swapAddSeparated ( const Pstream::commsTypes commsType, Field& pField @@ -160,8 +156,4 @@ void processorCyclicPointPatchField::swapAddSeparated } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C index 05461c29f7..d1dd660a8e 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C @@ -26,15 +26,11 @@ License #include "wedgePointPatchField.H" #include "transformField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -wedgePointPatchField::wedgePointPatchField +Foam::wedgePointPatchField::wedgePointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -45,7 +41,7 @@ wedgePointPatchField::wedgePointPatchField template -wedgePointPatchField::wedgePointPatchField +Foam::wedgePointPatchField::wedgePointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -73,7 +69,7 @@ wedgePointPatchField::wedgePointPatchField template -wedgePointPatchField::wedgePointPatchField +Foam::wedgePointPatchField::wedgePointPatchField ( const wedgePointPatchField& ptf, const pointPatch& p, @@ -104,7 +100,7 @@ wedgePointPatchField::wedgePointPatchField template -wedgePointPatchField::wedgePointPatchField +Foam::wedgePointPatchField::wedgePointPatchField ( const wedgePointPatchField& ptf, const DimensionedField& iF @@ -117,7 +113,7 @@ wedgePointPatchField::wedgePointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void wedgePointPatchField::evaluate(const Pstream::commsTypes) +void Foam::wedgePointPatchField::evaluate(const Pstream::commsTypes) { // In order to ensure that the wedge patch is always flat, take the // normal vector from the first point @@ -133,8 +129,4 @@ void wedgePointPatchField::evaluate(const Pstream::commsTypes) } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C index 196ed0b817..06c7823548 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C @@ -25,15 +25,10 @@ License #include "fixedNormalSlipPointPatchField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField +Foam::fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -45,7 +40,7 @@ fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField template -fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField +Foam::fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -58,7 +53,7 @@ fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField template -fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField +Foam::fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField ( const fixedNormalSlipPointPatchField& ptf, const pointPatch& p, @@ -72,7 +67,7 @@ fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField template -fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField +Foam::fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField ( const fixedNormalSlipPointPatchField& ptf, const DimensionedField& iF @@ -86,7 +81,10 @@ fixedNormalSlipPointPatchField::fixedNormalSlipPointPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void fixedNormalSlipPointPatchField::evaluate(const Pstream::commsTypes) +void Foam::fixedNormalSlipPointPatchField::evaluate +( + const Pstream::commsTypes +) { tmp > tvalues = transform(I - n_*n_, this->patchInternalField()); @@ -99,7 +97,7 @@ void fixedNormalSlipPointPatchField::evaluate(const Pstream::commsTypes) template -void fixedNormalSlipPointPatchField::write(Ostream& os) const +void Foam::fixedNormalSlipPointPatchField::write(Ostream& os) const { slipPointPatchField::write(os); os.writeKeyword("n") @@ -107,8 +105,4 @@ void fixedNormalSlipPointPatchField::write(Ostream& os) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C index c697e5b9a7..4ad367c0d7 100644 --- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFVelocityFvPatchVectorField/SRFVelocityFvPatchVectorField.C @@ -29,14 +29,9 @@ License #include "SRFModel.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField +Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF @@ -48,7 +43,7 @@ SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField {} -SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField +Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField ( const SRFVelocityFvPatchVectorField& ptf, const fvPatch& p, @@ -62,7 +57,7 @@ SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField {} -SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField +Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF, @@ -77,7 +72,7 @@ SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField } -SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField +Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField ( const SRFVelocityFvPatchVectorField& srfvpvf ) @@ -88,7 +83,7 @@ SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField {} -SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField +Foam::SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField ( const SRFVelocityFvPatchVectorField& srfvpvf, const DimensionedField& iF @@ -102,7 +97,7 @@ SRFVelocityFvPatchVectorField::SRFVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void SRFVelocityFvPatchVectorField::autoMap +void Foam::SRFVelocityFvPatchVectorField::autoMap ( const fvPatchFieldMapper& m ) @@ -112,7 +107,7 @@ void SRFVelocityFvPatchVectorField::autoMap } -void SRFVelocityFvPatchVectorField::rmap +void Foam::SRFVelocityFvPatchVectorField::rmap ( const fvPatchVectorField& ptf, const labelList& addr @@ -127,7 +122,7 @@ void SRFVelocityFvPatchVectorField::rmap } -void SRFVelocityFvPatchVectorField::updateCoeffs() +void Foam::SRFVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -156,7 +151,7 @@ void SRFVelocityFvPatchVectorField::updateCoeffs() } -void SRFVelocityFvPatchVectorField::write(Ostream& os) const +void Foam::SRFVelocityFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); os.writeKeyword("relative") << relative_ << token::END_STATEMENT << nl; @@ -167,14 +162,13 @@ void SRFVelocityFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - SRFVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + SRFVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C index b300f4354d..375e1bc8ba 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C @@ -26,15 +26,11 @@ License #include "basicSymmetryFvPatchField.H" #include "symmTransformField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -basicSymmetryFvPatchField::basicSymmetryFvPatchField +Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -45,7 +41,7 @@ basicSymmetryFvPatchField::basicSymmetryFvPatchField template -basicSymmetryFvPatchField::basicSymmetryFvPatchField +Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField ( const basicSymmetryFvPatchField& ptf, const fvPatch& p, @@ -58,7 +54,7 @@ basicSymmetryFvPatchField::basicSymmetryFvPatchField template -basicSymmetryFvPatchField::basicSymmetryFvPatchField +Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -72,7 +68,7 @@ basicSymmetryFvPatchField::basicSymmetryFvPatchField template -basicSymmetryFvPatchField::basicSymmetryFvPatchField +Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField ( const basicSymmetryFvPatchField& ptf ) @@ -82,7 +78,7 @@ basicSymmetryFvPatchField::basicSymmetryFvPatchField template -basicSymmetryFvPatchField::basicSymmetryFvPatchField +Foam::basicSymmetryFvPatchField::basicSymmetryFvPatchField ( const basicSymmetryFvPatchField& ptf, const DimensionedField& iF @@ -95,7 +91,8 @@ basicSymmetryFvPatchField::basicSymmetryFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp > basicSymmetryFvPatchField::snGrad() const +Foam::tmp > +Foam::basicSymmetryFvPatchField::snGrad() const { vectorField nHat = this->patch().nf(); @@ -108,7 +105,7 @@ tmp > basicSymmetryFvPatchField::snGrad() const template -void basicSymmetryFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::basicSymmetryFvPatchField::evaluate(const Pstream::commsTypes) { if (!this->updated()) { @@ -130,7 +127,8 @@ void basicSymmetryFvPatchField::evaluate(const Pstream::commsTypes) template -tmp > basicSymmetryFvPatchField::snGradTransformDiag() const +Foam::tmp > +Foam::basicSymmetryFvPatchField::snGradTransformDiag() const { vectorField nHat = this->patch().nf(); @@ -144,8 +142,4 @@ tmp > basicSymmetryFvPatchField::snGradTransformDiag() const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C index a8540e3029..a4a8bd9921 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C @@ -29,15 +29,11 @@ License #include "symmTransform.H" #include "diagTensor.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -wedgeFvPatchField::wedgeFvPatchField +Foam::wedgeFvPatchField::wedgeFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -48,7 +44,7 @@ wedgeFvPatchField::wedgeFvPatchField template -wedgeFvPatchField::wedgeFvPatchField +Foam::wedgeFvPatchField::wedgeFvPatchField ( const wedgeFvPatchField& ptf, const fvPatch& p, @@ -80,7 +76,7 @@ wedgeFvPatchField::wedgeFvPatchField template -wedgeFvPatchField::wedgeFvPatchField +Foam::wedgeFvPatchField::wedgeFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -113,7 +109,7 @@ wedgeFvPatchField::wedgeFvPatchField template -wedgeFvPatchField::wedgeFvPatchField +Foam::wedgeFvPatchField::wedgeFvPatchField ( const wedgeFvPatchField& ptf ) @@ -123,7 +119,7 @@ wedgeFvPatchField::wedgeFvPatchField template -wedgeFvPatchField::wedgeFvPatchField +Foam::wedgeFvPatchField::wedgeFvPatchField ( const wedgeFvPatchField& ptf, const DimensionedField& iF @@ -136,7 +132,7 @@ wedgeFvPatchField::wedgeFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp > wedgeFvPatchField::snGrad() const +Foam::tmp > Foam::wedgeFvPatchField::snGrad() const { Field pif = this->patchInternalField(); return @@ -147,7 +143,7 @@ tmp > wedgeFvPatchField::snGrad() const template -void wedgeFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::wedgeFvPatchField::evaluate(const Pstream::commsTypes) { if (!this->updated()) { @@ -166,7 +162,8 @@ void wedgeFvPatchField::evaluate(const Pstream::commsTypes) template -tmp > wedgeFvPatchField::snGradTransformDiag() const +Foam::tmp > +Foam::wedgeFvPatchField::snGradTransformDiag() const { const diagTensor diagT = 0.5*diag(I - refCast(this->patch()).cellT()); @@ -192,8 +189,4 @@ tmp > wedgeFvPatchField::snGradTransformDiag() const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index cb18909469..108dc8e432 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -31,15 +31,11 @@ License #include "CrankNicholsonDdtScheme.H" #include "backwardDdtScheme.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -advectiveFvPatchField::advectiveFvPatchField +Foam::advectiveFvPatchField::advectiveFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -58,7 +54,7 @@ advectiveFvPatchField::advectiveFvPatchField template -advectiveFvPatchField::advectiveFvPatchField +Foam::advectiveFvPatchField::advectiveFvPatchField ( const advectiveFvPatchField& ptf, const fvPatch& p, @@ -75,7 +71,7 @@ advectiveFvPatchField::advectiveFvPatchField template -advectiveFvPatchField::advectiveFvPatchField +Foam::advectiveFvPatchField::advectiveFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -127,7 +123,7 @@ advectiveFvPatchField::advectiveFvPatchField template -advectiveFvPatchField::advectiveFvPatchField +Foam::advectiveFvPatchField::advectiveFvPatchField ( const advectiveFvPatchField& ptpsf ) @@ -141,7 +137,7 @@ advectiveFvPatchField::advectiveFvPatchField template -advectiveFvPatchField::advectiveFvPatchField +Foam::advectiveFvPatchField::advectiveFvPatchField ( const advectiveFvPatchField& ptpsf, const DimensionedField& iF @@ -158,7 +154,8 @@ advectiveFvPatchField::advectiveFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp advectiveFvPatchField::advectionSpeed() const +Foam::tmp +Foam::advectiveFvPatchField::advectionSpeed() const { const surfaceScalarField& phi = this->db().objectRegistry::lookupObject(phiName_); @@ -189,7 +186,7 @@ tmp advectiveFvPatchField::advectionSpeed() const template -void advectiveFvPatchField::updateCoeffs() +void Foam::advectiveFvPatchField::updateCoeffs() { if (this->updated()) { @@ -304,7 +301,7 @@ void advectiveFvPatchField::updateCoeffs() template -void advectiveFvPatchField::write(Ostream& os) const +void Foam::advectiveFvPatchField::write(Ostream& os) const { fvPatchField::write(os); @@ -329,8 +326,4 @@ void advectiveFvPatchField::write(Ostream& os) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C index c8a37fef7a..6b3cee22e0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C @@ -29,14 +29,10 @@ License #include "volFields.H" #include "uniformDimensionedFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -buoyantPressureFvPatchScalarField:: +Foam::buoyantPressureFvPatchScalarField:: buoyantPressureFvPatchScalarField ( const fvPatch& p, @@ -48,7 +44,7 @@ buoyantPressureFvPatchScalarField {} -buoyantPressureFvPatchScalarField:: +Foam::buoyantPressureFvPatchScalarField:: buoyantPressureFvPatchScalarField ( const fvPatch& p, @@ -64,7 +60,7 @@ buoyantPressureFvPatchScalarField } -buoyantPressureFvPatchScalarField:: +Foam::buoyantPressureFvPatchScalarField:: buoyantPressureFvPatchScalarField ( const buoyantPressureFvPatchScalarField& ptf, @@ -78,7 +74,7 @@ buoyantPressureFvPatchScalarField {} -buoyantPressureFvPatchScalarField:: +Foam::buoyantPressureFvPatchScalarField:: buoyantPressureFvPatchScalarField ( const buoyantPressureFvPatchScalarField& ptf @@ -89,7 +85,7 @@ buoyantPressureFvPatchScalarField {} -buoyantPressureFvPatchScalarField:: +Foam::buoyantPressureFvPatchScalarField:: buoyantPressureFvPatchScalarField ( const buoyantPressureFvPatchScalarField& ptf, @@ -103,7 +99,7 @@ buoyantPressureFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void buoyantPressureFvPatchScalarField::updateCoeffs() +void Foam::buoyantPressureFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -137,7 +133,7 @@ void buoyantPressureFvPatchScalarField::updateCoeffs() } -void buoyantPressureFvPatchScalarField::write(Ostream& os) const +void Foam::buoyantPressureFvPatchScalarField::write(Ostream& os) const { fixedGradientFvPatchScalarField::write(os); writeEntryIfDifferent(os, "rho", "rho", rhoName_); @@ -147,14 +143,14 @@ void buoyantPressureFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchScalarField, - buoyantPressureFvPatchScalarField -); +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + buoyantPressureFvPatchScalarField + ); +} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C index 6405ab78b4..9745a50715 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/directMappedVelocityFluxFixedValue/directMappedVelocityFluxFixedValueFvPatchField.C @@ -30,14 +30,10 @@ License #include "surfaceFields.H" #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -directMappedVelocityFluxFixedValueFvPatchField:: +Foam::directMappedVelocityFluxFixedValueFvPatchField:: directMappedVelocityFluxFixedValueFvPatchField ( const fvPatch& p, @@ -49,7 +45,7 @@ directMappedVelocityFluxFixedValueFvPatchField {} -directMappedVelocityFluxFixedValueFvPatchField:: +Foam::directMappedVelocityFluxFixedValueFvPatchField:: directMappedVelocityFluxFixedValueFvPatchField ( const directMappedVelocityFluxFixedValueFvPatchField& ptf, @@ -83,7 +79,7 @@ directMappedVelocityFluxFixedValueFvPatchField } -directMappedVelocityFluxFixedValueFvPatchField:: +Foam::directMappedVelocityFluxFixedValueFvPatchField:: directMappedVelocityFluxFixedValueFvPatchField ( const fvPatch& p, @@ -138,7 +134,7 @@ directMappedVelocityFluxFixedValueFvPatchField } -directMappedVelocityFluxFixedValueFvPatchField:: +Foam::directMappedVelocityFluxFixedValueFvPatchField:: directMappedVelocityFluxFixedValueFvPatchField ( const directMappedVelocityFluxFixedValueFvPatchField& ptf @@ -149,7 +145,7 @@ directMappedVelocityFluxFixedValueFvPatchField {} -directMappedVelocityFluxFixedValueFvPatchField:: +Foam::directMappedVelocityFluxFixedValueFvPatchField:: directMappedVelocityFluxFixedValueFvPatchField ( const directMappedVelocityFluxFixedValueFvPatchField& ptf, @@ -163,7 +159,7 @@ directMappedVelocityFluxFixedValueFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void directMappedVelocityFluxFixedValueFvPatchField::updateCoeffs() +void Foam::directMappedVelocityFluxFixedValueFvPatchField::updateCoeffs() { if (updated()) { @@ -253,23 +249,27 @@ void directMappedVelocityFluxFixedValueFvPatchField::updateCoeffs() } -void directMappedVelocityFluxFixedValueFvPatchField::write(Ostream& os) const +void Foam::directMappedVelocityFluxFixedValueFvPatchField::write +( + Ostream& os +) const { fvPatchVectorField::write(os); writeEntryIfDifferent(os, "phi", "phi", phiName_); this->writeEntry("value", os); } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePatchTypeField -( - fvPatchVectorField, - directMappedVelocityFluxFixedValueFvPatchField -); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + directMappedVelocityFluxFixedValueFvPatchField + ); +} + // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C index 56730e7166..5191ab8590 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C @@ -26,15 +26,10 @@ License #include "fanFvPatchField.H" #include "IOmanip.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -fanFvPatchField::fanFvPatchField +Foam::fanFvPatchField::fanFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +42,7 @@ fanFvPatchField::fanFvPatchField template -fanFvPatchField::fanFvPatchField +Foam::fanFvPatchField::fanFvPatchField ( const fanFvPatchField& ptf, const fvPatch& p, @@ -62,7 +57,7 @@ fanFvPatchField::fanFvPatchField template -fanFvPatchField::fanFvPatchField +Foam::fanFvPatchField::fanFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -96,7 +91,7 @@ fanFvPatchField::fanFvPatchField template -fanFvPatchField::fanFvPatchField +Foam::fanFvPatchField::fanFvPatchField ( const fanFvPatchField& ptf ) @@ -109,7 +104,7 @@ fanFvPatchField::fanFvPatchField template -fanFvPatchField::fanFvPatchField +Foam::fanFvPatchField::fanFvPatchField ( const fanFvPatchField& ptf, const DimensionedField& iF @@ -124,7 +119,7 @@ fanFvPatchField::fanFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void fanFvPatchField::autoMap +void Foam::fanFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -135,7 +130,7 @@ void fanFvPatchField::autoMap template -void fanFvPatchField::rmap +void Foam::fanFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -150,7 +145,7 @@ void fanFvPatchField::rmap template -void fanFvPatchField::write(Ostream& os) const +void Foam::fanFvPatchField::write(Ostream& os) const { fvPatchField::write(os); os.writeKeyword("patchType") << "cyclic" << token::END_STATEMENT << nl; @@ -163,8 +158,4 @@ void fanFvPatchField::write(Ostream& os) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C index d2f5cdbb8d..bb86004b78 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C @@ -26,15 +26,11 @@ License #include "fixedNormalSlipFvPatchField.H" #include "symmTransformField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField +Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -46,7 +42,7 @@ fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField template -fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField +Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ( const fixedNormalSlipFvPatchField& ptf, const fvPatch& p, @@ -60,7 +56,7 @@ fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField template -fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField +Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -75,7 +71,7 @@ fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField template -fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField +Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ( const fixedNormalSlipFvPatchField& ptf ) @@ -86,7 +82,7 @@ fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField template -fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField +Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ( const fixedNormalSlipFvPatchField& ptf, const DimensionedField& iF @@ -100,7 +96,7 @@ fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void fixedNormalSlipFvPatchField::autoMap +void Foam::fixedNormalSlipFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -111,7 +107,7 @@ void fixedNormalSlipFvPatchField::autoMap template -void fixedNormalSlipFvPatchField::rmap +void Foam::fixedNormalSlipFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -127,7 +123,8 @@ void fixedNormalSlipFvPatchField::rmap template -tmp > fixedNormalSlipFvPatchField::snGrad() const +Foam::tmp > +Foam::fixedNormalSlipFvPatchField::snGrad() const { vectorField nHat = this->patch().nf(); Field pif = this->patchInternalField(); @@ -140,7 +137,10 @@ tmp > fixedNormalSlipFvPatchField::snGrad() const template -void fixedNormalSlipFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::fixedNormalSlipFvPatchField::evaluate +( + const Pstream::commsTypes +) { if (!this->updated()) { @@ -160,7 +160,8 @@ void fixedNormalSlipFvPatchField::evaluate(const Pstream::commsTypes) template -tmp > fixedNormalSlipFvPatchField::snGradTransformDiag() const +Foam::tmp > +Foam::fixedNormalSlipFvPatchField::snGradTransformDiag() const { vectorField nHat = this->patch().nf(); vectorField diag(nHat.size()); @@ -174,15 +175,11 @@ tmp > fixedNormalSlipFvPatchField::snGradTransformDiag() const template -void fixedNormalSlipFvPatchField::write(Ostream& os) const +void Foam::fixedNormalSlipFvPatchField::write(Ostream& os) const { transformFvPatchField::write(os); fixedValue_.writeEntry("fixedValue", os); } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C index f964748b18..c5487e94fd 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedPressureCompressibleDensity/fixedPressureCompressibleDensityFvPatchScalarField.C @@ -29,14 +29,9 @@ License #include "surfaceFields.H" #include "volFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -fixedPressureCompressibleDensityFvPatchScalarField:: +Foam::fixedPressureCompressibleDensityFvPatchScalarField:: fixedPressureCompressibleDensityFvPatchScalarField ( const fvPatch& p, @@ -48,7 +43,7 @@ fixedPressureCompressibleDensityFvPatchScalarField {} -fixedPressureCompressibleDensityFvPatchScalarField:: +Foam::fixedPressureCompressibleDensityFvPatchScalarField:: fixedPressureCompressibleDensityFvPatchScalarField ( const fixedPressureCompressibleDensityFvPatchScalarField& ptf, @@ -62,7 +57,7 @@ fixedPressureCompressibleDensityFvPatchScalarField {} -fixedPressureCompressibleDensityFvPatchScalarField:: +Foam::fixedPressureCompressibleDensityFvPatchScalarField:: fixedPressureCompressibleDensityFvPatchScalarField ( const fvPatch& p, @@ -75,7 +70,7 @@ fixedPressureCompressibleDensityFvPatchScalarField {} -fixedPressureCompressibleDensityFvPatchScalarField:: +Foam::fixedPressureCompressibleDensityFvPatchScalarField:: fixedPressureCompressibleDensityFvPatchScalarField ( const fixedPressureCompressibleDensityFvPatchScalarField& ptf @@ -86,7 +81,7 @@ fixedPressureCompressibleDensityFvPatchScalarField {} -fixedPressureCompressibleDensityFvPatchScalarField:: +Foam::fixedPressureCompressibleDensityFvPatchScalarField:: fixedPressureCompressibleDensityFvPatchScalarField ( const fixedPressureCompressibleDensityFvPatchScalarField& ptf, @@ -100,7 +95,7 @@ fixedPressureCompressibleDensityFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void fixedPressureCompressibleDensityFvPatchScalarField::updateCoeffs() +void Foam::fixedPressureCompressibleDensityFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -127,7 +122,7 @@ void fixedPressureCompressibleDensityFvPatchScalarField::updateCoeffs() } -void fixedPressureCompressibleDensityFvPatchScalarField::write +void Foam::fixedPressureCompressibleDensityFvPatchScalarField::write ( Ostream& os ) const @@ -140,15 +135,13 @@ void fixedPressureCompressibleDensityFvPatchScalarField::write // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchScalarField, - fixedPressureCompressibleDensityFvPatchScalarField -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + fixedPressureCompressibleDensityFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C index 65642a17a2..18d344f8d3 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C @@ -32,12 +32,10 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField +Foam::freestreamPressureFvPatchScalarField:: +freestreamPressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +45,8 @@ freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField {} -freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField +Foam::freestreamPressureFvPatchScalarField:: +freestreamPressureFvPatchScalarField ( const freestreamPressureFvPatchScalarField& ptf, const fvPatch& p, @@ -59,7 +58,8 @@ freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField {} -freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField +Foam::freestreamPressureFvPatchScalarField:: +freestreamPressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -70,7 +70,8 @@ freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField {} -freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField +Foam::freestreamPressureFvPatchScalarField:: +freestreamPressureFvPatchScalarField ( const freestreamPressureFvPatchScalarField& wbppsf ) @@ -79,7 +80,8 @@ freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField {} -freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField +Foam::freestreamPressureFvPatchScalarField:: +freestreamPressureFvPatchScalarField ( const freestreamPressureFvPatchScalarField& wbppsf, const DimensionedField& iF @@ -91,7 +93,7 @@ freestreamPressureFvPatchScalarField::freestreamPressureFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void freestreamPressureFvPatchScalarField::updateCoeffs() +void Foam::freestreamPressureFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -140,10 +142,13 @@ void freestreamPressureFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, freestreamPressureFvPatchScalarField); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + freestreamPressureFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C index 6fbb2547f5..a3f8906264 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C @@ -29,14 +29,11 @@ License #include "surfaceFields.H" #include "fvcMeshPhi.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField +Foam::movingWallVelocityFvPatchVectorField:: +movingWallVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +44,8 @@ movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField {} -movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField +Foam::movingWallVelocityFvPatchVectorField:: +movingWallVelocityFvPatchVectorField ( const movingWallVelocityFvPatchVectorField& ptf, const fvPatch& p, @@ -60,7 +58,8 @@ movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField {} -movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField +Foam::movingWallVelocityFvPatchVectorField:: +movingWallVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF, @@ -74,7 +73,8 @@ movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField } -movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField +Foam::movingWallVelocityFvPatchVectorField:: +movingWallVelocityFvPatchVectorField ( const movingWallVelocityFvPatchVectorField& mwvpvf ) @@ -84,7 +84,8 @@ movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField {} -movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField +Foam::movingWallVelocityFvPatchVectorField:: +movingWallVelocityFvPatchVectorField ( const movingWallVelocityFvPatchVectorField& mwvpvf, const DimensionedField& iF @@ -97,7 +98,7 @@ movingWallVelocityFvPatchVectorField::movingWallVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void movingWallVelocityFvPatchVectorField::updateCoeffs() +void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -133,7 +134,7 @@ void movingWallVelocityFvPatchVectorField::updateCoeffs() } -void movingWallVelocityFvPatchVectorField::write(Ostream& os) const +void Foam::movingWallVelocityFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); writeEntryIfDifferent(os, "U", "U", UName_); @@ -143,14 +144,13 @@ void movingWallVelocityFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - movingWallVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + movingWallVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C index c3f2d89451..cf370754e8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C @@ -27,15 +27,10 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -outletMappedUniformInletFvPatchField:: +Foam::outletMappedUniformInletFvPatchField:: outletMappedUniformInletFvPatchField ( const fvPatch& p, @@ -49,7 +44,7 @@ outletMappedUniformInletFvPatchField template -outletMappedUniformInletFvPatchField:: +Foam::outletMappedUniformInletFvPatchField:: outletMappedUniformInletFvPatchField ( const outletMappedUniformInletFvPatchField& ptf, @@ -65,7 +60,7 @@ outletMappedUniformInletFvPatchField template -outletMappedUniformInletFvPatchField:: +Foam::outletMappedUniformInletFvPatchField:: outletMappedUniformInletFvPatchField ( const fvPatch& p, @@ -80,7 +75,7 @@ outletMappedUniformInletFvPatchField template -outletMappedUniformInletFvPatchField:: +Foam::outletMappedUniformInletFvPatchField:: outletMappedUniformInletFvPatchField ( const outletMappedUniformInletFvPatchField& ptf @@ -94,7 +89,7 @@ outletMappedUniformInletFvPatchField template -outletMappedUniformInletFvPatchField:: +Foam::outletMappedUniformInletFvPatchField:: outletMappedUniformInletFvPatchField ( const outletMappedUniformInletFvPatchField& ptf, @@ -110,7 +105,7 @@ outletMappedUniformInletFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void outletMappedUniformInletFvPatchField::updateCoeffs() +void Foam::outletMappedUniformInletFvPatchField::updateCoeffs() { if (this->updated()) { @@ -170,7 +165,7 @@ void outletMappedUniformInletFvPatchField::updateCoeffs() template -void outletMappedUniformInletFvPatchField::write(Ostream& os) const +void Foam::outletMappedUniformInletFvPatchField::write(Ostream& os) const { fvPatchField::write(os); os.writeKeyword("outletPatchName") @@ -183,8 +178,4 @@ void outletMappedUniformInletFvPatchField::write(Ostream& os) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C index 6ebeda2d55..9f6b9aba0b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C @@ -26,15 +26,10 @@ License #include "partialSlipFvPatchField.H" #include "symmTransformField.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -partialSlipFvPatchField::partialSlipFvPatchField +Foam::partialSlipFvPatchField::partialSlipFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -46,7 +41,7 @@ partialSlipFvPatchField::partialSlipFvPatchField template -partialSlipFvPatchField::partialSlipFvPatchField +Foam::partialSlipFvPatchField::partialSlipFvPatchField ( const partialSlipFvPatchField& ptf, const fvPatch& p, @@ -60,7 +55,7 @@ partialSlipFvPatchField::partialSlipFvPatchField template -partialSlipFvPatchField::partialSlipFvPatchField +Foam::partialSlipFvPatchField::partialSlipFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -75,7 +70,7 @@ partialSlipFvPatchField::partialSlipFvPatchField template -partialSlipFvPatchField::partialSlipFvPatchField +Foam::partialSlipFvPatchField::partialSlipFvPatchField ( const partialSlipFvPatchField& ptf ) @@ -86,7 +81,7 @@ partialSlipFvPatchField::partialSlipFvPatchField template -partialSlipFvPatchField::partialSlipFvPatchField +Foam::partialSlipFvPatchField::partialSlipFvPatchField ( const partialSlipFvPatchField& ptf, const DimensionedField& iF @@ -100,7 +95,7 @@ partialSlipFvPatchField::partialSlipFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void partialSlipFvPatchField::autoMap +void Foam::partialSlipFvPatchField::autoMap ( const fvPatchFieldMapper& m ) @@ -111,7 +106,7 @@ void partialSlipFvPatchField::autoMap template -void partialSlipFvPatchField::rmap +void Foam::partialSlipFvPatchField::rmap ( const fvPatchField& ptf, const labelList& addr @@ -127,7 +122,8 @@ void partialSlipFvPatchField::rmap template -tmp > partialSlipFvPatchField::snGrad() const +Foam::tmp > +Foam::partialSlipFvPatchField::snGrad() const { vectorField nHat = this->patch().nf(); Field pif = this->patchInternalField(); @@ -140,7 +136,10 @@ tmp > partialSlipFvPatchField::snGrad() const template -void partialSlipFvPatchField::evaluate(const Pstream::commsTypes) +void Foam::partialSlipFvPatchField::evaluate +( + const Pstream::commsTypes +) { if (!this->updated()) { @@ -160,7 +159,8 @@ void partialSlipFvPatchField::evaluate(const Pstream::commsTypes) template -tmp > partialSlipFvPatchField::snGradTransformDiag() const +Foam::tmp > +Foam::partialSlipFvPatchField::snGradTransformDiag() const { vectorField nHat = this->patch().nf(); vectorField diag(nHat.size()); @@ -177,15 +177,11 @@ tmp > partialSlipFvPatchField::snGradTransformDiag() const template -void partialSlipFvPatchField::write(Ostream& os) const +void Foam::partialSlipFvPatchField::write(Ostream& os) const { transformFvPatchField::write(os); valueFraction_.writeEntry("valueFraction", os); } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index 6046617e72..8ed28fd742 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C @@ -29,14 +29,9 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pressureDirectedInletOutletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: pressureDirectedInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -54,7 +49,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField } -pressureDirectedInletOutletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: pressureDirectedInletOutletVelocityFvPatchVectorField ( const pressureDirectedInletOutletVelocityFvPatchVectorField& ptf, @@ -70,7 +65,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField {} -pressureDirectedInletOutletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: pressureDirectedInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -90,7 +85,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField } -pressureDirectedInletOutletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: pressureDirectedInletOutletVelocityFvPatchVectorField ( const pressureDirectedInletOutletVelocityFvPatchVectorField& pivpvf @@ -103,7 +98,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField {} -pressureDirectedInletOutletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletOutletVelocityFvPatchVectorField:: pressureDirectedInletOutletVelocityFvPatchVectorField ( const pressureDirectedInletOutletVelocityFvPatchVectorField& pivpvf, @@ -119,7 +114,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void pressureDirectedInletOutletVelocityFvPatchVectorField::autoMap +void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::autoMap ( const fvPatchFieldMapper& m ) @@ -129,7 +124,7 @@ void pressureDirectedInletOutletVelocityFvPatchVectorField::autoMap } -void pressureDirectedInletOutletVelocityFvPatchVectorField::rmap +void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::rmap ( const fvPatchVectorField& ptf, const labelList& addr @@ -145,7 +140,7 @@ void pressureDirectedInletOutletVelocityFvPatchVectorField::rmap } -void pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs() +void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -191,8 +186,10 @@ void pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs() } -void pressureDirectedInletOutletVelocityFvPatchVectorField:: -write(Ostream& os) const +void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::write +( + Ostream& os +) const { fvPatchVectorField::write(os); writeEntryIfDifferent(os, "phi", "phi", phiName_); @@ -204,7 +201,7 @@ write(Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -void pressureDirectedInletOutletVelocityFvPatchVectorField::operator= +void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::operator= ( const fvPatchField& pvf ) @@ -219,14 +216,13 @@ void pressureDirectedInletOutletVelocityFvPatchVectorField::operator= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - pressureDirectedInletOutletVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + pressureDirectedInletOutletVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index 6125ee41de..bd4ab5d2d3 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C @@ -29,14 +29,10 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pressureDirectedInletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletVelocityFvPatchVectorField:: pressureDirectedInletVelocityFvPatchVectorField ( const fvPatch& p, @@ -50,7 +46,7 @@ pressureDirectedInletVelocityFvPatchVectorField {} -pressureDirectedInletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletVelocityFvPatchVectorField:: pressureDirectedInletVelocityFvPatchVectorField ( const pressureDirectedInletVelocityFvPatchVectorField& ptf, @@ -66,7 +62,7 @@ pressureDirectedInletVelocityFvPatchVectorField {} -pressureDirectedInletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletVelocityFvPatchVectorField:: pressureDirectedInletVelocityFvPatchVectorField ( const fvPatch& p, @@ -83,7 +79,7 @@ pressureDirectedInletVelocityFvPatchVectorField } -pressureDirectedInletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletVelocityFvPatchVectorField:: pressureDirectedInletVelocityFvPatchVectorField ( const pressureDirectedInletVelocityFvPatchVectorField& pivpvf @@ -96,7 +92,7 @@ pressureDirectedInletVelocityFvPatchVectorField {} -pressureDirectedInletVelocityFvPatchVectorField:: +Foam::pressureDirectedInletVelocityFvPatchVectorField:: pressureDirectedInletVelocityFvPatchVectorField ( const pressureDirectedInletVelocityFvPatchVectorField& pivpvf, @@ -112,7 +108,7 @@ pressureDirectedInletVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void pressureDirectedInletVelocityFvPatchVectorField::autoMap +void Foam::pressureDirectedInletVelocityFvPatchVectorField::autoMap ( const fvPatchFieldMapper& m ) @@ -122,7 +118,7 @@ void pressureDirectedInletVelocityFvPatchVectorField::autoMap } -void pressureDirectedInletVelocityFvPatchVectorField::rmap +void Foam::pressureDirectedInletVelocityFvPatchVectorField::rmap ( const fvPatchVectorField& ptf, const labelList& addr @@ -137,7 +133,7 @@ void pressureDirectedInletVelocityFvPatchVectorField::rmap } -void pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs() +void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -180,7 +176,10 @@ void pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs() } -void pressureDirectedInletVelocityFvPatchVectorField::write(Ostream& os) const +void Foam::pressureDirectedInletVelocityFvPatchVectorField::write +( + Ostream& os +) const { fvPatchVectorField::write(os); writeEntryIfDifferent(os, "phi", "phi", phiName_); @@ -192,7 +191,7 @@ void pressureDirectedInletVelocityFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -void pressureDirectedInletVelocityFvPatchVectorField::operator= +void Foam::pressureDirectedInletVelocityFvPatchVectorField::operator= ( const fvPatchField& pvf ) @@ -203,15 +202,13 @@ void pressureDirectedInletVelocityFvPatchVectorField::operator= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - pressureDirectedInletVelocityFvPatchVectorField -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + pressureDirectedInletVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C index 9d28b4796b..b69fdb9a8d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C @@ -28,14 +28,10 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pressureInletOutletVelocityFvPatchVectorField:: +Foam::pressureInletOutletVelocityFvPatchVectorField:: pressureInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -51,7 +47,7 @@ pressureInletOutletVelocityFvPatchVectorField } -pressureInletOutletVelocityFvPatchVectorField:: +Foam::pressureInletOutletVelocityFvPatchVectorField:: pressureInletOutletVelocityFvPatchVectorField ( const pressureInletOutletVelocityFvPatchVectorField& ptf, @@ -70,7 +66,7 @@ pressureInletOutletVelocityFvPatchVectorField } -pressureInletOutletVelocityFvPatchVectorField:: +Foam::pressureInletOutletVelocityFvPatchVectorField:: pressureInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -100,7 +96,7 @@ pressureInletOutletVelocityFvPatchVectorField } -pressureInletOutletVelocityFvPatchVectorField:: +Foam::pressureInletOutletVelocityFvPatchVectorField:: pressureInletOutletVelocityFvPatchVectorField ( const pressureInletOutletVelocityFvPatchVectorField& pivpvf @@ -112,7 +108,7 @@ pressureInletOutletVelocityFvPatchVectorField {} -pressureInletOutletVelocityFvPatchVectorField:: +Foam::pressureInletOutletVelocityFvPatchVectorField:: pressureInletOutletVelocityFvPatchVectorField ( const pressureInletOutletVelocityFvPatchVectorField& pivpvf, @@ -127,7 +123,7 @@ pressureInletOutletVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void pressureInletOutletVelocityFvPatchVectorField:: +void Foam::pressureInletOutletVelocityFvPatchVectorField:: setTangentialVelocity(const vectorField& tangentialVelocity) { tangentialVelocity_ = tangentialVelocity; @@ -136,7 +132,7 @@ setTangentialVelocity(const vectorField& tangentialVelocity) } -void pressureInletOutletVelocityFvPatchVectorField::autoMap +void Foam::pressureInletOutletVelocityFvPatchVectorField::autoMap ( const fvPatchFieldMapper& m ) @@ -149,7 +145,7 @@ void pressureInletOutletVelocityFvPatchVectorField::autoMap } -void pressureInletOutletVelocityFvPatchVectorField::rmap +void Foam::pressureInletOutletVelocityFvPatchVectorField::rmap ( const fvPatchVectorField& ptf, const labelList& addr @@ -167,7 +163,7 @@ void pressureInletOutletVelocityFvPatchVectorField::rmap } -void pressureInletOutletVelocityFvPatchVectorField::updateCoeffs() +void Foam::pressureInletOutletVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -184,7 +180,11 @@ void pressureInletOutletVelocityFvPatchVectorField::updateCoeffs() } -void pressureInletOutletVelocityFvPatchVectorField::write(Ostream& os) const +void Foam::pressureInletOutletVelocityFvPatchVectorField::write +( + Ostream& os +) +const { fvPatchVectorField::write(os); writeEntryIfDifferent(os, "phi", "phi", phiName_); @@ -198,7 +198,7 @@ void pressureInletOutletVelocityFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -void pressureInletOutletVelocityFvPatchVectorField::operator= +void Foam::pressureInletOutletVelocityFvPatchVectorField::operator= ( const fvPatchField& pvf ) @@ -211,14 +211,13 @@ void pressureInletOutletVelocityFvPatchVectorField::operator= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - pressureInletOutletVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + pressureInletOutletVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C index 46bd5d107f..e26dde8506 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletUniformVelocity/pressureInletUniformVelocityFvPatchVectorField.C @@ -28,14 +28,9 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pressureInletUniformVelocityFvPatchVectorField:: +Foam::pressureInletUniformVelocityFvPatchVectorField:: pressureInletUniformVelocityFvPatchVectorField ( const fvPatch& p, @@ -46,7 +41,7 @@ pressureInletUniformVelocityFvPatchVectorField {} -pressureInletUniformVelocityFvPatchVectorField:: +Foam::pressureInletUniformVelocityFvPatchVectorField:: pressureInletUniformVelocityFvPatchVectorField ( const pressureInletUniformVelocityFvPatchVectorField& ptf, @@ -59,7 +54,7 @@ pressureInletUniformVelocityFvPatchVectorField {} -pressureInletUniformVelocityFvPatchVectorField:: +Foam::pressureInletUniformVelocityFvPatchVectorField:: pressureInletUniformVelocityFvPatchVectorField ( const fvPatch& p, @@ -71,7 +66,7 @@ pressureInletUniformVelocityFvPatchVectorField {} -pressureInletUniformVelocityFvPatchVectorField:: +Foam::pressureInletUniformVelocityFvPatchVectorField:: pressureInletUniformVelocityFvPatchVectorField ( const pressureInletUniformVelocityFvPatchVectorField& pivpvf @@ -81,7 +76,7 @@ pressureInletUniformVelocityFvPatchVectorField {} -pressureInletUniformVelocityFvPatchVectorField:: +Foam::pressureInletUniformVelocityFvPatchVectorField:: pressureInletUniformVelocityFvPatchVectorField ( const pressureInletUniformVelocityFvPatchVectorField& pivpvf, @@ -94,7 +89,7 @@ pressureInletUniformVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void pressureInletUniformVelocityFvPatchVectorField::updateCoeffs() +void Foam::pressureInletUniformVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -109,7 +104,7 @@ void pressureInletUniformVelocityFvPatchVectorField::updateCoeffs() // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -void pressureInletUniformVelocityFvPatchVectorField::operator= +void Foam::pressureInletUniformVelocityFvPatchVectorField::operator= ( const fvPatchField& pvf ) @@ -120,14 +115,13 @@ void pressureInletUniformVelocityFvPatchVectorField::operator= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - pressureInletUniformVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + pressureInletUniformVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C index 84513de9f9..bb705ce28c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C @@ -28,14 +28,10 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField +Foam::pressureInletVelocityFvPatchVectorField:: +pressureInletVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +43,8 @@ pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField {} -pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField +Foam::pressureInletVelocityFvPatchVectorField:: +pressureInletVelocityFvPatchVectorField ( const pressureInletVelocityFvPatchVectorField& ptf, const fvPatch& p, @@ -61,7 +58,8 @@ pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField {} -pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField +Foam::pressureInletVelocityFvPatchVectorField:: +pressureInletVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF, @@ -76,7 +74,8 @@ pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField } -pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField +Foam::pressureInletVelocityFvPatchVectorField:: +pressureInletVelocityFvPatchVectorField ( const pressureInletVelocityFvPatchVectorField& pivpvf ) @@ -87,7 +86,8 @@ pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField {} -pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField +Foam::pressureInletVelocityFvPatchVectorField:: +pressureInletVelocityFvPatchVectorField ( const pressureInletVelocityFvPatchVectorField& pivpvf, const DimensionedField& iF @@ -101,7 +101,7 @@ pressureInletVelocityFvPatchVectorField::pressureInletVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void pressureInletVelocityFvPatchVectorField::updateCoeffs() +void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -142,7 +142,7 @@ void pressureInletVelocityFvPatchVectorField::updateCoeffs() } -void pressureInletVelocityFvPatchVectorField::write(Ostream& os) const +void Foam::pressureInletVelocityFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); writeEntryIfDifferent(os, "phi", "phi", phiName_); @@ -153,7 +153,7 @@ void pressureInletVelocityFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -void pressureInletVelocityFvPatchVectorField::operator= +void Foam::pressureInletVelocityFvPatchVectorField::operator= ( const fvPatchField& pvf ) @@ -164,14 +164,13 @@ void pressureInletVelocityFvPatchVectorField::operator= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - pressureInletVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + pressureInletVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C index 4ac7f309f2..802f73d114 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C @@ -29,14 +29,10 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -pressureNormalInletOutletVelocityFvPatchVectorField:: +Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: pressureNormalInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -53,7 +49,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField } -pressureNormalInletOutletVelocityFvPatchVectorField:: +Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: pressureNormalInletOutletVelocityFvPatchVectorField ( const pressureNormalInletOutletVelocityFvPatchVectorField& ptf, @@ -68,7 +64,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField {} -pressureNormalInletOutletVelocityFvPatchVectorField:: +Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: pressureNormalInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -87,7 +83,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField } -pressureNormalInletOutletVelocityFvPatchVectorField:: +Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: pressureNormalInletOutletVelocityFvPatchVectorField ( const pressureNormalInletOutletVelocityFvPatchVectorField& pivpvf @@ -99,7 +95,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField {} -pressureNormalInletOutletVelocityFvPatchVectorField:: +Foam::pressureNormalInletOutletVelocityFvPatchVectorField:: pressureNormalInletOutletVelocityFvPatchVectorField ( const pressureNormalInletOutletVelocityFvPatchVectorField& pivpvf, @@ -114,7 +110,7 @@ pressureNormalInletOutletVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs() +void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -160,8 +156,10 @@ void pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs() } -void pressureNormalInletOutletVelocityFvPatchVectorField:: -write(Ostream& os) const +void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::write +( + Ostream& os +) const { fvPatchVectorField::write(os); os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl; @@ -172,7 +170,7 @@ write(Ostream& os) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -void pressureNormalInletOutletVelocityFvPatchVectorField::operator= +void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::operator= ( const fvPatchField& pvf ) @@ -187,14 +185,13 @@ void pressureNormalInletOutletVelocityFvPatchVectorField::operator= // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - pressureNormalInletOutletVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + pressureNormalInletOutletVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C index 6b9d4efb12..31cbd43150 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C @@ -28,28 +28,25 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void rotatingPressureInletOutletVelocityFvPatchVectorField:: +void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: calcTangentialVelocity() { vector axisHat = omega_/mag(omega_); - vectorField tangentialVelocity = - (-omega_) ^ (patch().Cf() - axisHat*(axisHat & patch().Cf())); + const vectorField tangentialVelocity + ( + (-omega_) ^ (patch().Cf() - axisHat*(axisHat & patch().Cf())) + ); - vectorField n = patch().nf(); + const vectorField n(patch().nf()); refValue() = tangentialVelocity - n*(n & tangentialVelocity); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -rotatingPressureInletOutletVelocityFvPatchVectorField:: +Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: rotatingPressureInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -61,7 +58,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField {} -rotatingPressureInletOutletVelocityFvPatchVectorField:: +Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: rotatingPressureInletOutletVelocityFvPatchVectorField ( const rotatingPressureInletOutletVelocityFvPatchVectorField& ptf, @@ -77,7 +74,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField } -rotatingPressureInletOutletVelocityFvPatchVectorField:: +Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: rotatingPressureInletOutletVelocityFvPatchVectorField ( const fvPatch& p, @@ -92,7 +89,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField } -rotatingPressureInletOutletVelocityFvPatchVectorField:: +Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: rotatingPressureInletOutletVelocityFvPatchVectorField ( const rotatingPressureInletOutletVelocityFvPatchVectorField& pivpvf @@ -105,7 +102,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField } -rotatingPressureInletOutletVelocityFvPatchVectorField:: +Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: rotatingPressureInletOutletVelocityFvPatchVectorField ( const rotatingPressureInletOutletVelocityFvPatchVectorField& pivpvf, @@ -121,8 +118,10 @@ rotatingPressureInletOutletVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void rotatingPressureInletOutletVelocityFvPatchVectorField:: -write(Ostream& os) const +void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField::write +( + Ostream& os +) const { fvPatchVectorField::write(os); os.writeKeyword("phi") << phiName() << token::END_STATEMENT << nl; @@ -133,14 +132,13 @@ write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - rotatingPressureInletOutletVelocityFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + rotatingPressureInletOutletVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C index 11debd3620..71603923e9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C @@ -29,14 +29,10 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField +Foam::rotatingTotalPressureFvPatchScalarField:: +rotatingTotalPressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +43,8 @@ rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField {} -rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField +Foam::rotatingTotalPressureFvPatchScalarField:: +rotatingTotalPressureFvPatchScalarField ( const rotatingTotalPressureFvPatchScalarField& ptf, const fvPatch& p, @@ -60,7 +57,8 @@ rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField {} -rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField +Foam::rotatingTotalPressureFvPatchScalarField:: +rotatingTotalPressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -72,7 +70,8 @@ rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField {} -rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField +Foam::rotatingTotalPressureFvPatchScalarField:: +rotatingTotalPressureFvPatchScalarField ( const rotatingTotalPressureFvPatchScalarField& tppsf ) @@ -82,7 +81,8 @@ rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField {} -rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField +Foam::rotatingTotalPressureFvPatchScalarField:: +rotatingTotalPressureFvPatchScalarField ( const rotatingTotalPressureFvPatchScalarField& tppsf, const DimensionedField& iF @@ -95,7 +95,7 @@ rotatingTotalPressureFvPatchScalarField::rotatingTotalPressureFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void rotatingTotalPressureFvPatchScalarField::updateCoeffs() +void Foam::rotatingTotalPressureFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -113,7 +113,7 @@ void rotatingTotalPressureFvPatchScalarField::updateCoeffs() } -void rotatingTotalPressureFvPatchScalarField::write(Ostream& os) const +void Foam::rotatingTotalPressureFvPatchScalarField::write(Ostream& os) const { totalPressureFvPatchScalarField::write(os); os.writeKeyword("omega")<< omega_ << token::END_STATEMENT << nl; @@ -122,14 +122,13 @@ void rotatingTotalPressureFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchScalarField, - rotatingTotalPressureFvPatchScalarField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + rotatingTotalPressureFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C index 202ce95118..4cba82bab6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C @@ -28,14 +28,10 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField +Foam::rotatingWallVelocityFvPatchVectorField:: +rotatingWallVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF @@ -48,7 +44,8 @@ rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField {} -rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField +Foam::rotatingWallVelocityFvPatchVectorField:: +rotatingWallVelocityFvPatchVectorField ( const rotatingWallVelocityFvPatchVectorField& ptf, const fvPatch& p, @@ -63,7 +60,8 @@ rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField {} -rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField +Foam::rotatingWallVelocityFvPatchVectorField:: +rotatingWallVelocityFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF, @@ -80,7 +78,8 @@ rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField } -rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField +Foam::rotatingWallVelocityFvPatchVectorField:: +rotatingWallVelocityFvPatchVectorField ( const rotatingWallVelocityFvPatchVectorField& pivpvf ) @@ -92,7 +91,8 @@ rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField {} -rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField +Foam::rotatingWallVelocityFvPatchVectorField:: +rotatingWallVelocityFvPatchVectorField ( const rotatingWallVelocityFvPatchVectorField& pivpvf, const DimensionedField& iF @@ -107,7 +107,7 @@ rotatingWallVelocityFvPatchVectorField::rotatingWallVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void rotatingWallVelocityFvPatchVectorField::updateCoeffs() +void Foam::rotatingWallVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -126,7 +126,7 @@ void rotatingWallVelocityFvPatchVectorField::updateCoeffs() } -void rotatingWallVelocityFvPatchVectorField::write(Ostream& os) const +void Foam::rotatingWallVelocityFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl; @@ -138,15 +138,13 @@ void rotatingWallVelocityFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - rotatingWallVelocityFvPatchVectorField -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + rotatingWallVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C index 9f78e1f2f3..a7ad4a8703 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C @@ -28,14 +28,10 @@ License #include "fvPatchFieldMapper.H" #include "volFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField +Foam::supersonicFreestreamFvPatchVectorField:: +supersonicFreestreamFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF @@ -53,7 +49,8 @@ supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField } -supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField +Foam::supersonicFreestreamFvPatchVectorField:: +supersonicFreestreamFvPatchVectorField ( const supersonicFreestreamFvPatchVectorField& ptf, const fvPatch& p, @@ -69,7 +66,8 @@ supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField {} -supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField +Foam::supersonicFreestreamFvPatchVectorField:: +supersonicFreestreamFvPatchVectorField ( const fvPatch& p, const DimensionedField& iF, @@ -115,7 +113,8 @@ supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField } -supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField +Foam::supersonicFreestreamFvPatchVectorField:: +supersonicFreestreamFvPatchVectorField ( const supersonicFreestreamFvPatchVectorField& sfspvf ) @@ -128,7 +127,8 @@ supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField {} -supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField +Foam::supersonicFreestreamFvPatchVectorField:: +supersonicFreestreamFvPatchVectorField ( const supersonicFreestreamFvPatchVectorField& sfspvf, const DimensionedField& iF @@ -144,7 +144,7 @@ supersonicFreestreamFvPatchVectorField::supersonicFreestreamFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void supersonicFreestreamFvPatchVectorField::updateCoeffs() +void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs() { if (!size() || updated()) { @@ -290,7 +290,7 @@ void supersonicFreestreamFvPatchVectorField::updateCoeffs() } -void supersonicFreestreamFvPatchVectorField::write(Ostream& os) const +void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); os.writeKeyword("UInf") << UInf_ << token::END_STATEMENT << nl; @@ -303,14 +303,13 @@ void supersonicFreestreamFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - supersonicFreestreamFvPatchVectorField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + supersonicFreestreamFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C index 59edbe9b99..e85efa260c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C @@ -28,14 +28,9 @@ License #include "volFields.H" #include "fvPatchFieldMapper.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -surfaceNormalFixedValueFvPatchVectorField:: +Foam::surfaceNormalFixedValueFvPatchVectorField:: surfaceNormalFixedValueFvPatchVectorField ( const fvPatch& p, @@ -47,7 +42,7 @@ surfaceNormalFixedValueFvPatchVectorField {} -surfaceNormalFixedValueFvPatchVectorField:: +Foam::surfaceNormalFixedValueFvPatchVectorField:: surfaceNormalFixedValueFvPatchVectorField ( const surfaceNormalFixedValueFvPatchVectorField& ptf, @@ -63,7 +58,7 @@ surfaceNormalFixedValueFvPatchVectorField } -surfaceNormalFixedValueFvPatchVectorField:: +Foam::surfaceNormalFixedValueFvPatchVectorField:: surfaceNormalFixedValueFvPatchVectorField ( const fvPatch& p, @@ -78,7 +73,7 @@ surfaceNormalFixedValueFvPatchVectorField } -surfaceNormalFixedValueFvPatchVectorField:: +Foam::surfaceNormalFixedValueFvPatchVectorField:: surfaceNormalFixedValueFvPatchVectorField ( const surfaceNormalFixedValueFvPatchVectorField& pivpvf @@ -89,7 +84,7 @@ surfaceNormalFixedValueFvPatchVectorField {} -surfaceNormalFixedValueFvPatchVectorField:: +Foam::surfaceNormalFixedValueFvPatchVectorField:: surfaceNormalFixedValueFvPatchVectorField ( const surfaceNormalFixedValueFvPatchVectorField& pivpvf, @@ -103,7 +98,7 @@ surfaceNormalFixedValueFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void surfaceNormalFixedValueFvPatchVectorField::autoMap +void Foam::surfaceNormalFixedValueFvPatchVectorField::autoMap ( const fvPatchFieldMapper& m ) @@ -113,7 +108,7 @@ void surfaceNormalFixedValueFvPatchVectorField::autoMap } -void surfaceNormalFixedValueFvPatchVectorField::rmap +void Foam::surfaceNormalFixedValueFvPatchVectorField::rmap ( const fvPatchVectorField& ptf, const labelList& addr @@ -128,7 +123,7 @@ void surfaceNormalFixedValueFvPatchVectorField::rmap } -void surfaceNormalFixedValueFvPatchVectorField::write(Ostream& os) const +void Foam::surfaceNormalFixedValueFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); refValue_.writeEntry("refValue", os); @@ -137,15 +132,13 @@ void surfaceNormalFixedValueFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - surfaceNormalFixedValueFvPatchVectorField -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + surfaceNormalFixedValueFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C index f2ce5d6ec9..281591808f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C @@ -29,14 +29,9 @@ License #include "fvPatchFieldMapper.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -syringePressureFvPatchScalarField::syringePressureFvPatchScalarField +Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +42,7 @@ syringePressureFvPatchScalarField::syringePressureFvPatchScalarField {} -syringePressureFvPatchScalarField::syringePressureFvPatchScalarField +Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField ( const syringePressureFvPatchScalarField& sppsf, const fvPatch& p, @@ -71,7 +66,7 @@ syringePressureFvPatchScalarField::syringePressureFvPatchScalarField {} -syringePressureFvPatchScalarField::syringePressureFvPatchScalarField +Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -97,7 +92,7 @@ syringePressureFvPatchScalarField::syringePressureFvPatchScalarField } -syringePressureFvPatchScalarField::syringePressureFvPatchScalarField +Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField ( const syringePressureFvPatchScalarField& sppsf, const DimensionedField& iF @@ -119,7 +114,7 @@ syringePressureFvPatchScalarField::syringePressureFvPatchScalarField {} -syringePressureFvPatchScalarField::syringePressureFvPatchScalarField +Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField ( const syringePressureFvPatchScalarField& sppsf ) @@ -142,7 +137,7 @@ syringePressureFvPatchScalarField::syringePressureFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -scalar syringePressureFvPatchScalarField::Vs(const scalar t) const +Foam::scalar Foam::syringePressureFvPatchScalarField::Vs(const scalar t) const { if (t < tas_) { @@ -181,7 +176,7 @@ scalar syringePressureFvPatchScalarField::Vs(const scalar t) const } -void syringePressureFvPatchScalarField::updateCoeffs() +void Foam::syringePressureFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -229,7 +224,7 @@ void syringePressureFvPatchScalarField::updateCoeffs() } -void syringePressureFvPatchScalarField::write(Ostream& os) const +void Foam::syringePressureFvPatchScalarField::write(Ostream& os) const { fvPatchScalarField::write(os); @@ -250,14 +245,13 @@ void syringePressureFvPatchScalarField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchScalarField, - syringePressureFvPatchScalarField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + syringePressureFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C index a0b85e0fed..4fab0733c5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C @@ -28,14 +28,9 @@ License #include "volFields.H" #include "surfaceFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -translatingWallVelocityFvPatchVectorField:: +Foam::translatingWallVelocityFvPatchVectorField:: translatingWallVelocityFvPatchVectorField ( const fvPatch& p, @@ -47,7 +42,7 @@ translatingWallVelocityFvPatchVectorField {} -translatingWallVelocityFvPatchVectorField:: +Foam::translatingWallVelocityFvPatchVectorField:: translatingWallVelocityFvPatchVectorField ( const translatingWallVelocityFvPatchVectorField& ptf, @@ -61,7 +56,7 @@ translatingWallVelocityFvPatchVectorField {} -translatingWallVelocityFvPatchVectorField:: +Foam::translatingWallVelocityFvPatchVectorField:: translatingWallVelocityFvPatchVectorField ( const fvPatch& p, @@ -77,7 +72,7 @@ translatingWallVelocityFvPatchVectorField } -translatingWallVelocityFvPatchVectorField:: +Foam::translatingWallVelocityFvPatchVectorField:: translatingWallVelocityFvPatchVectorField ( const translatingWallVelocityFvPatchVectorField& twvpvf @@ -88,7 +83,7 @@ translatingWallVelocityFvPatchVectorField {} -translatingWallVelocityFvPatchVectorField:: +Foam::translatingWallVelocityFvPatchVectorField:: translatingWallVelocityFvPatchVectorField ( const translatingWallVelocityFvPatchVectorField& twvpvf, @@ -102,7 +97,7 @@ translatingWallVelocityFvPatchVectorField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void translatingWallVelocityFvPatchVectorField::updateCoeffs() +void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs() { if (updated()) { @@ -117,7 +112,7 @@ void translatingWallVelocityFvPatchVectorField::updateCoeffs() } -void translatingWallVelocityFvPatchVectorField::write(Ostream& os) const +void Foam::translatingWallVelocityFvPatchVectorField::write(Ostream& os) const { fvPatchVectorField::write(os); os.writeKeyword("U") << U_ << token::END_STATEMENT << nl; @@ -127,15 +122,13 @@ void translatingWallVelocityFvPatchVectorField::write(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchVectorField, - translatingWallVelocityFvPatchVectorField -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchVectorField, + translatingWallVelocityFvPatchVectorField + ); +} // ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C index 477bb6f22c..81530009e7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C @@ -31,15 +31,10 @@ License #include "CrankNicholsonDdtScheme.H" #include "backwardDdtScheme.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -waveTransmissiveFvPatchField::waveTransmissiveFvPatchField +Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -52,7 +47,7 @@ waveTransmissiveFvPatchField::waveTransmissiveFvPatchField template -waveTransmissiveFvPatchField::waveTransmissiveFvPatchField +Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField ( const waveTransmissiveFvPatchField& ptf, const fvPatch& p, @@ -67,7 +62,7 @@ waveTransmissiveFvPatchField::waveTransmissiveFvPatchField template -waveTransmissiveFvPatchField::waveTransmissiveFvPatchField +Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -81,7 +76,7 @@ waveTransmissiveFvPatchField::waveTransmissiveFvPatchField template -waveTransmissiveFvPatchField::waveTransmissiveFvPatchField +Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField ( const waveTransmissiveFvPatchField& ptpsf ) @@ -93,7 +88,7 @@ waveTransmissiveFvPatchField::waveTransmissiveFvPatchField template -waveTransmissiveFvPatchField::waveTransmissiveFvPatchField +Foam::waveTransmissiveFvPatchField::waveTransmissiveFvPatchField ( const waveTransmissiveFvPatchField& ptpsf, const DimensionedField& iF @@ -108,7 +103,8 @@ waveTransmissiveFvPatchField::waveTransmissiveFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -tmp waveTransmissiveFvPatchField::advectionSpeed() const +Foam::tmp +Foam::waveTransmissiveFvPatchField::advectionSpeed() const { // Lookup the velocity and compressibility of the patch const fvPatchField& psip = this->patch().lookupPatchField @@ -149,7 +145,7 @@ tmp waveTransmissiveFvPatchField::advectionSpeed() const template -void waveTransmissiveFvPatchField::write(Ostream& os) const +void Foam::waveTransmissiveFvPatchField::write(Ostream& os) const { fvPatchField::write(os); @@ -179,8 +175,4 @@ void waveTransmissiveFvPatchField::write(Ostream& os) const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C index bdf117c3a5..d5b149ecff 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C @@ -28,21 +28,19 @@ License #include "fvMesh.H" #include "transform.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defineTypeNameAndDebug(cyclicFvPatch, 0); -addToRunTimeSelectionTable(fvPatch, cyclicFvPatch, polyPatch); + defineTypeNameAndDebug(cyclicFvPatch, 0); + addToRunTimeSelectionTable(fvPatch, cyclicFvPatch, polyPatch); +} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // Make patch weighting factors -void cyclicFvPatch::makeWeights(scalarField& w) const +void Foam::cyclicFvPatch::makeWeights(scalarField& w) const { const cyclicFvPatch& nbrPatch = neighbFvPatch(); @@ -58,7 +56,7 @@ void cyclicFvPatch::makeWeights(scalarField& w) const if (mag(magFa[facei] - nbrMagFa[facei])/avFa > 1e-4) { - FatalErrorIn("cyclicFvPatch::makeWeights(scalarField& w) const") + FatalErrorIn("cyclicFvPatch::makeWeights(scalarField&) const") << "face " << facei << " areas do not match by " << 100*mag(magFa[facei] - nbrMagFa[facei])/avFa << "% -- possible face ordering problem" @@ -74,7 +72,7 @@ void cyclicFvPatch::makeWeights(scalarField& w) const // Make patch face - neighbour cell distances -void cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const +void Foam::cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const { //const cyclicPolyPatch& nbrPatch = cyclicPolyPatch_.neighbPatch(); const cyclicFvPatch& nbrPatch = neighbFvPatch(); @@ -93,7 +91,7 @@ void cyclicFvPatch::makeDeltaCoeffs(scalarField& dc) const // Return delta (P to N) vectors across coupled patch -tmp cyclicFvPatch::delta() const +Foam::tmp Foam::cyclicFvPatch::delta() const { vectorField patchD = fvPatch::delta(); vectorField nbrPatchD = neighbFvPatch().fvPatch::delta(); @@ -127,7 +125,7 @@ tmp cyclicFvPatch::delta() const } -tmp cyclicFvPatch::interfaceInternalField +Foam::tmp Foam::cyclicFvPatch::interfaceInternalField ( const labelUList& internalData ) const @@ -136,7 +134,7 @@ tmp cyclicFvPatch::interfaceInternalField } -tmp cyclicFvPatch::internalFieldTransfer +Foam::tmp Foam::cyclicFvPatch::internalFieldTransfer ( const Pstream::commsTypes commsType, const labelUList& iF @@ -146,8 +144,4 @@ tmp cyclicFvPatch::internalFieldTransfer } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C index be8ca144ae..da7c2068e4 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C @@ -30,13 +30,9 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - template class LimitFunc> -tmp LimitedScheme::limiter +Foam::tmp +Foam::LimitedScheme::limiter ( const GeometricField& phi ) const @@ -154,8 +150,4 @@ tmp LimitedScheme::limiter } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C index 8df15c9726..c003dcafe1 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C @@ -31,13 +31,9 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - template -tmp PhiScheme::limiter +Foam::tmp +Foam::PhiScheme::limiter ( const GeometricField& phi ) const @@ -145,8 +141,4 @@ tmp PhiScheme::limiter } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.C index a11c25efe6..12e55e4f30 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateScheme/multivariateScheme.C @@ -29,13 +29,8 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - template -multivariateScheme::multivariateScheme +Foam::multivariateScheme::multivariateScheme ( const fvMesh& mesh, const typename multivariateSurfaceInterpolationScheme:: @@ -86,8 +81,4 @@ multivariateScheme::multivariateScheme } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.C index 0387966fc3..3d97f80aac 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSelectionScheme/multivariateSelectionScheme.C @@ -29,15 +29,11 @@ License #include "surfaceFields.H" #include "upwind.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -multivariateSelectionScheme::multivariateSelectionScheme +Foam::multivariateSelectionScheme::multivariateSelectionScheme ( const fvMesh& mesh, const typename multivariateSurfaceInterpolationScheme:: @@ -100,8 +96,4 @@ multivariateSelectionScheme::multivariateSelectionScheme } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C index b01da6b621..a5bf7b9412 100644 --- a/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C +++ b/src/fvMotionSolver/fvPatchFields/derived/cellMotion/cellMotionFvPatchField.C @@ -28,15 +28,11 @@ License #include "volMesh.H" #include "pointFields.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -cellMotionFvPatchField::cellMotionFvPatchField +Foam::cellMotionFvPatchField::cellMotionFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -47,7 +43,7 @@ cellMotionFvPatchField::cellMotionFvPatchField template -cellMotionFvPatchField::cellMotionFvPatchField +Foam::cellMotionFvPatchField::cellMotionFvPatchField ( const cellMotionFvPatchField& ptf, const fvPatch& p, @@ -60,7 +56,7 @@ cellMotionFvPatchField::cellMotionFvPatchField template -cellMotionFvPatchField::cellMotionFvPatchField +Foam::cellMotionFvPatchField::cellMotionFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -74,7 +70,7 @@ cellMotionFvPatchField::cellMotionFvPatchField template -cellMotionFvPatchField::cellMotionFvPatchField +Foam::cellMotionFvPatchField::cellMotionFvPatchField ( const cellMotionFvPatchField& ptf ) @@ -84,7 +80,7 @@ cellMotionFvPatchField::cellMotionFvPatchField template -cellMotionFvPatchField::cellMotionFvPatchField +Foam::cellMotionFvPatchField::cellMotionFvPatchField ( const cellMotionFvPatchField& ptf, const DimensionedField& iF @@ -97,7 +93,7 @@ cellMotionFvPatchField::cellMotionFvPatchField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void cellMotionFvPatchField::updateCoeffs() +void Foam::cellMotionFvPatchField::updateCoeffs() { if (this->updated()) { @@ -129,15 +125,10 @@ void cellMotionFvPatchField::updateCoeffs() template -void cellMotionFvPatchField::write(Ostream& os) const +void Foam::cellMotionFvPatchField::write(Ostream& os) const { fvPatchField::write(os); this->writeEntry("value", os); } - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C index 1d468668f1..c1369cdcc3 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C @@ -32,7 +32,7 @@ using namespace Foam::constant::mathematical; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -Foam::scalarField Foam::LiquidEvaporation::calcXc +Foam::tmp Foam::LiquidEvaporation::calcXc ( const label cellI ) const diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C index f26f558fb5..90f7b907f1 100644 --- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C +++ b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C @@ -42,8 +42,8 @@ namespace Foam template<> const char* Foam::NamedEnum < - Foam::abortCalculation::actionType, - 3 + Foam::abortCalculation::actionType, + 3 >::names[] = { "noWriteNow", diff --git a/src/randomProcesses/turbulence/turbGen.C b/src/randomProcesses/turbulence/turbGen.C index 5b02dbfc2b..33c8f4b63c 100644 --- a/src/randomProcesses/turbulence/turbGen.C +++ b/src/randomProcesses/turbulence/turbGen.C @@ -30,15 +30,10 @@ License #include "Ek.H" #include "mathematicalConstants.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// from components -turbGen::turbGen(const Kmesh& k, const scalar EA, const scalar K0) +Foam::turbGen::turbGen(const Kmesh& k, const scalar EA, const scalar K0) : K(k), Ea(EA), @@ -49,8 +44,7 @@ turbGen::turbGen(const Kmesh& k, const scalar EA, const scalar K0) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// generate and return a velocity field -vectorField turbGen::U() +Foam::vectorField Foam::turbGen::U() { vectorField s(K.size()); scalarField rndPhases(K.size()); @@ -78,9 +72,4 @@ vectorField turbGen::U() } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // - diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C index 33986878fd..c24e7f6bae 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C @@ -29,14 +29,10 @@ License #include "volFields.H" #include "basicThermo.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField +Foam::fixedInternalEnergyFvPatchScalarField:: +fixedInternalEnergyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -46,7 +42,8 @@ fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField {} -fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField +Foam::fixedInternalEnergyFvPatchScalarField:: +fixedInternalEnergyFvPatchScalarField ( const fixedInternalEnergyFvPatchScalarField& ptf, const fvPatch& p, @@ -58,7 +55,8 @@ fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField {} -fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField +Foam::fixedInternalEnergyFvPatchScalarField:: +fixedInternalEnergyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -69,7 +67,8 @@ fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField {} -fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField +Foam::fixedInternalEnergyFvPatchScalarField:: +fixedInternalEnergyFvPatchScalarField ( const fixedInternalEnergyFvPatchScalarField& tppsf ) @@ -78,7 +77,8 @@ fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField {} -fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField +Foam::fixedInternalEnergyFvPatchScalarField:: +fixedInternalEnergyFvPatchScalarField ( const fixedInternalEnergyFvPatchScalarField& tppsf, const DimensionedField& iF @@ -90,7 +90,7 @@ fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void fixedInternalEnergyFvPatchScalarField::updateCoeffs() +void Foam::fixedInternalEnergyFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -115,10 +115,13 @@ void fixedInternalEnergyFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, fixedInternalEnergyFvPatchScalarField); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + fixedInternalEnergyFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C index 9634ac1039..31aa35fd49 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C @@ -29,14 +29,9 @@ License #include "volFields.H" #include "basicThermo.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -gradientInternalEnergyFvPatchScalarField:: +Foam::gradientInternalEnergyFvPatchScalarField:: gradientInternalEnergyFvPatchScalarField ( const fvPatch& p, @@ -47,7 +42,7 @@ gradientInternalEnergyFvPatchScalarField {} -gradientInternalEnergyFvPatchScalarField:: +Foam::gradientInternalEnergyFvPatchScalarField:: gradientInternalEnergyFvPatchScalarField ( const gradientInternalEnergyFvPatchScalarField& ptf, @@ -60,7 +55,7 @@ gradientInternalEnergyFvPatchScalarField {} -gradientInternalEnergyFvPatchScalarField:: +Foam::gradientInternalEnergyFvPatchScalarField:: gradientInternalEnergyFvPatchScalarField ( const fvPatch& p, @@ -72,7 +67,7 @@ gradientInternalEnergyFvPatchScalarField {} -gradientInternalEnergyFvPatchScalarField:: +Foam::gradientInternalEnergyFvPatchScalarField:: gradientInternalEnergyFvPatchScalarField ( const gradientInternalEnergyFvPatchScalarField& tppsf @@ -82,7 +77,7 @@ gradientInternalEnergyFvPatchScalarField {} -gradientInternalEnergyFvPatchScalarField:: +Foam::gradientInternalEnergyFvPatchScalarField:: gradientInternalEnergyFvPatchScalarField ( const gradientInternalEnergyFvPatchScalarField& tppsf, @@ -95,7 +90,7 @@ gradientInternalEnergyFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void gradientInternalEnergyFvPatchScalarField::updateCoeffs() +void Foam::gradientInternalEnergyFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -127,14 +122,13 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchScalarField, - gradientInternalEnergyFvPatchScalarField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + gradientInternalEnergyFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C index 772d9fe630..08ef627684 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C @@ -29,14 +29,11 @@ License #include "volFields.H" #include "basicThermo.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField +Foam::mixedInternalEnergyFvPatchScalarField:: +mixedInternalEnergyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -50,7 +47,8 @@ mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField } -mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField +Foam::mixedInternalEnergyFvPatchScalarField:: +mixedInternalEnergyFvPatchScalarField ( const mixedInternalEnergyFvPatchScalarField& ptf, const fvPatch& p, @@ -62,7 +60,8 @@ mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField {} -mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField +Foam::mixedInternalEnergyFvPatchScalarField:: +mixedInternalEnergyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -73,7 +72,8 @@ mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField {} -mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField +Foam::mixedInternalEnergyFvPatchScalarField:: +mixedInternalEnergyFvPatchScalarField ( const mixedInternalEnergyFvPatchScalarField& tppsf ) @@ -82,7 +82,8 @@ mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField {} -mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField +Foam::mixedInternalEnergyFvPatchScalarField:: +mixedInternalEnergyFvPatchScalarField ( const mixedInternalEnergyFvPatchScalarField& tppsf, const DimensionedField& iF @@ -94,7 +95,7 @@ mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void mixedInternalEnergyFvPatchScalarField::updateCoeffs() +void Foam::mixedInternalEnergyFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -131,10 +132,13 @@ void mixedInternalEnergyFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mixedInternalEnergyFvPatchScalarField); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + mixedInternalEnergyFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C index 1755c8fb93..7e239d23ae 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C @@ -29,14 +29,11 @@ License #include "volFields.H" #include "hhuCombustionThermo.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField +Foam::fixedUnburntEnthalpyFvPatchScalarField:: +fixedUnburntEnthalpyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -46,7 +43,8 @@ fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField {} -fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField +Foam::fixedUnburntEnthalpyFvPatchScalarField:: +fixedUnburntEnthalpyFvPatchScalarField ( const fixedUnburntEnthalpyFvPatchScalarField& ptf, const fvPatch& p, @@ -58,7 +56,8 @@ fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField {} -fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField +Foam::fixedUnburntEnthalpyFvPatchScalarField:: +fixedUnburntEnthalpyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -69,7 +68,8 @@ fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField {} -fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField +Foam::fixedUnburntEnthalpyFvPatchScalarField:: +fixedUnburntEnthalpyFvPatchScalarField ( const fixedUnburntEnthalpyFvPatchScalarField& tppsf ) @@ -78,7 +78,8 @@ fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField {} -fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField +Foam::fixedUnburntEnthalpyFvPatchScalarField:: +fixedUnburntEnthalpyFvPatchScalarField ( const fixedUnburntEnthalpyFvPatchScalarField& tppsf, const DimensionedField& iF @@ -90,7 +91,7 @@ fixedUnburntEnthalpyFvPatchScalarField::fixedUnburntEnthalpyFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void fixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() +void Foam::fixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -115,10 +116,13 @@ void fixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, fixedUnburntEnthalpyFvPatchScalarField); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + fixedUnburntEnthalpyFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C index 9fcf936b38..4b9d91f8ad 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C @@ -29,14 +29,9 @@ License #include "volFields.H" #include "hhuCombustionThermo.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -gradientUnburntEnthalpyFvPatchScalarField:: +Foam::gradientUnburntEnthalpyFvPatchScalarField:: gradientUnburntEnthalpyFvPatchScalarField ( const fvPatch& p, @@ -47,7 +42,7 @@ gradientUnburntEnthalpyFvPatchScalarField {} -gradientUnburntEnthalpyFvPatchScalarField:: +Foam::gradientUnburntEnthalpyFvPatchScalarField:: gradientUnburntEnthalpyFvPatchScalarField ( const gradientUnburntEnthalpyFvPatchScalarField& ptf, @@ -60,7 +55,7 @@ gradientUnburntEnthalpyFvPatchScalarField {} -gradientUnburntEnthalpyFvPatchScalarField:: +Foam::gradientUnburntEnthalpyFvPatchScalarField:: gradientUnburntEnthalpyFvPatchScalarField ( const fvPatch& p, @@ -72,7 +67,7 @@ gradientUnburntEnthalpyFvPatchScalarField {} -gradientUnburntEnthalpyFvPatchScalarField:: +Foam::gradientUnburntEnthalpyFvPatchScalarField:: gradientUnburntEnthalpyFvPatchScalarField ( const gradientUnburntEnthalpyFvPatchScalarField& tppsf @@ -82,7 +77,7 @@ gradientUnburntEnthalpyFvPatchScalarField {} -gradientUnburntEnthalpyFvPatchScalarField:: +Foam::gradientUnburntEnthalpyFvPatchScalarField:: gradientUnburntEnthalpyFvPatchScalarField ( const gradientUnburntEnthalpyFvPatchScalarField& tppsf, @@ -95,7 +90,7 @@ gradientUnburntEnthalpyFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void gradientUnburntEnthalpyFvPatchScalarField::updateCoeffs() +void Foam::gradientUnburntEnthalpyFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -127,14 +122,13 @@ void gradientUnburntEnthalpyFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField -( - fvPatchScalarField, - gradientUnburntEnthalpyFvPatchScalarField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + gradientUnburntEnthalpyFvPatchScalarField + ); +} // ************************************************************************* // diff --git a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C index 08436a30cf..e9bf757f34 100644 --- a/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C @@ -29,14 +29,10 @@ License #include "volFields.H" #include "hhuCombustionThermo.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField +Foam::mixedUnburntEnthalpyFvPatchScalarField:: +mixedUnburntEnthalpyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -50,7 +46,8 @@ mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField } -mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField +Foam::mixedUnburntEnthalpyFvPatchScalarField:: +mixedUnburntEnthalpyFvPatchScalarField ( const mixedUnburntEnthalpyFvPatchScalarField& ptf, const fvPatch& p, @@ -62,7 +59,8 @@ mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField {} -mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField +Foam::mixedUnburntEnthalpyFvPatchScalarField:: +mixedUnburntEnthalpyFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -73,7 +71,8 @@ mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField {} -mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField +Foam::mixedUnburntEnthalpyFvPatchScalarField:: +mixedUnburntEnthalpyFvPatchScalarField ( const mixedUnburntEnthalpyFvPatchScalarField& tppsf ) @@ -82,7 +81,8 @@ mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField {} -mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField +Foam::mixedUnburntEnthalpyFvPatchScalarField:: +mixedUnburntEnthalpyFvPatchScalarField ( const mixedUnburntEnthalpyFvPatchScalarField& tppsf, const DimensionedField& iF @@ -94,7 +94,7 @@ mixedUnburntEnthalpyFvPatchScalarField::mixedUnburntEnthalpyFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void mixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() +void Foam::mixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() { if (updated()) { @@ -130,10 +130,13 @@ void mixedUnburntEnthalpyFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, mixedUnburntEnthalpyFvPatchScalarField); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + mixedUnburntEnthalpyFvPatchScalarField + ); +} // ************************************************************************* //