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

DimensionedField<scalar, volMesh> -> volScalarField::Internal

Browse Source 
DimensionedField<vector, volMesh> -> volVectorField::Internal
This commit is contained in:
Henry Weller
2016-08-01 14:28:54 +01:00
parent cd2b0ff742
commit bfbe1e32be
51 changed files with 215 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
View File

@ -121,9 +121,9 @@ const Foam::dimensionedVector& Foam::SRF::SRFModel::omega() const
Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
Foam::SRF::SRFModel::Fcoriolis() const Foam::SRF::SRFModel::Fcoriolis() const
{ {
return tmp<DimensionedField<vector, volMesh>> return tmp<volVectorField::Internal>
( (
new DimensionedField<vector, volMesh> new volVectorField::Internal
( (
IOobject IOobject
( (
@ -142,9 +142,9 @@ Foam::SRF::SRFModel::Fcoriolis() const
Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
Foam::SRF::SRFModel::Fcentrifugal() const Foam::SRF::SRFModel::Fcentrifugal() const
{ {
return tmp<DimensionedField<vector, volMesh>> return tmp<volVectorField::Internal>
( (
new DimensionedField<vector, volMesh> new volVectorField::Internal
( (
IOobject IOobject
( (

6
src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
View File

@ -162,13 +162,13 @@ public:
const dimensionedVector& omega() const; const dimensionedVector& omega() const;
//- Return the coriolis force //- Return the coriolis force
tmp<DimensionedField<vector, volMesh>> Fcoriolis() const; tmp<volVectorField::Internal> Fcoriolis() const;
//- Return the centrifugal force //- Return the centrifugal force
tmp<DimensionedField<vector, volMesh>> Fcentrifugal() const; tmp<volVectorField::Internal> Fcentrifugal() const;
//- Source term component for momentum equation //- Source term component for momentum equation
tmp<DimensionedField<vector, volMesh>> Su() const; tmp<volVectorField::Internal> Su() const;
//- Return velocity vector from positions //- Return velocity vector from positions
vectorField velocity(const vectorField& positions) const; vectorField velocity(const vectorField& positions) const;

8
src/finiteVolume/finiteVolume/fvm/fvmSup.C
View File

@ -99,7 +99,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::tmp<Foam::fvMatrix<Type>>
Foam::fvm::Sp Foam::fvm::Sp
( (
const DimensionedField<scalar, volMesh>& sp, const volScalarField::Internal& sp,
const GeometricField<Type, fvPatchField, volMesh>& vf const GeometricField<Type, fvPatchField, volMesh>& vf
) )
{ {
@ -125,7 +125,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::tmp<Foam::fvMatrix<Type>>
Foam::fvm::Sp Foam::fvm::Sp
( (
const tmp<DimensionedField<scalar, volMesh>>& tsp, const tmp<volScalarField::Internal>& tsp,
const GeometricField<Type, fvPatchField, volMesh>& vf const GeometricField<Type, fvPatchField, volMesh>& vf
) )
{ {
@ -191,7 +191,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::tmp<Foam::fvMatrix<Type>>
Foam::fvm::SuSp Foam::fvm::SuSp
( (
const DimensionedField<scalar, volMesh>& susp, const volScalarField::Internal& susp,
const GeometricField<Type, fvPatchField, volMesh>& vf const GeometricField<Type, fvPatchField, volMesh>& vf
) )
{ {
@ -220,7 +220,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::tmp<Foam::fvMatrix<Type>>
Foam::fvm::SuSp Foam::fvm::SuSp
( (
const tmp<DimensionedField<scalar, volMesh>>& tsusp, const tmp<volScalarField::Internal>& tsusp,
const GeometricField<Type, fvPatchField, volMesh>& vf const GeometricField<Type, fvPatchField, volMesh>& vf
) )
{ {

8
src/finiteVolume/finiteVolume/fvm/fvmSup.H
View File

@ -86,14 +86,14 @@ namespace fvm
template<class Type> template<class Type>
tmp<fvMatrix<Type>> Sp tmp<fvMatrix<Type>> Sp
( (
const DimensionedField<scalar, volMesh>&, const volScalarField::Internal&,
const GeometricField<Type, fvPatchField, volMesh>& const GeometricField<Type, fvPatchField, volMesh>&
); );
template<class Type> template<class Type>
tmp<fvMatrix<Type>> Sp tmp<fvMatrix<Type>> Sp
( (
const tmp<DimensionedField<scalar, volMesh>>&, const tmp<volScalarField::Internal>&,
const GeometricField<Type, fvPatchField, volMesh>& const GeometricField<Type, fvPatchField, volMesh>&
); );
@ -126,14 +126,14 @@ namespace fvm
template<class Type> template<class Type>
tmp<fvMatrix<Type>> SuSp tmp<fvMatrix<Type>> SuSp
( (
const DimensionedField<scalar, volMesh>&, const volScalarField::Internal&,
const GeometricField<Type, fvPatchField, volMesh>& const GeometricField<Type, fvPatchField, volMesh>&
); );
template<class Type> template<class Type>
tmp<fvMatrix<Type>> SuSp tmp<fvMatrix<Type>> SuSp
( (
const tmp<DimensionedField<scalar, volMesh>>&, const tmp<volScalarField::Internal>&,
const GeometricField<Type, fvPatchField, volMesh>& const GeometricField<Type, fvPatchField, volMesh>&
); );

12
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -1177,7 +1177,7 @@ void Foam::fvMatrix<Type>::operator-=
template<class Type> template<class Type>
void Foam::fvMatrix<Type>::operator*= void Foam::fvMatrix<Type>::operator*=
( (
const DimensionedField<scalar, volMesh>& dsf const volScalarField::Internal& dsf
) )
{ {
dimensions_ *= dsf.dimensions(); dimensions_ *= dsf.dimensions();
@ -1207,7 +1207,7 @@ void Foam::fvMatrix<Type>::operator*=
template<class Type> template<class Type>
void Foam::fvMatrix<Type>::operator*= void Foam::fvMatrix<Type>::operator*=
( (
const tmp<DimensionedField<scalar, volMesh>>& tdsf const tmp<volScalarField::Internal>& tdsf
) )
{ {
operator*=(tdsf()); operator*=(tdsf());
@ -2160,7 +2160,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator-
template<class Type> template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::operator* Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
( (
const DimensionedField<scalar, volMesh>& dsf, const volScalarField::Internal& dsf,
const fvMatrix<Type>& A const fvMatrix<Type>& A
) )
{ {
@ -2172,7 +2172,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
template<class Type> template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::operator* Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
( (
const tmp<DimensionedField<scalar, volMesh>>& tdsf, const tmp<volScalarField::Internal>& tdsf,
const fvMatrix<Type>& A const fvMatrix<Type>& A
) )
{ {
@ -2196,7 +2196,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
template<class Type> template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::operator* Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
( (
const DimensionedField<scalar, volMesh>& dsf, const volScalarField::Internal& dsf,
const tmp<fvMatrix<Type>>& tA const tmp<fvMatrix<Type>>& tA
) )
{ {
@ -2208,7 +2208,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
template<class Type> template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::operator* Foam::tmp<Foam::fvMatrix<Type>> Foam::operator*
( (
const tmp<DimensionedField<scalar, volMesh>>& tdsf, const tmp<volScalarField::Internal>& tdsf,
const tmp<fvMatrix<Type>>& tA const tmp<fvMatrix<Type>>& tA
) )
{ {

12
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
View File

@ -471,8 +471,8 @@ public:
void operator+=(const zero&); void operator+=(const zero&);
void operator-=(const zero&); void operator-=(const zero&);
void operator*=(const DimensionedField<scalar, volMesh>&); void operator*=(const volScalarField::Internal&);
void operator*=(const tmp<DimensionedField<scalar, volMesh>>&); void operator*=(const tmp<volScalarField::Internal>&);
void operator*=(const tmp<volScalarField>&); void operator*=(const tmp<volScalarField>&);
void operator*=(const dimensioned<scalar>&); void operator*=(const dimensioned<scalar>&);
@ -993,14 +993,14 @@ tmp<fvMatrix<Type>> operator-
template<class Type> template<class Type>
tmp<fvMatrix<Type>> operator* tmp<fvMatrix<Type>> operator*
( (
const DimensionedField<scalar, volMesh>&, const volScalarField::Internal&,
const fvMatrix<Type>& const fvMatrix<Type>&
); );
template<class Type> template<class Type>
tmp<fvMatrix<Type>> operator* tmp<fvMatrix<Type>> operator*
( (
const tmp<DimensionedField<scalar, volMesh>>&, const tmp<volScalarField::Internal>&,
const fvMatrix<Type>& const fvMatrix<Type>&
); );
@ -1014,14 +1014,14 @@ tmp<fvMatrix<Type>> operator*
template<class Type> template<class Type>
tmp<fvMatrix<Type>> operator* tmp<fvMatrix<Type>> operator*
( (
const DimensionedField<scalar, volMesh>&, const volScalarField::Internal&,
const tmp<fvMatrix<Type>>& const tmp<fvMatrix<Type>>&
); );
template<class Type> template<class Type>
tmp<fvMatrix<Type>> operator* tmp<fvMatrix<Type>> operator*
( (
const tmp<DimensionedField<scalar, volMesh>>&, const tmp<volScalarField::Internal>&,
const tmp<fvMatrix<Type>>& const tmp<fvMatrix<Type>>&
); );

2
src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
View File

@ -193,7 +193,7 @@ void Foam::fv::meanVelocityForce::addSup
const label fieldi const label fieldi
) )
{ {
DimensionedField<vector, volMesh> Su volVectorField::Internal Su
( (
IOobject IOobject
( (

5
src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
View File

@ -26,7 +26,6 @@ License
#include "SemiImplicitSource.H" #include "SemiImplicitSource.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "fvMatrices.H" #include "fvMatrices.H"
#include "DimensionedField.H"
#include "fvmSup.H" #include "fvmSup.H"
// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
@ -142,7 +141,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
const GeometricField<Type, fvPatchField, volMesh>& psi = eqn.psi(); const GeometricField<Type, fvPatchField, volMesh>& psi = eqn.psi();
DimensionedField<Type, volMesh> Su typename GeometricField<Type, fvPatchField, volMesh>::Internal Su
( (
IOobject IOobject
( (
@ -164,7 +163,7 @@ void Foam::fv::SemiImplicitSource<Type>::addSup
UIndirectList<Type>(Su, cells_) = injectionRate_[fieldi].first()/VDash_; UIndirectList<Type>(Su, cells_) = injectionRate_[fieldi].first()/VDash_;
DimensionedField<scalar, volMesh> Sp volScalarField::Internal Sp
( (
IOobject IOobject
( (

2
src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.H
View File

@ -101,7 +101,7 @@ class DSMCCloud
volScalarField sigmaTcRMax_; volScalarField sigmaTcRMax_;
//- A field holding the remainder from the previous collision selections //- A field holding the remainder from the previous collision selections
DimensionedField<scalar, volMesh> collisionSelectionRemainder_; volScalarField::Internal collisionSelectionRemainder_;
//- Heat flux at surface field //- Heat flux at surface field
volScalarField q_; volScalarField q_;

10
src/lagrangian/coalCombustion/coalCloudList/coalCloudList.H
View File

@ -73,13 +73,13 @@ public:
// Source terms // Source terms
//- Return const reference to momentum source //- Return const reference to momentum source
inline tmp<DimensionedField<vector, volMesh>> UTrans() const; inline tmp<volVectorField::Internal> UTrans() const;
//- Return tmp momentum source term //- Return tmp momentum source term
inline tmp<fvVectorMatrix> SU(volVectorField& U) const; inline tmp<fvVectorMatrix> SU(volVectorField& U) const;
//- Sensible enthalpy transfer [J/kg] //- Sensible enthalpy transfer [J/kg]
inline tmp<DimensionedField<scalar, volMesh>> hsTrans() const; inline tmp<volScalarField::Internal> hsTrans() const;
//- Return sensible enthalpy source term [J/kg/m3/s] //- Return sensible enthalpy source term [J/kg/m3/s]
inline tmp<fvScalarMatrix> Sh(volScalarField& hs) const; inline tmp<fvScalarMatrix> Sh(volScalarField& hs) const;
@ -93,15 +93,15 @@ public:
) const; ) const;
//- Return total mass transfer [kg/m3] //- Return total mass transfer [kg/m3]
inline tmp<DimensionedField<scalar, volMesh>> rhoTrans() const; inline tmp<volScalarField::Internal> rhoTrans() const;
//- Return tmp total mass source for carrier phase //- Return tmp total mass source for carrier phase
// - fully explicit // - fully explicit
inline tmp<DimensionedField<scalar, volMesh>> Srho() const; inline tmp<volScalarField::Internal> Srho() const;
//- Return tmp total mass source for carrier phase specie i //- Return tmp total mass source for carrier phase specie i
// - fully explicit // - fully explicit
inline tmp<DimensionedField<scalar, volMesh>> Srho inline tmp<volScalarField::Internal> Srho
( (
const label i const label i
) const; ) const;

30
src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
View File

@ -30,9 +30,9 @@ License
Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
Foam::coalCloudList::UTrans() const Foam::coalCloudList::UTrans() const
{ {
tmp<DimensionedField<vector, volMesh>> tfld tmp<volVectorField::Internal> tfld
( (
new DimensionedField<vector, volMesh> new volVectorField::Internal
( (
IOobject IOobject
( (
@ -47,7 +47,7 @@ Foam::coalCloudList::UTrans() const
) )
); );
DimensionedField<vector, volMesh>& fld = tfld.ref(); volVectorField::Internal& fld = tfld.ref();
forAll(*this, i) forAll(*this, i)
{ {
@ -78,9 +78,9 @@ Foam::tmp<Foam::fvVectorMatrix> Foam::coalCloudList::SU
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::coalCloudList::hsTrans() const Foam::coalCloudList::hsTrans() const
{ {
tmp<DimensionedField<scalar, volMesh>> tfld tmp<volScalarField::Internal> tfld
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -95,7 +95,7 @@ Foam::coalCloudList::hsTrans() const
) )
); );
DimensionedField<scalar, volMesh>& fld = tfld.ref(); volScalarField::Internal& fld = tfld.ref();
forAll(*this, i) forAll(*this, i)
{ {
@ -144,9 +144,9 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::coalCloudList::SYi
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::coalCloudList::rhoTrans() const Foam::coalCloudList::rhoTrans() const
{ {
tmp<DimensionedField<scalar, volMesh>> tfld tmp<volScalarField::Internal> tfld
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -161,7 +161,7 @@ Foam::coalCloudList::rhoTrans() const
) )
); );
DimensionedField<scalar, volMesh>& fld = tfld.ref(); volScalarField::Internal& fld = tfld.ref();
forAll(*this, i) forAll(*this, i)
{ {
@ -180,9 +180,9 @@ Foam::coalCloudList::rhoTrans() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::coalCloudList::Srho() const Foam::coalCloudList::Srho() const
{ {
tmp<DimensionedField<scalar, volMesh>> tfld tmp<volScalarField::Internal> tfld
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -197,7 +197,7 @@ Foam::coalCloudList::Srho() const
) )
); );
DimensionedField<scalar, volMesh>& fld = tfld.ref(); volScalarField::Internal& fld = tfld.ref();
forAll(*this, i) forAll(*this, i)
{ {
@ -214,9 +214,9 @@ Foam::coalCloudList::Srho
const label i const label i
) const ) const
{ {
tmp<DimensionedField<scalar, volMesh>> tfld tmp<volScalarField::Internal> tfld
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -231,7 +231,7 @@ Foam::coalCloudList::Srho
) )
); );
DimensionedField<scalar, volMesh>& fld = tfld.ref(); volScalarField::Internal& fld = tfld.ref();
forAll(*this, j) forAll(*this, j)
{ {

8
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
View File

@ -356,7 +356,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
UIntegrator_(NULL), UIntegrator_(NULL),
UTrans_ UTrans_
( (
new DimensionedField<vector, volMesh> new volVectorField::Internal
( (
IOobject IOobject
( (
@ -372,7 +372,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
), ),
UCoeff_ UCoeff_
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -438,7 +438,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
UIntegrator_(c.UIntegrator_->clone()), UIntegrator_(c.UIntegrator_->clone()),
UTrans_ UTrans_
( (
new DimensionedField<vector, volMesh> new volVectorField::Internal
( (
IOobject IOobject
( (
@ -454,7 +454,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
), ),
UCoeff_ UCoeff_
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

12
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
View File

@ -228,10 +228,10 @@ protected:
// Sources // Sources
//- Momentum //- Momentum
autoPtr<DimensionedField<vector, volMesh>> UTrans_; autoPtr<volVectorField::Internal> UTrans_;
//- Coefficient for carrier phase U equation //- Coefficient for carrier phase U equation
autoPtr<DimensionedField<scalar, volMesh>> UCoeff_; autoPtr<volScalarField::Internal> UCoeff_;
// Initialisation // Initialisation
@ -464,17 +464,17 @@ public:
// Momentum // Momentum
//- Return reference to momentum source //- Return reference to momentum source
inline DimensionedField<vector, volMesh>& UTrans(); inline volVectorField::Internal& UTrans();
//- Return const reference to momentum source //- Return const reference to momentum source
inline const DimensionedField<vector, volMesh>& inline const volVectorField::Internal&
UTrans() const; UTrans() const;
//- Return coefficient for carrier phase U equation //- Return coefficient for carrier phase U equation
inline DimensionedField<scalar, volMesh>& UCoeff(); inline volScalarField::Internal& UCoeff();
//- Return const coefficient for carrier phase U equation //- Return const coefficient for carrier phase U equation
inline const DimensionedField<scalar, volMesh>& inline const volScalarField::Internal&
UCoeff() const; UCoeff() const;
//- Return tmp momentum source term //- Return tmp momentum source term

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

@ -431,7 +431,7 @@ Foam::KinematicCloud<CloudType>::SU(volVectorField& U) const
{ {
if (solution_.semiImplicit("U")) if (solution_.semiImplicit("U"))
{ {
const DimensionedField<scalar, volMesh> const volScalarField::Internal
Vdt(mesh_.V()*this->db().time().deltaT()); Vdt(mesh_.V()*this->db().time().deltaT());
return UTrans()/Vdt - fvm::Sp(UCoeff()/Vdt, U) + UCoeff()/Vdt*U; return UTrans()/Vdt - fvm::Sp(UCoeff()/Vdt, U) + UCoeff()/Vdt*U;

8
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
View File

@ -121,7 +121,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
rhoTrans_.set rhoTrans_.set
( (
i, i,
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -165,7 +165,7 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
rhoTrans_.set rhoTrans_.set
( (
i, i,
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -290,7 +290,7 @@ void Foam::ReactingCloud<CloudType>::relaxSources
{ {
CloudType::relaxSources(cloudOldTime); CloudType::relaxSources(cloudOldTime);
typedef DimensionedField<scalar, volMesh> dsfType; typedef volScalarField::Internal dsfType;
forAll(rhoTrans_, fieldi) forAll(rhoTrans_, fieldi)
{ {
@ -306,7 +306,7 @@ void Foam::ReactingCloud<CloudType>::scaleSources()
{ {
CloudType::scaleSources(); CloudType::scaleSources();
typedef DimensionedField<scalar, volMesh> dsfType; typedef volScalarField::Internal dsfType;
forAll(rhoTrans_, fieldi) forAll(rhoTrans_, fieldi)
{ {

12
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
View File

@ -118,7 +118,7 @@ protected:
// Sources // Sources
//- Mass transfer fields - one per carrier phase specie //- Mass transfer fields - one per carrier phase specie
PtrList<DimensionedField<scalar, volMesh>> rhoTrans_; PtrList<volScalarField::Internal> rhoTrans_;
// Protected Member Functions // Protected Member Functions
@ -230,15 +230,15 @@ public:
//- Mass //- Mass
//- Return reference to mass source for field i //- Return reference to mass source for field i
inline DimensionedField<scalar, volMesh>& inline volScalarField::Internal&
rhoTrans(const label i); rhoTrans(const label i);
//- Return const access to mass source fields //- Return const access to mass source fields
inline const PtrList<DimensionedField<scalar, volMesh>>& inline const PtrList<volScalarField::Internal>&
rhoTrans() const; rhoTrans() const;
//- Return reference to mass source fields //- Return reference to mass source fields
inline PtrList<DimensionedField<scalar, volMesh>>& inline PtrList<volScalarField::Internal>&
rhoTrans(); rhoTrans();
//- Return mass source term for specie i - specie eqn //- Return mass source term for specie i - specie eqn
@ -249,12 +249,12 @@ public:
) const; ) const;
//- Return tmp mass source for field i - fully explicit //- Return tmp mass source for field i - fully explicit
inline tmp<DimensionedField<scalar, volMesh>> inline tmp<volScalarField::Internal>
Srho(const label i) const; Srho(const label i) const;
//- Return tmp total mass source for carrier phase //- Return tmp total mass source for carrier phase
// - fully explicit // - fully explicit
inline tmp<DimensionedField<scalar, volMesh>> Srho() const; inline tmp<volScalarField::Internal> Srho() const;
//- Return total mass source term [kg/m3/s] //- Return total mass source term [kg/m3/s]
inline tmp<fvScalarMatrix> Srho(volScalarField& rho) const; inline tmp<fvScalarMatrix> Srho(volScalarField& rho) const;

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

@ -157,9 +157,9 @@ template<class CloudType>
inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::ReactingCloud<CloudType>::Srho(const label i) const Foam::ReactingCloud<CloudType>::Srho(const label i) const
{ {
tmp<DimensionedField<scalar, volMesh>> tRhoi tmp<volScalarField::Internal> tRhoi
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -194,9 +194,9 @@ template<class CloudType>
inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::ReactingCloud<CloudType>::Srho() const Foam::ReactingCloud<CloudType>::Srho() const
{ {
tmp<DimensionedField<scalar, volMesh>> trhoTrans tmp<volScalarField::Internal> trhoTrans
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

20
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
View File

@ -60,7 +60,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
{ {
radAreaP_.reset radAreaP_.reset
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -77,7 +77,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
radT4_.reset radT4_.reset
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -94,7 +94,7 @@ void Foam::ThermoCloud<CloudType>::setModels()
radAreaPT4_.reset radAreaPT4_.reset
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -165,7 +165,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
radAreaPT4_(NULL), radAreaPT4_(NULL),
hsTrans_ hsTrans_
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -181,7 +181,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
), ),
hsCoeff_ hsCoeff_
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -235,7 +235,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
radAreaPT4_(NULL), radAreaPT4_(NULL),
hsTrans_ hsTrans_
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -251,7 +251,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
), ),
hsCoeff_ hsCoeff_
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -270,7 +270,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
{ {
radAreaP_.reset radAreaP_.reset
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -287,7 +287,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
radT4_.reset radT4_.reset
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -304,7 +304,7 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
radAreaPT4_.reset radAreaPT4_.reset
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

30
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
View File

@ -133,22 +133,22 @@ protected:
Switch radiation_; Switch radiation_;
//- Radiation sum of parcel projected areas //- Radiation sum of parcel projected areas
autoPtr<DimensionedField<scalar, volMesh>> radAreaP_; autoPtr<volScalarField::Internal> radAreaP_;
//- Radiation sum of parcel temperature^4 //- Radiation sum of parcel temperature^4
autoPtr<DimensionedField<scalar, volMesh>> radT4_; autoPtr<volScalarField::Internal> radT4_;
//- Radiation sum of parcel projected areas * temperature^4 //- Radiation sum of parcel projected areas * temperature^4
autoPtr<DimensionedField<scalar, volMesh>> radAreaPT4_; autoPtr<volScalarField::Internal> radAreaPT4_;
// Sources // Sources
//- Sensible enthalpy transfer [J/kg] //- Sensible enthalpy transfer [J/kg]
autoPtr<DimensionedField<scalar, volMesh>> hsTrans_; autoPtr<volScalarField::Internal> hsTrans_;
//- Coefficient for carrier phase hs equation [W/K] //- Coefficient for carrier phase hs equation [W/K]
autoPtr<DimensionedField<scalar, volMesh>> hsCoeff_; autoPtr<volScalarField::Internal> hsCoeff_;
// Protected Member Functions // Protected Member Functions
@ -257,23 +257,23 @@ public:
inline bool radiation() const; inline bool radiation() const;
//- Radiation sum of parcel projected areas [m2] //- Radiation sum of parcel projected areas [m2]
inline DimensionedField<scalar, volMesh>& radAreaP(); inline volScalarField::Internal& radAreaP();
//- Radiation sum of parcel projected areas [m2] //- Radiation sum of parcel projected areas [m2]
inline const DimensionedField<scalar, volMesh>& inline const volScalarField::Internal&
radAreaP() const; radAreaP() const;
//- Radiation sum of parcel temperature^4 [K4] //- Radiation sum of parcel temperature^4 [K4]
inline DimensionedField<scalar, volMesh>& radT4(); inline volScalarField::Internal& radT4();
//- Radiation sum of parcel temperature^4 [K4] //- Radiation sum of parcel temperature^4 [K4]
inline const DimensionedField<scalar, volMesh>& radT4() const; inline const volScalarField::Internal& radT4() const;
//- Radiation sum of parcel projected area*temperature^4 [m2K4] //- Radiation sum of parcel projected area*temperature^4 [m2K4]
inline DimensionedField<scalar, volMesh>& radAreaPT4(); inline volScalarField::Internal& radAreaPT4();
//- Radiation sum of parcel temperature^4 [m2K4] //- Radiation sum of parcel temperature^4 [m2K4]
inline const DimensionedField<scalar, volMesh>& inline const volScalarField::Internal&
radAreaPT4() const; radAreaPT4() const;
@ -282,17 +282,17 @@ public:
// Enthalpy // Enthalpy
//- Sensible enthalpy transfer [J/kg] //- Sensible enthalpy transfer [J/kg]
inline DimensionedField<scalar, volMesh>& hsTrans(); inline volScalarField::Internal& hsTrans();
//- Sensible enthalpy transfer [J/kg] //- Sensible enthalpy transfer [J/kg]
inline const DimensionedField<scalar, volMesh>& inline const volScalarField::Internal&
hsTrans() const; hsTrans() const;
//- Return coefficient for carrier phase hs equation //- Return coefficient for carrier phase hs equation
inline DimensionedField<scalar, volMesh>& hsCoeff(); inline volScalarField::Internal& hsCoeff();
//- Return const coefficient for carrier phase hs equation //- Return const coefficient for carrier phase hs equation
inline const DimensionedField<scalar, volMesh>& inline const volScalarField::Internal&
hsCoeff() const; hsCoeff() const;
//- Return sensible enthalpy source term [J/kg/m3/s] //- Return sensible enthalpy source term [J/kg/m3/s]

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

@ -236,7 +236,7 @@ Foam::ThermoCloud<CloudType>::Sh(volScalarField& hs) const
if (this->solution().semiImplicit("h")) if (this->solution().semiImplicit("h"))
{ {
const volScalarField Cp(thermo_.thermo().Cp()); const volScalarField Cp(thermo_.thermo().Cp());
const DimensionedField<scalar, volMesh> const volScalarField::Internal
Vdt(this->mesh().V()*this->db().time().deltaT()); Vdt(this->mesh().V()*this->db().time().deltaT());
return return

2
src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C
View File

@ -161,7 +161,7 @@ void reactingOneDim::updatePhiGas()
const volScalarField& HsiGas = tHsiGas(); const volScalarField& HsiGas = tHsiGas();
const DimensionedField<scalar, volMesh>& RRiGas = const volScalarField::Internal& RRiGas =
solidChemistry_->RRg(gasI); solidChemistry_->RRg(gasI);
surfaceScalarField::Boundary& phiGasBf = surfaceScalarField::Boundary& phiGasBf =

18
src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
View File

@ -1101,11 +1101,11 @@ void kinematicSingleLayer::info()
} }
tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho() const tmp<volScalarField::Internal> kinematicSingleLayer::Srho() const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -1123,14 +1123,14 @@ tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho() const
} }
tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho tmp<volScalarField::Internal> kinematicSingleLayer::Srho
( (
const label i const label i
) const ) const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -1148,11 +1148,11 @@ tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Srho
} }
tmp<DimensionedField<scalar, volMesh>> kinematicSingleLayer::Sh() const tmp<volScalarField::Internal> kinematicSingleLayer::Sh() const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

6
src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H
View File

@ -510,16 +510,16 @@ public:
// Mapped into primary region // Mapped into primary region
//- Return total mass source - Eulerian phase only //- Return total mass source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho() const; virtual tmp<volScalarField::Internal> Srho() const;
//- Return mass source for specie i - Eulerian phase only //- Return mass source for specie i - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho virtual tmp<volScalarField::Internal> Srho
( (
const label i const label i
) const; ) const;
//- Return enthalpy source - Eulerian phase only //- Return enthalpy source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Sh() const; virtual tmp<volScalarField::Internal> Sh() const;
// I-O // I-O

18
src/regionModels/surfaceFilmModels/noFilm/noFilm.C
View File

@ -244,11 +244,11 @@ const volScalarField& noFilm::cloudDiameterTrans() const
} }
tmp<DimensionedField<scalar, volMesh>> noFilm::Srho() const tmp<volScalarField::Internal> noFilm::Srho() const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -266,11 +266,11 @@ tmp<DimensionedField<scalar, volMesh>> noFilm::Srho() const
} }
tmp<DimensionedField<scalar, volMesh>> noFilm::Srho(const label i) const tmp<volScalarField::Internal> noFilm::Srho(const label i) const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -288,11 +288,11 @@ tmp<DimensionedField<scalar, volMesh>> noFilm::Srho(const label i) const
} }
tmp<DimensionedField<scalar, volMesh>> noFilm::Sh() const tmp<volScalarField::Internal> noFilm::Sh() const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

6
src/regionModels/surfaceFilmModels/noFilm/noFilm.H
View File

@ -167,16 +167,16 @@ public:
// Mapped into primary region // Mapped into primary region
//- Return total mass source - Eulerian phase only //- Return total mass source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho() const; virtual tmp<volScalarField::Internal> Srho() const;
//- Return mass source for specie i - Eulerian phase only //- Return mass source for specie i - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho virtual tmp<volScalarField::Internal> Srho
( (
const label i const label i
) const; ) const;
//- Return enthalpy source - Eulerian phase only //- Return enthalpy source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Sh() const; virtual tmp<volScalarField::Internal> Sh() const;
}; };

12
src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.C
View File

@ -89,28 +89,28 @@ Foam::scalar surfaceFilmModel::CourantNumber() const
} }
tmp<DimensionedField<scalar, volMesh>> surfaceFilmModel::Srho() const tmp<volScalarField::Internal> surfaceFilmModel::Srho() const
{ {
NotImplemented; NotImplemented;
return tmp<DimensionedField<scalar, volMesh>>(NULL); return tmp<volScalarField::Internal>(NULL);
} }
tmp<DimensionedField<scalar, volMesh>> tmp<volScalarField::Internal>
surfaceFilmModel::Srho(const label) const surfaceFilmModel::Srho(const label) const
{ {
NotImplemented; NotImplemented;
return tmp<DimensionedField<scalar, volMesh>>(NULL); return tmp<volScalarField::Internal>(NULL);
} }
tmp<DimensionedField<scalar, volMesh>> surfaceFilmModel::Sh() const tmp<volScalarField::Internal> surfaceFilmModel::Sh() const
{ {
NotImplemented; NotImplemented;
return tmp<DimensionedField<scalar, volMesh>>(NULL); return tmp<volScalarField::Internal>(NULL);
} }

6
src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H
View File

@ -219,16 +219,16 @@ public:
// Mapped into primary region // Mapped into primary region
//- Return total mass source - Eulerian phase only //- Return total mass source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho() const; virtual tmp<volScalarField::Internal> Srho() const;
//- Return mass source for specie i - Eulerian phase only //- Return mass source for specie i - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho virtual tmp<volScalarField::Internal> Srho
( (
const label i const label i
) const; ) const;
//- Return enthalpy source - Eulerian phase only //- Return enthalpy source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Sh() const; virtual tmp<volScalarField::Internal> Sh() const;
}; };

18
src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
View File

@ -738,11 +738,11 @@ void thermoSingleLayer::info()
} }
tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho() const tmp<volScalarField::Internal> thermoSingleLayer::Srho() const
{ {
tmp<DimensionedField<scalar, volMesh>> tSrho tmp<volScalarField::Internal> tSrho
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -785,16 +785,16 @@ tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho() const
} }
tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho tmp<volScalarField::Internal> thermoSingleLayer::Srho
( (
const label i const label i
) const ) const
{ {
const label vapId = thermo_.carrierId(filmThermo_->name()); const label vapId = thermo_.carrierId(filmThermo_->name());
tmp<DimensionedField<scalar, volMesh>> tSrho tmp<volScalarField::Internal> tSrho
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -840,11 +840,11 @@ tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Srho
} }
tmp<DimensionedField<scalar, volMesh>> thermoSingleLayer::Sh() const tmp<volScalarField::Internal> thermoSingleLayer::Sh() const
{ {
tmp<DimensionedField<scalar, volMesh>> tSh tmp<volScalarField::Internal> tSh
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

6
src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H
View File

@ -389,16 +389,16 @@ public:
// Mapped into primary region // Mapped into primary region
//- Return total mass source - Eulerian phase only //- Return total mass source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho() const; virtual tmp<volScalarField::Internal> Srho() const;
//- Return mass source for specie i - Eulerian phase only //- Return mass source for specie i - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Srho virtual tmp<volScalarField::Internal> Srho
( (
const label i const label i
) const; ) const;
//- Return enthalpy source - Eulerian phase only //- Return enthalpy source - Eulerian phase only
virtual tmp<DimensionedField<scalar, volMesh>> Sh() const; virtual tmp<volScalarField::Internal> Sh() const;
// I-O // I-O

16
src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.H
View File

@ -39,9 +39,7 @@ SourceFiles
#include "IOdictionary.H" #include "IOdictionary.H"
#include "Switch.H" #include "Switch.H"
#include "scalarField.H" #include "scalarField.H"
#include "volFieldsFwd.H" #include "volFields.H"
#include "volMesh.H"
#include "DimensionedField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -82,14 +80,14 @@ protected:
const scalar deltaTChemIni_; const scalar deltaTChemIni_;
//- Latest estimation of integration step //- Latest estimation of integration step
DimensionedField<scalar, volMesh> deltaTChem_; volScalarField::Internal deltaTChem_;
// Protected Member Functions // Protected Member Functions
//- Return non-const access to the latest estimation of integration //- Return non-const access to the latest estimation of integration
// step, e.g. for multi-chemistry model // step, e.g. for multi-chemistry model
inline DimensionedField<scalar, volMesh>& deltaTChem(); inline volScalarField::Internal& deltaTChem();
//- Correct function - updates due to mesh changes //- Correct function - updates due to mesh changes
void correct(); void correct();
@ -127,7 +125,7 @@ public:
inline Switch chemistry() const; inline Switch chemistry() const;
//- Return the latest estimation of integration step //- Return the latest estimation of integration step
inline const DimensionedField<scalar, volMesh>& deltaTChem() const; inline const volScalarField::Internal& deltaTChem() const;
// Functions to be derived in derived classes // Functions to be derived in derived classes
@ -135,19 +133,19 @@ public:
// Fields // Fields
//- Return const access to chemical source terms [kg/m3/s] //- Return const access to chemical source terms [kg/m3/s]
virtual const DimensionedField<scalar, volMesh>& RR virtual const volScalarField::Internal& RR
( (
const label i const label i
) const = 0; ) const = 0;
//- Return access to chemical source terms [kg/m3/s] //- Return access to chemical source terms [kg/m3/s]
virtual DimensionedField<scalar, volMesh>& RR virtual volScalarField::Internal& RR
( (
const label i const label i
) = 0; ) = 0;
//- Return reaction rate of the speciei in reactioni //- Return reaction rate of the speciei in reactioni
virtual tmp<DimensionedField<scalar, volMesh>> calculateRR virtual tmp<volScalarField::Internal> calculateRR
( (
const label reactioni, const label reactioni,
const label speciei const label speciei

8
src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
View File

@ -63,7 +63,7 @@ Foam::chemistryModel<CompType, ThermoType>::chemistryModel
RR_.set RR_.set
( (
fieldi, fieldi,
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -649,9 +649,9 @@ Foam::chemistryModel<CompType, ThermoType>::calculateRR
this->thermo().rho() this->thermo().rho()
); );
tmp<DimensionedField<scalar, volMesh>> tRR tmp<volScalarField::Internal> tRR
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -666,7 +666,7 @@ Foam::chemistryModel<CompType, ThermoType>::calculateRR
) )
); );
DimensionedField<scalar, volMesh>& RR = tRR.ref(); volScalarField::Internal& RR = tRR.ref();
const scalarField& T = this->thermo().T(); const scalarField& T = this->thermo().T();
const scalarField& p = this->thermo().p(); const scalarField& p = this->thermo().p();

13
src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.H
View File

@ -40,9 +40,8 @@ SourceFiles
#include "Reaction.H" #include "Reaction.H"
#include "ODESystem.H" #include "ODESystem.H"
#include "volFieldsFwd.H" #include "volFields.H"
#include "simpleMatrix.H" #include "simpleMatrix.H"
#include "DimensionedField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -101,7 +100,7 @@ protected:
scalar Treact_; scalar Treact_;
//- List of reaction rate per specie [kg/m3/s] //- List of reaction rate per specie [kg/m3/s]
PtrList<DimensionedField<scalar, volMesh>> RR_; PtrList<volScalarField::Internal> RR_;
//- Temporary concentration field //- Temporary concentration field
mutable scalarField c_; mutable scalarField c_;
@ -114,7 +113,7 @@ protected:
//- Write access to chemical source terms //- Write access to chemical source terms
// (e.g. for multi-chemistry model) // (e.g. for multi-chemistry model)
inline PtrList<DimensionedField<scalar, volMesh>>& RR(); inline PtrList<volScalarField::Internal>& RR();
public: public:
@ -203,19 +202,19 @@ public:
// basicChemistryModel.H) // basicChemistryModel.H)
//- Return const access to the chemical source terms for specie, i //- Return const access to the chemical source terms for specie, i
inline const DimensionedField<scalar, volMesh>& RR inline const volScalarField::Internal& RR
( (
const label i const label i
) const; ) const;
//- Return non const access to chemical source terms [kg/m3/s] //- Return non const access to chemical source terms [kg/m3/s]
virtual DimensionedField<scalar, volMesh>& RR virtual volScalarField::Internal& RR
( (
const label i const label i
); );
//- Return reaction rate of the speciei in reactionI //- Return reaction rate of the speciei in reactionI
virtual tmp<DimensionedField<scalar, volMesh>> calculateRR virtual tmp<volScalarField::Internal> calculateRR
( (
const label reactionI, const label reactionI,
const label speciei const label speciei

6
src/thermophysicalModels/radiation/radiationModels/P1/P1.C
View File

@ -281,11 +281,11 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::P1::Rp() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::P1::Ru() const Foam::radiation::P1::Ru() const
{ {
const DimensionedField<scalar, volMesh>& G = const volScalarField::Internal& G =
G_(); G_();
const DimensionedField<scalar, volMesh> E = const volScalarField::Internal E =
absorptionEmission_->ECont()()(); absorptionEmission_->ECont()()();
const DimensionedField<scalar, volMesh> a = const volScalarField::Internal a =
absorptionEmission_->aCont()()(); absorptionEmission_->aCont()()();
return a*G - E; return a*G - E;

2
src/thermophysicalModels/radiation/radiationModels/P1/P1.H
View File

@ -122,7 +122,7 @@ public:
virtual tmp<volScalarField> Rp() const; virtual tmp<volScalarField> Rp() const;
//- Source term component (constant) //- Source term component (constant)
virtual tmp<DimensionedField<scalar, volMesh>> Ru() const; virtual tmp<volScalarField::Internal> Ru() const;
}; };

6
src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
View File

@ -493,14 +493,14 @@ Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::fvDOM::Ru() const Foam::radiation::fvDOM::Ru() const
{ {
const DimensionedField<scalar, volMesh>& G = const volScalarField::Internal& G =
G_(); G_();
const DimensionedField<scalar, volMesh> E = const volScalarField::Internal E =
absorptionEmission_->ECont()()(); absorptionEmission_->ECont()()();
// Only include continuous phase absorption // Only include continuous phase absorption
const DimensionedField<scalar, volMesh> a = const volScalarField::Internal a =
absorptionEmission_->aCont()()(); absorptionEmission_->aCont()()();
return a*G - E; return a*G - E;

2
src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
View File

@ -200,7 +200,7 @@ public:
virtual tmp<volScalarField> Rp() const; virtual tmp<volScalarField> Rp() const;
//- Source term component (constant) //- Source term component (constant)
virtual tmp<DimensionedField<scalar, volMesh>> Ru() const; virtual tmp<volScalarField::Internal> Ru() const;
// Access // Access

4
src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
View File

@ -107,9 +107,9 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::noRadiation::Rp() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::noRadiation::Ru() const Foam::radiation::noRadiation::Ru() const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

2
src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.H
View File

@ -95,7 +95,7 @@ public:
tmp<volScalarField> Rp() const; tmp<volScalarField> Rp() const;
//- Source term component (constant) //- Source term component (constant)
tmp<DimensionedField<scalar, volMesh>> Ru() const; tmp<volScalarField::Internal> Ru() const;
}; };

4
src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
View File

@ -108,9 +108,9 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::opaqueSolid::Rp() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::opaqueSolid::Ru() const Foam::radiation::opaqueSolid::Ru() const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

2
src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.H
View File

@ -96,7 +96,7 @@ public:
tmp<volScalarField> Rp() const; tmp<volScalarField> Rp() const;
//- Source term component (constant) //- Source term component (constant)
tmp<DimensionedField<scalar, volMesh>> Ru() const; tmp<volScalarField::Internal> Ru() const;
}; };

5
src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
View File

@ -45,8 +45,7 @@ SourceFiles
#include "IOdictionary.H" #include "IOdictionary.H"
#include "autoPtr.H" #include "autoPtr.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "volFieldsFwd.H" #include "volFields.H"
#include "DimensionedField.H"
#include "fvMatricesFwd.H" #include "fvMatricesFwd.H"
#include "Switch.H" #include "Switch.H"
@ -222,7 +221,7 @@ public:
virtual tmp<volScalarField> Rp() const = 0; virtual tmp<volScalarField> Rp() const = 0;
//- Source term component (constant) //- Source term component (constant)
virtual tmp<DimensionedField<scalar, volMesh>> Ru() const = 0; virtual tmp<volScalarField::Internal> Ru() const = 0;
//- Energy source term //- Energy source term
virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const; virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const;

4
src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
View File

@ -704,9 +704,9 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::viewFactor::Rp() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::viewFactor::Ru() const Foam::radiation::viewFactor::Ru() const
{ {
return tmp<DimensionedField<scalar, volMesh>> return tmp<volScalarField::Internal>
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

2
src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.H
View File

@ -162,7 +162,7 @@ public:
virtual tmp<volScalarField> Rp() const; virtual tmp<volScalarField> Rp() const;
//- Source term component (constant) //- Source term component (constant)
virtual tmp<DimensionedField<scalar, volMesh>> Ru() const; virtual tmp<volScalarField::Internal> Ru() const;
// Access // Access

14
src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.C
View File

@ -58,7 +58,7 @@ const Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
Foam::basicSolidChemistryModel::RR(const label i) const Foam::basicSolidChemistryModel::RR(const label i) const
{ {
NotImplemented; NotImplemented;
return (DimensionedField<scalar, volMesh>::null()); return (volScalarField::Internal::null());
} }
@ -67,11 +67,11 @@ Foam::basicSolidChemistryModel::RR(const label i)
{ {
NotImplemented; NotImplemented;
return dynamic_cast<DimensionedField<scalar, volMesh>&> return dynamic_cast<volScalarField::Internal&>
( (
const_cast<DimensionedField<scalar, volMesh>& > const_cast<volScalarField::Internal& >
( (
DimensionedField<scalar, volMesh>::null() volScalarField::Internal::null()
) )
); );
} }
@ -86,11 +86,11 @@ Foam::basicSolidChemistryModel::calculateRR
{ {
NotImplemented; NotImplemented;
return dynamic_cast<tmp<DimensionedField<scalar, volMesh>>&> return dynamic_cast<tmp<volScalarField::Internal>&>
( (
const_cast<DimensionedField<scalar, volMesh>& > const_cast<volScalarField::Internal& >
( (
DimensionedField<scalar, volMesh>::null() volScalarField::Internal::null()
) )
); );
} }

14
src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModel.H
View File

@ -120,25 +120,25 @@ public:
inline const solidReactionThermo& solidThermo() const; inline const solidReactionThermo& solidThermo() const;
//- Return total gases mass source term [kg/m3/s] //- Return total gases mass source term [kg/m3/s]
virtual tmp<DimensionedField<scalar, volMesh>> RRg() const = 0; virtual tmp<volScalarField::Internal> RRg() const = 0;
//- Return total solids mass source term [kg/m3/s] //- Return total solids mass source term [kg/m3/s]
virtual tmp<DimensionedField<scalar, volMesh>> RRs() const = 0; virtual tmp<volScalarField::Internal> RRs() const = 0;
//- Return chemical source terms for solids [kg/m3/s] //- Return chemical source terms for solids [kg/m3/s]
virtual const DimensionedField<scalar, volMesh>& RRs virtual const volScalarField::Internal& RRs
( (
const label i const label i
) const = 0; ) const = 0;
//- Return chemical source terms for gases [kg/m3/s] //- Return chemical source terms for gases [kg/m3/s]
virtual const DimensionedField<scalar, volMesh>& RRg virtual const volScalarField::Internal& RRg
( (
const label i const label i
) const = 0; ) const = 0;
//- Returns the reaction rate of the speciei in reactionI //- Returns the reaction rate of the speciei in reactionI
virtual tmp<DimensionedField<scalar, volMesh>> calculateRR virtual tmp<volScalarField::Internal> calculateRR
( (
const label reactionI, const label reactionI,
const label speciei const label speciei
@ -162,13 +162,13 @@ public:
virtual void calculate() = 0; virtual void calculate() = 0;
//- Return const access to the total source terms //- Return const access to the total source terms
virtual const DimensionedField<scalar, volMesh>& RR virtual const volScalarField::Internal& RR
( (
const label i const label i
) const; ) const;
//- Return non-const access to the total source terms //- Return non-const access to the total source terms
virtual DimensionedField<scalar, volMesh>& RR(const label i); virtual volScalarField::Internal& RR(const label i);
}; };

2
src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
View File

@ -121,7 +121,7 @@ pyrolysisChemistryModel
RRg_.set RRg_.set
( (
fieldi, fieldi,
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

8
src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.H
View File

@ -79,13 +79,13 @@ protected:
label nSpecie_; label nSpecie_;
//- List of reaction rate per gas [kg/m3/s] //- List of reaction rate per gas [kg/m3/s]
PtrList<DimensionedField<scalar, volMesh>> RRg_; PtrList<volScalarField::Internal> RRg_;
// Protected Member Functions // Protected Member Functions
//- Write access to source terms for gases //- Write access to source terms for gases
inline PtrList<DimensionedField<scalar, volMesh>>& RRg(); inline PtrList<volScalarField::Internal>& RRg();
private: private:
@ -180,13 +180,13 @@ public:
// Chemistry model functions // Chemistry model functions
//- Return const access to the chemical source terms for gases //- Return const access to the chemical source terms for gases
inline const DimensionedField<scalar, volMesh>& RRg inline const volScalarField::Internal& RRg
( (
const label i const label i
) const; ) const;
//- Return total gas source term //- Return total gas source term
inline tmp<DimensionedField<scalar, volMesh>> RRg() const; inline tmp<volScalarField::Internal> RRg() const;
//- Return sensible enthalpy for gas i [J/Kg] //- Return sensible enthalpy for gas i [J/Kg]
virtual tmp<volScalarField> gasHs virtual tmp<volScalarField> gasHs

6
src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
View File

@ -79,9 +79,9 @@ inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>:: Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::
RRg() const RRg() const
{ {
tmp<DimensionedField<scalar, volMesh>> tRRg tmp<volScalarField::Internal> tRRg
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -98,7 +98,7 @@ RRg() const
if (this->chemistry_) if (this->chemistry_)
{ {
DimensionedField<scalar, volMesh>& RRg = tRRg.ref(); volScalarField::Internal& RRg = tRRg.ref();
for (label i=0; i < nGases_; i++) for (label i=0; i < nGases_; i++)
{ {
RRg += RRg_[i]; RRg += RRg_[i];

2
src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
View File

@ -64,7 +64,7 @@ solidChemistryModel
RRs_.set RRs_.set
( (
fieldi, fieldi,
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (

11
src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.H
View File

@ -41,8 +41,7 @@ SourceFiles
#include "Reaction.H" #include "Reaction.H"
#include "ODESystem.H" #include "ODESystem.H"
#include "volFieldsFwd.H" #include "volFields.H"
#include "DimensionedField.H"
#include "simpleMatrix.H" #include "simpleMatrix.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -90,7 +89,7 @@ protected:
label nReaction_; label nReaction_;
//- List of reaction rate per solid [kg/m3/s] //- List of reaction rate per solid [kg/m3/s]
PtrList<DimensionedField<scalar, volMesh>> RRs_; PtrList<volScalarField::Internal> RRs_;
//- List of active reacting cells //- List of active reacting cells
List<bool> reactingCells_; List<bool> reactingCells_;
@ -99,7 +98,7 @@ protected:
// Protected Member Functions // Protected Member Functions
//- Write access to source terms for solids //- Write access to source terms for solids
inline PtrList<DimensionedField<scalar, volMesh>>& RRs(); inline PtrList<volScalarField::Internal>& RRs();
//- Set reacting status of cell, celli //- Set reacting status of cell, celli
void setCellReacting(const label celli, const bool active); void setCellReacting(const label celli, const bool active);
@ -179,13 +178,13 @@ public:
// Solid Chemistry model functions // Solid Chemistry model functions
//- Return const access to the chemical source terms for solids //- Return const access to the chemical source terms for solids
inline const DimensionedField<scalar, volMesh>& RRs inline const volScalarField::Internal& RRs
( (
const label i const label i
) const; ) const;
//- Return total solid source term //- Return total solid source term
inline tmp<DimensionedField<scalar, volMesh>> RRs() const; inline tmp<volScalarField::Internal> RRs() const;
//- Solve the reaction system for the given time step //- Solve the reaction system for the given time step
// and return the characteristic time // and return the characteristic time

6
src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
View File

@ -66,9 +66,9 @@ template<class CompType, class SolidThermo>
inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>> inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const
{ {
tmp<DimensionedField<scalar, volMesh>> tRRs tmp<volScalarField::Internal> tRRs
( (
new DimensionedField<scalar, volMesh> new volScalarField::Internal
( (
IOobject IOobject
( (
@ -85,7 +85,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const
if (this->chemistry_) if (this->chemistry_)
{ {
DimensionedField<scalar, volMesh>& RRs = tRRs.ref(); volScalarField::Internal& RRs = tRRs.ref();
for (label i=0; i < nSolids_; i++) for (label i=0; i < nSolids_; i++)
{ {
RRs += RRs_[i]; RRs += RRs_[i];