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

ENH: Updated intermediate lib cloud sources

Browse Source
This commit is contained in:
andy
2010-10-27 18:26:44 +01:00
parent 698be54a5c
commit 9d466f0761
4 changed files with 35 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
View File

@ -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_();

105
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
View File

@ -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())
{
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/dimTime/dimVolume, 0.0)
)
);
scalarField& sourceField = trhoTrans();
if (this->solution().semiImplicit("rho"))
{
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/dimTime/dimVolume, 0.0)
)
);
scalarField& sourceField = trhoTrans();
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];

2
src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
View File

@ -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_();

2
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
View File

@ -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_();