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: multiple minor updates to cloud sub-models

Browse Source
This commit is contained in:
andy
2010-10-21 17:30:41 +01:00
parent 29ab2ef2d3
commit b3c82b633c
41 changed files with 177 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
View File

@ -215,7 +215,7 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::KinematicParcel<ParcelType>::KinematicParcel
(
const KinematicParcel<ParcelType>& p

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

@ -29,7 +29,7 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
(
const dictionary& parentDict
@ -45,7 +45,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
{}
template <class ParcelType>
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::trackData::trackData
(
KinematicCloud<ParcelType>& cloud,
@ -83,7 +83,7 @@ inline Foam::KinematicParcel<ParcelType>::trackData::trackData
{}
template <class ParcelType>
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::KinematicParcel
(
KinematicCloud<ParcelType>& owner,
@ -113,7 +113,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
{}
template <class ParcelType>
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::KinematicParcel
(
KinematicCloud<ParcelType>& owner,
@ -154,7 +154,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
inline const Foam::dictionary&
Foam::KinematicParcel<ParcelType>::constantProperties::dict() const
{
@ -170,7 +170,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::parcelTypeId() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::rhoMin() const
{
@ -178,7 +178,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::rhoMin() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
{
@ -186,7 +186,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
{
@ -194,7 +194,7 @@ Foam::KinematicParcel<ParcelType>::constantProperties::minParticleMass() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::
constantProperties::youngsModulus() const
@ -203,7 +203,7 @@ constantProperties::youngsModulus() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::
constantProperties::poissonsRatio() const
@ -214,7 +214,7 @@ constantProperties::poissonsRatio() const
// * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
inline Foam::KinematicCloud<ParcelType>&
Foam::KinematicParcel<ParcelType>::trackData::cloud()
{
@ -230,7 +230,7 @@ Foam::KinematicParcel<ParcelType>::trackData::rhoInterp() const
}
template <class ParcelType>
template<class ParcelType>
inline const Foam::interpolation<Foam::vector>&
Foam::KinematicParcel<ParcelType>::trackData::UInterp() const
{
@ -272,49 +272,49 @@ Foam::KinematicParcel<ParcelType>::trackData::part()
// * * * * * * * KinematicParcel Member Functions * * * * * * * //
template <class ParcelType>
template<class ParcelType>
inline bool Foam::KinematicParcel<ParcelType>::active() const
{
return active_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::label Foam::KinematicParcel<ParcelType>::typeId() const
{
return typeId_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::nParticle() const
{
return nParticle_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
{
return d_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::dTarget() const
{
return dTarget_;
}
template <class ParcelType>
template<class ParcelType>
inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
{
return U_;
}
template <class ParcelType>
template<class ParcelType>
inline const Foam::vector&
Foam::KinematicParcel<ParcelType>::f() const
{
@ -322,7 +322,7 @@ Foam::KinematicParcel<ParcelType>::f() const
}
template <class ParcelType>
template<class ParcelType>
inline const Foam::vector&
Foam::KinematicParcel<ParcelType>::angularMomentum() const
{
@ -330,7 +330,7 @@ Foam::KinematicParcel<ParcelType>::angularMomentum() const
}
template <class ParcelType>
template<class ParcelType>
inline const Foam::vector&
Foam::KinematicParcel<ParcelType>::torque() const
{
@ -338,35 +338,35 @@ Foam::KinematicParcel<ParcelType>::torque() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
{
return rho_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::tTurb() const
{
return tTurb_;
}
template <class ParcelType>
template<class ParcelType>
inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
{
return UTurb_;
}
template <class ParcelType>
template<class ParcelType>
inline bool& Foam::KinematicParcel<ParcelType>::active()
{
return active_;
}
template <class ParcelType>
template<class ParcelType>
inline const Foam::collisionRecordList&
Foam::KinematicParcel<ParcelType>::collisionRecords() const
{
@ -374,84 +374,84 @@ Foam::KinematicParcel<ParcelType>::collisionRecords() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::label& Foam::KinematicParcel<ParcelType>::typeId()
{
return typeId_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar& Foam::KinematicParcel<ParcelType>::nParticle()
{
return nParticle_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar& Foam::KinematicParcel<ParcelType>::d()
{
return d_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar& Foam::KinematicParcel<ParcelType>::dTarget()
{
return dTarget_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
{
return U_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::vector& Foam::KinematicParcel<ParcelType>::f()
{
return f_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::vector& Foam::KinematicParcel<ParcelType>::angularMomentum()
{
return angularMomentum_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::vector& Foam::KinematicParcel<ParcelType>::torque()
{
return torque_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
{
return rho_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar& Foam::KinematicParcel<ParcelType>::tTurb()
{
return tTurb_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
{
return UTurb_;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::collisionRecordList&
Foam::KinematicParcel<ParcelType>::collisionRecords()
{
@ -459,7 +459,7 @@ Foam::KinematicParcel<ParcelType>::collisionRecords()
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
(
const vector&
@ -469,7 +469,7 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
}
template <class ParcelType>
template<class ParcelType>
inline Foam::label Foam::KinematicParcel<ParcelType>::faceInterpolation() const
{
// Use volume-based interpolation if dealing with external faces
@ -484,7 +484,7 @@ inline Foam::label Foam::KinematicParcel<ParcelType>::faceInterpolation() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::massCell
(
const label cellI
@ -494,70 +494,70 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::massCell
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::mass() const
{
return rho_*volume();
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::momentOfInertia() const
{
return 0.1*mass()*sqr(d_);
}
template <class ParcelType>
template<class ParcelType>
inline Foam::vector Foam::KinematicParcel<ParcelType>::omega() const
{
return angularMomentum_/momentOfInertia();
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
{
return volume(d_);
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume(const scalar d)
{
return pi/6.0*pow3(d);
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaP() const
{
return areaP(d_);
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaP(const scalar d)
{
return 0.25*areaS(d);
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaS() const
{
return areaS(d_);
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaS(const scalar d)
{
return pi*d*d;
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::Re
(
const vector& U,

4
src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
View File

@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
Particle<ParcelType>::propHeader
+ " active"
@ -56,7 +56,7 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::KinematicParcel<ParcelType>::KinematicParcel
(
const Cloud<ParcelType>& cloud,

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

@ -626,7 +626,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
(
const ReactingMultiphaseParcel<ParcelType>& p

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

@ -62,7 +62,7 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::trackData::trackData
{}
template <class ParcelType>
template<class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
(
ReactingMultiphaseCloud<ParcelType>& owner,

2
src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
View File

@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::string Foam::ReactingMultiphaseParcel<ParcelType>::propHeader =
ReactingParcel<ParcelType>::propHeader
+ " nGas(Y1..YN)"

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

@ -504,7 +504,7 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::ReactingParcel<ParcelType>::ReactingParcel
(
const ReactingParcel<ParcelType>& p

2
src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
View File

@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::string Foam::ReactingParcel<ParcelType>::propHeader =
ThermoParcel<ParcelType>::propHeader
+ " mass0"

4
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
View File

@ -210,7 +210,7 @@ void Foam::ThermoParcel<ParcelType>::calc
template<class ParcelType>
template <class TrackData>
template<class TrackData>
Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
(
TrackData& td,
@ -276,7 +276,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::ThermoParcel<ParcelType>::ThermoParcel
(
const ThermoParcel<ParcelType>& p

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

@ -144,7 +144,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::T0() const
{
@ -152,7 +152,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::T0() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::TMin() const
{
@ -160,7 +160,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::TMin() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::Cp0() const
{
@ -168,7 +168,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::Cp0() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::epsilon0() const
{
@ -176,7 +176,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::epsilon0() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::f0() const
{
@ -184,7 +184,7 @@ Foam::ThermoParcel<ParcelType>::constantProperties::f0() const
}
template <class ParcelType>
template<class ParcelType>
inline Foam::scalar
Foam::ThermoParcel<ParcelType>::constantProperties::Pr() const
{

2
src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
View File

@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template <class ParcelType>
template<class ParcelType>
Foam::string Foam::ThermoParcel<ParcelType>::propHeader =
KinematicParcel<ParcelType>::propHeader
+ " T"

2
src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
View File

@ -122,7 +122,7 @@ public:
friend Ostream& operator<< <Type>
(
Ostream&,
const Constant<Type>&
const Table<Type>&
);
};

9
src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
View File

@ -65,10 +65,13 @@ Foam::polynomial::~polynomial()
Foam::scalar Foam::polynomial::value(const scalar x) const
{
scalar y = 0.0;
forAll(coeffs_, i)
scalar y = coeffs_[0].first();
scalar powX = x;
for (label i = 1; i < coeffs_.size(); i++)
{
y += coeffs_[i].first()*pow(x, coeffs_[i].second());
y += coeffs_[i].first()*powX;
powX *= x;
}
return y;

6
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
void Foam::PairSpringSliderDashpot<CloudType>::findMinMaxProperties
(
scalar& RMin,
@ -79,7 +79,7 @@ void Foam::PairSpringSliderDashpot<CloudType>::findMinMaxProperties
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
(
const dictionary& dict,
@ -121,7 +121,7 @@ Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::PairSpringSliderDashpot<CloudType>::~PairSpringSliderDashpot()
{}

8
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
void Foam::WallLocalSpringSliderDashpot<CloudType>::findMinMaxProperties
(
scalar& rMin,
@ -70,7 +70,7 @@ void Foam::WallLocalSpringSliderDashpot<CloudType>::findMinMaxProperties
}
template <class CloudType>
template<class CloudType>
void Foam::WallLocalSpringSliderDashpot<CloudType>::evaluateWall
(
typename CloudType::parcelType& p,
@ -155,7 +155,7 @@ void Foam::WallLocalSpringSliderDashpot<CloudType>::evaluateWall
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::WallLocalSpringSliderDashpot<CloudType>::WallLocalSpringSliderDashpot
(
const dictionary& dict,
@ -257,7 +257,7 @@ Foam::WallLocalSpringSliderDashpot<CloudType>::WallLocalSpringSliderDashpot
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::WallLocalSpringSliderDashpot<CloudType>::~WallLocalSpringSliderDashpot()
{}

8
src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
(
scalar& rMin,
@ -70,7 +70,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::findMinMaxProperties
}
template <class CloudType>
template<class CloudType>
void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
(
typename CloudType::parcelType& p,
@ -144,7 +144,7 @@ void Foam::WallSpringSliderDashpot<CloudType>::evaluateWall
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
(
const dictionary& dict,
@ -194,7 +194,7 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::WallSpringSliderDashpot<CloudType>::~WallSpringSliderDashpot()
{}

2
src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
View File

@ -42,7 +42,7 @@ Foam::DispersionModel<CloudType>::DispersionModel
const word& type
)
:
SubModelBase<CloudType>(dict, owner, type)
SubModelBase<CloudType>(owner, dict, type)
{}

7
src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
View File

@ -76,13 +76,6 @@ public:
//- Construct null from owner
DispersionModel(CloudType& owner);
//- Construct from components
DispersionModel
(
const dictionary& dict,
CloudType& owner
);
//- Construct from components
DispersionModel
(

2
src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
View File

@ -52,7 +52,7 @@ class GradientDispersionRAS
{
protected:
// Locally cached turbulence fields
// Protected data
// Locally cached turbulence fields

4
src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoDrag<CloudType>::NoDrag(const dictionary& dict, CloudType& owner)
:
DragModel<CloudType>(owner)
@ -43,7 +43,7 @@ Foam::NoDrag<CloudType>::NoDrag(const NoDrag<CloudType>& dm)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoDrag<CloudType>::~NoDrag()
{}

6
src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::SphereDrag<CloudType>::SphereDrag
(
const dictionary&,
@ -47,14 +47,14 @@ Foam::SphereDrag<CloudType>::SphereDrag(const SphereDrag<CloudType>& dm)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::SphereDrag<CloudType>::~SphereDrag()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::scalar Foam::SphereDrag<CloudType>::Cd(const scalar Re) const
{
scalar Cd;

2
src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
View File

@ -39,7 +39,7 @@ Description
namespace Foam
{
/*---------------------------------------------------------------------------*\
Class SphereDrag Declaration
Class SphereDrag Declaration
\*---------------------------------------------------------------------------*/
template<class CloudType>

7
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
View File

@ -26,6 +26,7 @@ License
#include "ConeInjection.H"
#include "DataEntry.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
using namespace Foam::constant::mathematical;
@ -204,15 +205,11 @@ void Foam::ConeInjection<CloudType>::setProperties
{
cachedRandom& rnd = this->owner().rndGen();
// set particle velocity
const scalar deg2Rad = pi/180.0;
scalar t = time - this->SOI_;
scalar ti = thetaInner_().value(t);
scalar to = thetaOuter_().value(t);
scalar coneAngle = deg2Rad*rnd.position<scalar>(ti, to);
scalar coneAngle = degToRad(rnd.position<scalar>(ti, to));
coneAngle *= deg2Rad;
scalar alpha = sin(coneAngle);
scalar dcorr = cos(coneAngle);
scalar beta = twoPi*rnd.sample01<scalar>();

6
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
View File

@ -26,6 +26,7 @@ License
#include "ConeInjectionMP.H"
#include "DataEntry.H"
#include "mathematicalConstants.H"
#include "unitConversion.H"
using namespace Foam::constant::mathematical;
@ -250,14 +251,11 @@ void Foam::ConeInjectionMP<CloudType>::setProperties
// set particle velocity
const label i = parcelI%positions_.size();
const scalar deg2Rad = pi/180.0;
scalar t = time - this->SOI_;
scalar ti = thetaInner_().value(t);
scalar to = thetaOuter_().value(t);
scalar coneAngle = deg2Rad*rnd.position<scalar>(ti, to);
scalar coneAngle = degToRad(rnd.position<scalar>(ti, to));
coneAngle *= deg2Rad;
scalar alpha = sin(coneAngle);
scalar dcorr = cos(coneAngle);
scalar beta = twoPi*rnd.sample01<scalar>();

6
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
View File

@ -53,11 +53,7 @@ Foam::scalar Foam::NoInjection<CloudType>::volumeToInject
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class CloudType>
Foam::NoInjection<CloudType>::NoInjection
(
const dictionary&,
CloudType& owner
)
Foam::NoInjection<CloudType>::NoInjection(const dictionary&, CloudType& owner)
:
InjectionModel<CloudType>(owner)
{}

8
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
(
const label globalPatchI
@ -47,7 +47,7 @@ Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
// * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::LocalInteraction<CloudType>::LocalInteraction
(
const dictionary& dict,
@ -132,14 +132,14 @@ Foam::LocalInteraction<CloudType>::LocalInteraction
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::LocalInteraction<CloudType>::~LocalInteraction()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
bool Foam::LocalInteraction<CloudType>::correct
(
typename CloudType::parcelType& p,

1
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
View File

@ -62,7 +62,6 @@ public:
// Constructors
//- Construct from dictionary
//- Construct from dictionary
Rebound(const dictionary& dict, CloudType& cloud);

6
src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
(
const dictionary& dict,
@ -91,14 +91,14 @@ Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::StandardWallInteraction<CloudType>::~StandardWallInteraction()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
bool Foam::StandardWallInteraction<CloudType>::correct
(
typename CloudType::parcelType& p,

2
src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
View File

@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::label Foam::PatchPostProcessing<CloudType>::applyToPatch
(
const label globalPatchI

11
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.C
View File

@ -8,10 +8,10 @@
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/

11
src/lagrangian/intermediate/submodels/Reacting/CompositionModel/NoComposition/NoComposition.H
View File

@ -8,10 +8,10 @@
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::NoComposition

59
src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
View File

@ -50,7 +50,7 @@ Foam::scalarField Foam::LiquidEvaporation<CloudType>::calcXc
}
template <class CloudType>
template<class CloudType>
Foam::scalar Foam::LiquidEvaporation<CloudType>::Sh
(
const scalar Re,
@ -63,7 +63,7 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::Sh
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
(
const dictionary& dict,
@ -88,20 +88,25 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
) << "Evaporation model selected, but no active liquids defined"
<< nl << endl;
}
// Determine mapping between liquid and carrier phase species
forAll(activeLiquids_, i)
else
{
liqToCarrierMap_[i] =
owner.composition().globalCarrierId(activeLiquids_[i]);
}
Info<< "Participating liquid species:" << endl;
// Determine mapping between model active liquids and global liquids
label idLiquid = owner.composition().idLiquid();
forAll(activeLiquids_, i)
{
liqToLiqMap_[i] =
owner.composition().localId(idLiquid, activeLiquids_[i]);
// Determine mapping between liquid and carrier phase species
forAll(activeLiquids_, i)
{
Info<< " " << activeLiquids_[i] << endl;
liqToCarrierMap_[i] =
owner.composition().globalCarrierId(activeLiquids_[i]);
}
// Determine mapping between model active liquids and global liquids
const label idLiquid = owner.composition().idLiquid();
forAll(activeLiquids_, i)
{
liqToLiqMap_[i] =
owner.composition().localId(idLiquid, activeLiquids_[i]);
}
}
}
@ -122,7 +127,7 @@ Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::LiquidEvaporation<CloudType>::~LiquidEvaporation()
{}
@ -144,19 +149,19 @@ void Foam::LiquidEvaporation<CloudType>::calculate
) const
{
// construct carrier phase species volume fractions for cell, cellI
scalarField Xc = calcXc(cellI);
const scalarField Xc = calcXc(cellI);
// droplet surface area
scalar A = pi*sqr(d);
const scalar A = pi*sqr(d);
// calculate mass transfer of each specie in liquid
forAll(activeLiquids_, i)
{
label gid = liqToCarrierMap_[i];
label lid = liqToLiqMap_[i];
const label gid = liqToCarrierMap_[i];
const label lid = liqToLiqMap_[i];
// vapour diffusivity [m2/s]
scalar Dab = liquids_.properties()[lid].D(pc, Ts);
const scalar Dab = liquids_.properties()[lid].D(pc, Ts);
// saturation pressure for species i [pa]
// - carrier phase pressure assumed equal to the liquid vapour pressure
@ -164,25 +169,25 @@ void Foam::LiquidEvaporation<CloudType>::calculate
// NOTE: if pSat > pc then particle is superheated
// calculated evaporation rate will be greater than that of a particle
// at boiling point, but this is not a boiling model
scalar pSat = liquids_.properties()[lid].pv(pc, T);
const scalar pSat = liquids_.properties()[lid].pv(pc, T);
// Schmidt number
scalar Sc = nu/(Dab + ROOTVSMALL);
const scalar Sc = nu/(Dab + ROOTVSMALL);
// Sherwood number
scalar Sh = this->Sh(Re, Sc);
const scalar Sh = this->Sh(Re, Sc);
// mass transfer coefficient [m/s]
scalar kc = Sh*Dab/(d + ROOTVSMALL);
const scalar kc = Sh*Dab/(d + ROOTVSMALL);
// vapour concentration at droplet surface [kmol/m3] at film temperature
scalar Cs = pSat/(specie::RR*Ts);
const scalar Cs = pSat/(specie::RR*Ts);
// vapour concentration in bulk gas [kmol/m3] at film temperature
scalar Cinf = Xc[gid]*pc/(specie::RR*Ts);
const scalar Cinf = Xc[gid]*pc/(specie::RR*Ts);
// molar flux of vapour [kmol/m2/s]
scalar Ni = max(kc*(Cs - Cinf), 0.0);
const scalar Ni = max(kc*(Cs - Cinf), 0.0);
// mass transfer [kg]
dMassPC[lid] += Ni*A*liquids_.properties()[lid].W()*dt;

4
src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoPhaseChange<CloudType>::NoPhaseChange
(
const dictionary&,
@ -50,7 +50,7 @@ Foam::NoPhaseChange<CloudType>::NoPhaseChange
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoPhaseChange<CloudType>::~NoPhaseChange()
{}

11
src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
View File

@ -8,10 +8,10 @@
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/

4
src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoDevolatilisation<CloudType>::NoDevolatilisation
(
const dictionary&,
@ -50,7 +50,7 @@ Foam::NoDevolatilisation<CloudType>::NoDevolatilisation
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoDevolatilisation<CloudType>::~NoDevolatilisation()
{}

11
src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
View File

@ -8,10 +8,10 @@
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/

11
src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
View File

@ -8,10 +8,10 @@
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@ -19,8 +19,7 @@ License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::SingleKineticRateDevolatilisation

2
src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
View File

@ -50,7 +50,7 @@ Foam::NoSurfaceReaction<CloudType>::NoSurfaceReaction
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoSurfaceReaction<CloudType>::~NoSurfaceReaction()
{}

8
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoHeatTransfer<CloudType>::NoHeatTransfer
(
const dictionary&,
@ -50,14 +50,14 @@ Foam::NoHeatTransfer<CloudType>::NoHeatTransfer
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::NoHeatTransfer<CloudType>::~NoHeatTransfer()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::scalar Foam::NoHeatTransfer<CloudType>::Nu
(
const scalar,
@ -68,7 +68,7 @@ Foam::scalar Foam::NoHeatTransfer<CloudType>::Nu
}
template <class CloudType>
template<class CloudType>
Foam::scalar Foam::NoHeatTransfer<CloudType>::Pr() const
{
return 1.0;

6
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
View File

@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::RanzMarshall<CloudType>::RanzMarshall
(
const dictionary& dict,
@ -47,14 +47,14 @@ Foam::RanzMarshall<CloudType>::RanzMarshall(const RanzMarshall<CloudType>& htm)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::RanzMarshall<CloudType>::~RanzMarshall()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template <class CloudType>
template<class CloudType>
Foam::scalar Foam::RanzMarshall<CloudType>::Nu
(
const scalar Re,

2
src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
View File

@ -43,7 +43,7 @@ namespace Foam
Class RanzMarshall Declaration
\*---------------------------------------------------------------------------*/
template <class CloudType>
template<class CloudType>
class RanzMarshall
:
public HeatTransferModel<CloudType>