zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved constant properties to be read from their own sub-dict

Browse Source
This commit is contained in:
andy
2009-04-14 15:28:10 +01:00
parent 79488f6df8
commit 66c2cfa1b6
8 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
View File

@ -86,6 +86,9 @@ public:
{ {
// Private data // Private data
//- Constant properties dictionary
const dictionary dict_;
//- Particle density [kg/m3] (constant) //- Particle density [kg/m3] (constant)
const scalar rho0_; const scalar rho0_;
@ -99,10 +102,13 @@ public:
public: public:
//- Constructor //- Constructor
constantProperties(const dictionary& dict); constantProperties(const dictionary& parentDict);
// Member functions // Member functions
//- Return const access to the constant properties dictionary
inline const dictionary& dict() const;
//- Return const access to the particle density //- Return const access to the particle density
inline scalar rho0() const; inline scalar rho0() const;

20
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
View File

@ -29,12 +29,16 @@ License
template <class ParcelType> template <class ParcelType>
inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
( (
const dictionary& dict const dictionary& parentDict
) )
: :
rho0_(dimensionedScalar(dict.lookup("rho0")).value()), dict_(parentDict.subDict("constantProperties")),
minParticleMass_(dimensionedScalar(dict.lookup("minParticleMass")).value()), rho0_(dimensionedScalar(dict_.lookup("rho0")).value()),
Cvm_(dimensionedScalar(dict.lookup("Cvm")).value()) minParticleMass_
(
dimensionedScalar(dict_.lookup("minParticleMass")).value()
),
Cvm_(dimensionedScalar(dict_.lookup("Cvm")).value())
{} {}
@ -88,6 +92,14 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * // // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
template <class ParcelType>
inline const Foam::dictionary&
Foam::KinematicParcel<ParcelType>::constantProperties::dict() const
{
return dict_;
}
template <class ParcelType> template <class ParcelType>
inline Foam::scalar inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const

2
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
View File

@ -93,7 +93,7 @@ public:
public: public:
//- Constructor //- Constructor
constantProperties(const dictionary& dict); constantProperties(const dictionary& parentDict);
// Access // Access

11
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
View File

@ -30,12 +30,15 @@ template<class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties:: inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties constantProperties
( (
const dictionary& dict const dictionary& parentDict
) )
: :
ReactingParcel<ParcelType>::constantProperties(dict), ReactingParcel<ParcelType>::constantProperties(parentDict),
LDevol_(dimensionedScalar(dict.lookup("LDevol")).value()), LDevol_(dimensionedScalar(this->dict().lookup("LDevol")).value()),
hRetentionCoeff_(dimensionedScalar(dict.lookup("hRetentionCoeff")).value()) hRetentionCoeff_
(
dimensionedScalar(this->dict().lookup("hRetentionCoeff")).value()
)
{} {}

2
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
View File

@ -93,7 +93,7 @@ public:
public: public:
//- Constructor //- Constructor
constantProperties(const dictionary& dict); constantProperties(const dictionary& parentDict);
// Access // Access

10
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
View File

@ -29,13 +29,13 @@ License
template<class ParcelType> template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
( (
const dictionary& dict const dictionary& parentDict
) )
: :
ThermoParcel<ParcelType>::constantProperties(dict), ThermoParcel<ParcelType>::constantProperties(parentDict),
constantVolume_(dict.lookup("constantVolume")), constantVolume_(this->dict().lookup("constantVolume")),
Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()), Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value()),
Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()) Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value())
{} {}

2
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
View File

@ -98,7 +98,7 @@ public:
public: public:
// Constructors // Constructors
constantProperties(const dictionary& dict); constantProperties(const dictionary& parentDict);
// Member functions // Member functions

12
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
View File

@ -29,14 +29,14 @@ License
template<class ParcelType> template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
( (
const dictionary& dict const dictionary& parentDict
) )
: :
KinematicParcel<ParcelType>::constantProperties(dict), KinematicParcel<ParcelType>::constantProperties(parentDict),
T0_(dimensionedScalar(dict.lookup("T0")).value()), T0_(dimensionedScalar(this->dict().lookup("T0")).value()),
cp0_(dimensionedScalar(dict.lookup("cp0")).value()), cp0_(dimensionedScalar(this->dict().lookup("cp0")).value()),
epsilon0_(dimensionedScalar(dict.lookup("epsilon0")).value()), epsilon0_(dimensionedScalar(this->dict().lookup("epsilon0")).value()),
f0_(dimensionedScalar(dict.lookup("f0")).value()) f0_(dimensionedScalar(this->dict().lookup("f0")).value())
{} {}