ENH: Propagated dictionary constructors through lib (thermo) basic

This commit is contained in:
andy
2010-10-11 17:37:25 +01:00
parent 983e3cf4bf
commit 06327d3105
5 changed files with 8 additions and 16 deletions

View File

@ -23,8 +23,6 @@ License
\*---------------------------------------------------------------------------*/
#include "error.H"
#include "basicMixture.H"
#include "fvMesh.H"
@ -39,11 +37,7 @@ defineTypeNameAndDebug(basicMixture, 0);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
basicMixture::basicMixture
(
const dictionary&,
const fvMesh&
)
basicMixture::basicMixture(const dictionary&, const fvMesh&)
{}

View File

@ -23,8 +23,6 @@ License
\*---------------------------------------------------------------------------*/
#include "error.H"
#include "pureMixture.H"
#include "fvMesh.H"
@ -43,7 +41,7 @@ pureMixture<ThermoType>::pureMixture
)
:
basicMixture(thermoDict, mesh),
mixture_(thermoDict.lookup("mixture"))
mixture_(thermoDict.subDict("mixture"))
{}
@ -59,7 +57,7 @@ pureMixture<ThermoType>::~pureMixture()
template<class ThermoType>
void pureMixture<ThermoType>::read(const dictionary& thermoDict)
{
mixture_ = ThermoType(thermoDict.lookup("mixture"));
mixture_ = ThermoType(thermoDict.subDict("mixture"));
}

View File

@ -245,7 +245,7 @@ Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cp() const
IOobject::NO_WRITE
),
mesh,
dimensionSet(0, 2, -2, -1, 0)
dimMass/dimEnergy/dimTemperature
)
);
@ -308,7 +308,7 @@ Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cv() const
IOobject::NO_WRITE
),
mesh,
dimensionSet(0, 2, -2, -1, 0)
dimMass/dimEnergy/dimTemperature
)
);

View File

@ -243,7 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cp() const
IOobject::NO_WRITE
),
mesh,
dimensionSet(0, 2, -2, -1, 0)
dimMass/dimEnergy/dimTemperature
)
);
@ -306,7 +306,7 @@ Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cv() const
IOobject::NO_WRITE
),
mesh,
dimensionSet(0, 2, -2, -1, 0)
dimMass/dimEnergy/dimTemperature
)
);

View File

@ -243,7 +243,7 @@ Foam::tmp<Foam::volScalarField> Foam::hsPsiThermo<MixtureType>::Cp() const
IOobject::NO_WRITE
),
mesh,
dimensionSet(0, 2, -2, -1, 0)
dimMass/dimEnergy/dimTemperature
)
);