Commit 9d466f07 authored by Andrew Heather's avatar Andrew Heather
Browse files

ENH: Updated intermediate lib cloud sources

parent 698be54a
......@@ -127,7 +127,7 @@ Foam::KinematicCloud<ParcelType>::cloudSolution::resetSourcesOnStartup() const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ParcelType>
inline const KinematicCloud<ParcelType>&
inline const Foam::KinematicCloud<ParcelType>&
Foam::KinematicCloud<ParcelType>::cloudCopy() const
{
return cloudCopyPtr_();
......
......@@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ParcelType>
inline const ReactingCloud<ParcelType>&
inline const Foam::ReactingCloud<ParcelType>&
Foam::ReactingCloud<ParcelType>::cloudCopy() const
{
return cloudCopyPtr_();
......@@ -169,34 +169,9 @@ Foam::ReactingCloud<ParcelType>::Srho(const label i) const
{
scalarField& rhoi = tRhoi();
rhoi = rhoTrans_[i]/(this->db().time().deltaT()*this->mesh().V());
return tRhoi;
}
else
{
return tmp<DimensionedField<scalar, volMesh> >
(
new DimensionedField<scalar, volMesh>
(
IOobject
(
this->name() + "rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar
(
"zero",
rhoTrans_[0].dimensions()/dimTime/dimVolume,
0.0
)
)
);
}
return tRhoi;
}
......@@ -218,7 +193,12 @@ Foam::ReactingCloud<ParcelType>::Srho() const
false
),
this->mesh(),
dimensionedScalar("zero", rhoTrans_[0].dimensions(), 0.0)
dimensionedScalar
(
"zero",
rhoTrans_[0].dimensions()/dimTime/dimVolume,
0.0
)
)
);
......@@ -230,12 +210,10 @@ Foam::ReactingCloud<ParcelType>::Srho() const
sourceField += rhoTrans_[i];
}
return trhoTrans/(this->db().time().deltaT()*this->mesh().V());
}
else
{
return trhoTrans;
sourceField /= this->db().time().deltaT()*this->mesh().V();
}
return trhoTrans;
}
......@@ -245,27 +223,28 @@ Foam::ReactingCloud<ParcelType>::Srho(volScalarField& rho) const
{
if (this->solution().sourceActive())
{
if (this->solution().semiImplicit("rho"))
{
tmp<volScalarField> trhoTrans
tmp<volScalarField> trhoTrans
(
new volScalarField
(
new volScalarField
IOobject
(
IOobject
(
this->name() + "rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar("zero", dimMass/dimTime/dimVolume, 0.0)
)
);
this->name() + "rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar("zero", dimMass/dimTime/dimVolume, 0.0)
)
);
scalarField& sourceField = trhoTrans();
scalarField& sourceField = trhoTrans();
if (this->solution().semiImplicit("rho"))
{
forAll(rhoTrans_, i)
{
......@@ -280,26 +259,6 @@ Foam::ReactingCloud<ParcelType>::Srho(volScalarField& rho) const
tmp<fvScalarMatrix> tfvm(new fvScalarMatrix(rho, dimMass/dimTime));
fvScalarMatrix& fvm = tfvm();
tmp<volScalarField> trhoTrans
(
new volScalarField
(
IOobject
(
this->name() + "rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar("zero", dimMass, 0.0)
)
);
scalarField& sourceField = trhoTrans();
forAll(rhoTrans_, i)
{
sourceField += rhoTrans_[i];
......
......@@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ParcelType>
inline const ReactingMultiphaseCloud<ParcelType>&
inline const Foam::ReactingMultiphaseCloud<ParcelType>&
Foam::ReactingMultiphaseCloud<ParcelType>::cloudCopy() const
{
return cloudCopyPtr_();
......
......@@ -30,7 +30,7 @@ using namespace Foam::constant;
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ParcelType>
inline const ThermoCloud<ParcelType>&
inline const Foam::ThermoCloud<ParcelType>&
Foam::ThermoCloud<ParcelType>::cloudCopy() const
{
return cloudCopyPtr_();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment