zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radiation/derivedFvPatchFields: Rationalised namespace of the BCs

Browse Source
This commit is contained in:
Henry Weller
2018-08-31 17:04:32 +01:00
parent 90c74d8c7c
commit 187557eb4a
8 changed files with 64 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.C
View File

@ -32,7 +32,8 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
Foam::radiation::MarshakRadiationFvPatchScalarField::
MarshakRadiationFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@ -48,7 +49,8 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
}
Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
Foam::radiation::MarshakRadiationFvPatchScalarField::
MarshakRadiationFvPatchScalarField
(
const MarshakRadiationFvPatchScalarField& ptf,
const fvPatch& p,
@ -68,7 +70,8 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
{}
Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
Foam::radiation::MarshakRadiationFvPatchScalarField::
MarshakRadiationFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@ -97,7 +100,8 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
}
Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
Foam::radiation::MarshakRadiationFvPatchScalarField::
MarshakRadiationFvPatchScalarField
(
const MarshakRadiationFvPatchScalarField& ptf
)
@ -113,7 +117,8 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
{}
Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
Foam::radiation::MarshakRadiationFvPatchScalarField::
MarshakRadiationFvPatchScalarField
(
const MarshakRadiationFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
@ -132,7 +137,7 @@ Foam::MarshakRadiationFvPatchScalarField::MarshakRadiationFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::MarshakRadiationFvPatchScalarField::autoMap
void Foam::radiation::MarshakRadiationFvPatchScalarField::autoMap
(
const fvPatchFieldMapper& m
)
@ -142,7 +147,7 @@ void Foam::MarshakRadiationFvPatchScalarField::autoMap
}
void Foam::MarshakRadiationFvPatchScalarField::rmap
void Foam::radiation::MarshakRadiationFvPatchScalarField::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
@ -153,7 +158,7 @@ void Foam::MarshakRadiationFvPatchScalarField::rmap
}
void Foam::MarshakRadiationFvPatchScalarField::updateCoeffs()
void Foam::radiation::MarshakRadiationFvPatchScalarField::updateCoeffs()
{
if (this->updated())
{
@ -190,7 +195,10 @@ void Foam::MarshakRadiationFvPatchScalarField::updateCoeffs()
}
void Foam::MarshakRadiationFvPatchScalarField::write(Ostream& os) const
void Foam::radiation::MarshakRadiationFvPatchScalarField::write
(
Ostream& os
) const
{
mixedFvPatchScalarField::write(os);
radiationCoupledBase::write(os);
@ -201,6 +209,8 @@ void Foam::MarshakRadiationFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace radiation
{
makePatchTypeField
(
@ -208,6 +218,7 @@ namespace Foam
MarshakRadiationFvPatchScalarField
);
}
}
// ************************************************************************* //

3
src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationFvPatchScalarField.H
View File

@ -66,6 +66,8 @@ SourceFiles
namespace Foam
{
namespace radiation
{
/*---------------------------------------------------------------------------*\
Class MarshakRadiationFvPatchScalarField Declaration
@ -200,6 +202,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace radiation
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

23
src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.C
View File

@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::
Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::
MarshakRadiationFixedTemperatureFvPatchScalarField
(
const fvPatch& p,
@ -49,7 +49,7 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
}
Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::
Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::
MarshakRadiationFixedTemperatureFvPatchScalarField
(
const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf,
@ -70,7 +70,7 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
{}
Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::
Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::
MarshakRadiationFixedTemperatureFvPatchScalarField
(
const fvPatch& p,
@ -94,7 +94,7 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
}
Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::
Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::
MarshakRadiationFixedTemperatureFvPatchScalarField
(
const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf
@ -111,7 +111,7 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
{}
Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::
Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::
MarshakRadiationFixedTemperatureFvPatchScalarField
(
const MarshakRadiationFixedTemperatureFvPatchScalarField& ptf,
@ -131,7 +131,8 @@ MarshakRadiationFixedTemperatureFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::autoMap
void Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::
autoMap
(
const fvPatchFieldMapper& m
)
@ -142,7 +143,7 @@ void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::autoMap
}
void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::rmap
void Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
@ -157,7 +158,8 @@ void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::rmap
}
void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::updateCoeffs()
void Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::
updateCoeffs()
{
if (this->updated())
{
@ -190,7 +192,7 @@ void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::updateCoeffs()
}
void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::write
void Foam::radiation::MarshakRadiationFixedTemperatureFvPatchScalarField::write
(
Ostream& os
) const
@ -204,6 +206,8 @@ void Foam::MarshakRadiationFixedTemperatureFvPatchScalarField::write
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
namespace radiation
{
makePatchTypeField
(
@ -211,6 +215,7 @@ namespace Foam
MarshakRadiationFixedTemperatureFvPatchScalarField
);
}
}
// ************************************************************************* //

3
src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedTemperature/MarshakRadiationFixedTemperatureFvPatchScalarField.H
View File

@ -66,6 +66,8 @@ SourceFiles
namespace Foam
{
namespace radiation
{
/*---------------------------------------------------------------------------*\
Class MarshakRadiationFixedTemperatureFvPatchScalarField Declaration
@ -204,6 +206,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace radiation
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H
View File

@ -71,6 +71,7 @@ namespace Foam
{
namespace radiation
{
/*---------------------------------------------------------------------------*\
Class greyDiffusiveRadiationMixedFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/

31
src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C
View File

@ -34,13 +34,15 @@ License
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
namespace Foam
{
namespace radiation
{
defineTypeNameAndDebug(radiationCoupledBase, 0);
template<>
const char* Foam::NamedEnum
<
Foam::radiationCoupledBase::emissivityMethodType,
Foam::radiation::radiationCoupledBase::emissivityMethodType,
2
>::names[] =
{
@ -48,14 +50,18 @@ namespace Foam
"lookup"
};
}
}
const Foam::NamedEnum<Foam::radiationCoupledBase::emissivityMethodType, 2>
Foam::radiationCoupledBase::emissivityMethodTypeNames_;
const Foam::NamedEnum
<
Foam::radiation::radiationCoupledBase::emissivityMethodType,
2
> Foam::radiation::radiationCoupledBase::emissivityMethodTypeNames_;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::radiationCoupledBase::radiationCoupledBase
Foam::radiation::radiationCoupledBase::radiationCoupledBase
(
const fvPatch& patch,
const word& calculationType,
@ -68,7 +74,7 @@ Foam::radiationCoupledBase::radiationCoupledBase
{}
Foam::radiationCoupledBase::radiationCoupledBase
Foam::radiation::radiationCoupledBase::radiationCoupledBase
(
const fvPatch& patch,
const word& calculationType,
@ -82,7 +88,7 @@ Foam::radiationCoupledBase::radiationCoupledBase
{}
Foam::radiationCoupledBase::radiationCoupledBase
Foam::radiation::radiationCoupledBase::radiationCoupledBase
(
const fvPatch& patch,
const dictionary& dict
@ -133,13 +139,13 @@ Foam::radiationCoupledBase::radiationCoupledBase
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
Foam::radiationCoupledBase::~radiationCoupledBase()
Foam::radiation::radiationCoupledBase::~radiationCoupledBase()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::scalarField Foam::radiationCoupledBase::emissivity() const
Foam::scalarField Foam::radiation::radiationCoupledBase::emissivity() const
{
switch (method_)
{
@ -175,13 +181,12 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
mpp.distribute(emissivity);
return emissivity;
}
break;
case LOOKUP:
{
// return local value
// Return local value
return emissivity_;
}
@ -200,7 +205,7 @@ Foam::scalarField Foam::radiationCoupledBase::emissivity() const
}
void Foam::radiationCoupledBase::autoMap
void Foam::radiation::radiationCoupledBase::autoMap
(
const fvPatchFieldMapper& m
)
@ -209,7 +214,7 @@ void Foam::radiationCoupledBase::autoMap
}
void Foam::radiationCoupledBase::rmap
void Foam::radiation::radiationCoupledBase::rmap
(
const fvPatchScalarField& ptf,
const labelList& addr
@ -222,7 +227,7 @@ void Foam::radiationCoupledBase::rmap
}
void Foam::radiationCoupledBase::write(Ostream& os) const
void Foam::radiation::radiationCoupledBase::write(Ostream& os) const
{
os.writeKeyword("emissivityMode") << emissivityMethodTypeNames_[method_]
<< token::END_STATEMENT << nl;

3
src/thermophysicalModels/radiation/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.H
View File

@ -48,6 +48,8 @@ SourceFiles
namespace Foam
{
namespace radiation
{
/*---------------------------------------------------------------------------*\
Class radiationCoupledBase Declaration
@ -163,6 +165,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace radiation
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H
View File

@ -64,6 +64,7 @@ namespace Foam
{
namespace radiation
{
/*---------------------------------------------------------------------------*\
Class wideBandDiffusiveRadiationMixedFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
@ -194,8 +195,8 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace radiation
} // End namespace Foam
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //