From 3f637b2fcfa7d70f89fab1e285df80545bd765c2 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Wed, 22 Sep 2010 16:28:47 +0100
Subject: [PATCH] ENH: InflationInjection.
Needs dTarget data member in KinematicParcel.
Some functions in InjectionModel no longer const.
---
.../coalCombustion/coalParcel/coalParcel.C | 2 +
.../coalCombustion/coalParcel/coalParcel.H | 1 +
.../Templates/KinematicCloud/KinematicCloud.H | 7 +-
.../CollisionRecordList/CollisionRecordList.C | 41 ++
.../CollisionRecordList/CollisionRecordList.H | 8 +
.../KinematicParcel/KinematicParcel.C | 1 +
.../KinematicParcel/KinematicParcel.H | 16 +-
.../KinematicParcel/KinematicParcelI.H | 23 +-
.../KinematicParcel/KinematicParcelIO.C | 13 +
.../ReactingMultiphaseParcel.H | 1 +
.../ReactingMultiphaseParcelI.H | 2 +
.../Templates/ReactingParcel/ReactingParcel.H | 1 +
.../ReactingParcel/ReactingParcelI.H | 2 +
.../Templates/ThermoParcel/ThermoParcel.H | 1 +
.../Templates/ThermoParcel/ThermoParcelI.H | 2 +
.../basicKinematicParcel.C | 2 +
.../basicKinematicParcel.H | 1 +
.../basicReactingMultiphaseParcel.C | 2 +
.../basicReactingMultiphaseParcel.H | 1 +
.../basicReactingParcel/basicReactingParcel.C | 2 +
.../basicReactingParcel/basicReactingParcel.H | 1 +
.../basicThermoParcel/basicThermoParcel.C | 2 +
.../basicThermoParcel/basicThermoParcel.H | 1 +
.../include/makeParcelInjectionModels.H | 8 +
.../ConeInjection/ConeInjection.C | 4 +-
.../ConeInjection/ConeInjection.H | 4 +-
.../ConeInjectionMP/ConeInjectionMP.C | 4 +-
.../ConeInjectionMP/ConeInjectionMP.H | 4 +-
.../FieldActivatedInjection.C | 4 +-
.../FieldActivatedInjection.H | 4 +-
.../InflationInjection/InflationInjection.C | 466 ++++++++++++++++++
.../InflationInjection/InflationInjection.H | 200 ++++++++
.../InjectionModel/InjectionModel.C | 12 +-
.../InjectionModel/InjectionModel.H | 4 +-
.../KinematicLookupTableInjection.C | 4 +-
.../KinematicLookupTableInjection.H | 4 +-
.../ManualInjection/ManualInjection.C | 4 +-
.../ManualInjection/ManualInjection.H | 4 +-
.../InjectionModel/NoInjection/NoInjection.C | 4 +-
.../InjectionModel/NoInjection/NoInjection.H | 4 +-
.../PatchInjection/PatchInjection.C | 4 +-
.../PatchInjection/PatchInjection.H | 4 +-
.../ReactingLookupTableInjection.C | 4 +-
.../ReactingLookupTableInjection.H | 4 +-
.../ReactingMultiphaseLookupTableInjection.C | 4 +-
.../ReactingMultiphaseLookupTableInjection.H | 4 +-
.../ThermoLookupTableInjection.C | 4 +-
.../ThermoLookupTableInjection.H | 4 +-
48 files changed, 848 insertions(+), 55 deletions(-)
create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
diff --git a/src/lagrangian/coalCombustion/coalParcel/coalParcel.C b/src/lagrangian/coalCombustion/coalParcel/coalParcel.C
index a6500c8388e..3445afe14eb 100644
--- a/src/lagrangian/coalCombustion/coalParcel/coalParcel.C
+++ b/src/lagrangian/coalCombustion/coalParcel/coalParcel.C
@@ -57,6 +57,7 @@ Foam::coalParcel::coalParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& pi0,
@@ -78,6 +79,7 @@ Foam::coalParcel::coalParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
pi0,
diff --git a/src/lagrangian/coalCombustion/coalParcel/coalParcel.H b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
index 81f6447320c..6195de8439b 100644
--- a/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
+++ b/src/lagrangian/coalCombustion/coalParcel/coalParcel.H
@@ -79,6 +79,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& pi0,
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index ed5b5ae539b..1d0a9038102 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -297,9 +297,10 @@ public:
//- Return refernce to the random object
inline Random& rndGen();
- //- Return the cell occupancy information for each parcel,
- // non-const access, the caller is responsible for updating
- // it if particles are removed or created.
+ //- Return the cell occupancy information for each
+ // parcel, non-const access, the caller is
+ // responsible for updating it for its own purposes
+ // if particles are removed or created.
inline List<DynamicList<ParcelType*> >& cellOccupancy();
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
index aa2db0b4de6..4e80d16d6f6 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.C
@@ -300,6 +300,27 @@ Foam::CollisionRecordList<PairType, WallType>::matchPairRecord
}
+template<class PairType, class WallType>
+bool Foam::CollisionRecordList<PairType, WallType>::checkPairRecord
+(
+ label origProcOfOther,
+ label origIdOfOther
+)
+{
+ forAll(pairRecords_, i)
+ {
+ PairCollisionRecord<PairType>& pCR = pairRecords_[i];
+
+ if (pCR.match(origProcOfOther, origIdOfOther))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+
template<class PairType, class WallType>
Foam::WallCollisionRecord<WallType>&
Foam::CollisionRecordList<PairType, WallType>::matchWallRecord
@@ -333,6 +354,26 @@ Foam::CollisionRecordList<PairType, WallType>::matchWallRecord
}
+template<class PairType, class WallType>
+bool Foam::CollisionRecordList<PairType, WallType>::checkWallRecord
+(
+ const vector& pRel,
+ scalar radius
+)
+{
+ forAll(wallRecords_, i)
+ {
+ WallCollisionRecord<WallType>& wCR = wallRecords_[i];
+
+ if (wCR.match(pRel, radius))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
template<class PairType, class WallType>
void Foam::CollisionRecordList<PairType, WallType>::update()
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
index 51aa29849f3..a933b35ca02 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H
@@ -168,6 +168,10 @@ public:
label origIdOfOther
);
+ //- Enquire if the specified record exists without modifying
+ // its accessed status
+ bool checkPairRecord(label origProcOfOther, label origIdOfOther);
+
//- Enquires if the position of wall impact relative to the
// particle centre is present in the records. If so, return
// access to the WallCollisionRecord (hence the data) and
@@ -179,6 +183,10 @@ public:
scalar radius
);
+ //- Enquire if the specified record exists without modifying
+ // its accessed status
+ bool checkWallRecord(const vector& pRel, scalar radius);
+
//- Update the collision records, deleting any records not
// marked as having been accessed, then mark all records as
// not accessed ready for the next evaluation
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 26acc7d9e6e..f6ba6aeed3a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -225,6 +225,7 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
typeId_(p.typeId_),
nParticle_(p.nParticle_),
d_(p.d_),
+ dTarget_(p.dTarget_),
U_(p.U_),
f_(p.f_),
angularMomentum_(p.angularMomentum_),
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index b87a1390df4..4a76cb0173c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -250,6 +250,9 @@ protected:
//- Diameter [m]
scalar d_;
+ //- Target diameter [m]
+ scalar dTarget_;
+
//- Velocity of Parcel [m/s]
vector U_;
@@ -347,6 +350,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -388,6 +392,9 @@ public:
//- Return const access to diameter
inline scalar d() const;
+ //- Return const access to target diameter
+ inline scalar dTarget() const;
+
//- Return const access to velocity
inline const vector& U() const;
@@ -427,6 +434,9 @@ public:
//- Return access to diameter
inline scalar& d();
+ //- Return access to target diameter
+ inline scalar& dTarget();
+
//- Return access to velocity
inline vector& U();
@@ -478,19 +488,19 @@ public:
inline scalar volume() const;
//- Particle volume for a given diameter
- inline scalar volume(const scalar d) const;
+ inline static scalar volume(const scalar d);
//- Particle projected area
inline scalar areaP() const;
//- Projected area for given diameter
- inline scalar areaP(const scalar d) const;
+ inline static scalar areaP(const scalar d);
//- Particle surface area
inline scalar areaS() const;
//- Surface area for given diameter
- inline scalar areaS(const scalar d) const;
+ inline static scalar areaS(const scalar d);
//- Reynolds number
inline scalar Re
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index a6f41647c78..e39a9f43af0 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -91,6 +91,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
typeId_(owner.parcelTypeId()),
nParticle_(0),
d_(0.0),
+ dTarget_(0.0),
U_(vector::zero),
f_(vector::zero),
angularMomentum_(vector::zero),
@@ -116,6 +117,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -128,6 +130,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
typeId_(typeId),
nParticle_(nParticle0),
d_(d0),
+ dTarget_(dTarget0),
U_(U0),
f_(f0),
angularMomentum_(angularMomentum0),
@@ -292,6 +295,13 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
}
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::dTarget() const
+{
+ return dTarget_;
+}
+
+
template <class ParcelType>
inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
{
@@ -380,6 +390,13 @@ inline Foam::scalar& Foam::KinematicParcel<ParcelType>::d()
}
+template <class ParcelType>
+inline Foam::scalar& Foam::KinematicParcel<ParcelType>::dTarget()
+{
+ return dTarget_;
+}
+
+
template <class ParcelType>
inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
{
@@ -504,7 +521,7 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
template <class ParcelType>
inline Foam::scalar
-Foam::KinematicParcel<ParcelType>::volume(const scalar d) const
+Foam::KinematicParcel<ParcelType>::volume(const scalar d)
{
return pi/6.0*pow3(d);
}
@@ -519,7 +536,7 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaP() const
template <class ParcelType>
inline Foam::scalar
-Foam::KinematicParcel<ParcelType>::areaP(const scalar d) const
+Foam::KinematicParcel<ParcelType>::areaP(const scalar d)
{
return 0.25*areaS(d);
}
@@ -534,7 +551,7 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaS() const
template <class ParcelType>
inline Foam::scalar
-Foam::KinematicParcel<ParcelType>::areaS(const scalar d) const
+Foam::KinematicParcel<ParcelType>::areaS(const scalar d)
{
return pi*d*d;
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 7660070383d..8f1645db606 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -37,6 +37,7 @@ Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
+ " typeId"
+ " nParticle"
+ " d"
+ + " dTarget "
+ " (Ux Uy Uz)"
+ " (fx fy fz)"
+ " (angularMomentumx angularMomentumy angularMomentumz)"
@@ -68,6 +69,7 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
typeId_(0),
nParticle_(0.0),
d_(0.0),
+ dTarget_(0.0),
U_(vector::zero),
f_(vector::zero),
angularMomentum_(vector::zero),
@@ -88,6 +90,7 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
typeId_ = readLabel(is);
nParticle_ = readScalar(is);
d_ = readScalar(is);
+ dTarget_ = readScalar(is);
is >> U_;
is >> f_;
is >> angularMomentum_;
@@ -106,6 +109,7 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
+ sizeof(typeId_)
+ sizeof(nParticle_)
+ sizeof(d_)
+ + sizeof(dTarget_)
+ sizeof(U_)
+ sizeof(f_)
+ sizeof(angularMomentum_)
@@ -150,6 +154,9 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
c.checkFieldIOobject(c, d);
+ IOField<scalar> dTarget(c.fieldIOobject("dTarget", IOobject::MUST_READ));
+ c.checkFieldIOobject(c, dTarget);
+
IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
c.checkFieldIOobject(c, U);
@@ -234,6 +241,7 @@ void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
p.typeId_ = typeId[i];
p.nParticle_ = nParticle[i];
p.d_ = d[i];
+ p.dTarget_ = dTarget[i];
p.U_ = U[i];
p.f_ = f[i];
p.angularMomentum_ = angularMomentum[i];
@@ -271,6 +279,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
np
);
IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
+ IOField<scalar> dTarget(c.fieldIOobject("dTarget", IOobject::NO_READ), np);
IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
IOField<vector> f(c.fieldIOobject("f", IOobject::NO_READ), np);
IOField<vector> angularMomentum
@@ -333,6 +342,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
typeId[i] = p.typeId();
nParticle[i] = p.nParticle();
d[i] = p.d();
+ dTarget[i] = p.dTarget();
U[i] = p.U();
f[i] = p.f();
angularMomentum[i] = p.angularMomentum();
@@ -357,6 +367,7 @@ void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
typeId.write();
nParticle.write();
d.write();
+ dTarget.write();
U.write();
f.write();
angularMomentum.write();
@@ -390,6 +401,7 @@ Foam::Ostream& Foam::operator<<
<< token::SPACE << p.typeId()
<< token::SPACE << p.nParticle()
<< token::SPACE << p.d()
+ << token::SPACE << p.dTarget()
<< token::SPACE << p.U()
<< token::SPACE << p.f()
<< token::SPACE << p.angularMomentum()
@@ -409,6 +421,7 @@ Foam::Ostream& Foam::operator<<
+ sizeof(p.typeId())
+ sizeof(p.nParticle())
+ sizeof(p.d())
+ + sizeof(p.dTarget())
+ sizeof(p.U())
+ sizeof(p.f())
+ sizeof(p.angularMomentum())
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 3fb4ef24218..ed0b11e88e5 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -306,6 +306,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 5899d2a6666..960a298ad7c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -113,6 +113,7 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -134,6 +135,7 @@ inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 415967c7c53..6ae15d5098e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -255,6 +255,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 39beae61cf0..60c1556b8f2 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -98,6 +98,7 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -116,6 +117,7 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 5632d76592b..dc97dcba6c4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -268,6 +268,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index b046f142ddd..b728ce65cbb 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -99,6 +99,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -116,6 +117,7 @@ inline Foam::ThermoParcel<ParcelType>::ThermoParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index 4ec2941bf78..adc4fc409bd 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -67,6 +67,7 @@ Foam::basicKinematicParcel::basicKinematicParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -84,6 +85,7 @@ Foam::basicKinematicParcel::basicKinematicParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index 56d9cad296e..5fdb8777a5c 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -81,6 +81,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
index 49e4e06ef4c..748122567e9 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.C
@@ -57,6 +57,7 @@ Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -79,6 +80,7 @@ Foam::basicReactingMultiphaseParcel::basicReactingMultiphaseParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
index 1c9d2db2d72..2fa913c2299 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/basicReactingMultiphaseParcel.H
@@ -82,6 +82,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
index f60f30b552b..25b0c4c26ae 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
@@ -57,6 +57,7 @@ Foam::basicReactingParcel::basicReactingParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
@@ -75,6 +76,7 @@ Foam::basicReactingParcel::basicReactingParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
index 4329c61d9c3..49e26aadb70 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
@@ -80,6 +80,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector& U0,
const vector& f0,
const vector& angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
index b77bf79b93c..5b5fddb1bbc 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
@@ -60,6 +60,7 @@ Foam::basicThermoParcel::basicThermoParcel
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector U0,
const vector& f0,
const vector& angularMomentum0,
@@ -77,6 +78,7 @@ Foam::basicThermoParcel::basicThermoParcel
typeId,
nParticle0,
d0,
+ dTarget0,
U0,
f0,
angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index 71614c7d9d0..8f3720b365f 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -80,6 +80,7 @@ public:
const label typeId,
const scalar nParticle0,
const scalar d0,
+ const scalar dTarget0,
const vector U0,
const vector& f0,
const vector& angularMomentum0,
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
index ea8dcd57f47..b673d3d84cc 100644
--- a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -33,11 +33,13 @@ License
#include "ConeInjection.H"
#include "ConeInjectionMP.H"
#include "FieldActivatedInjection.H"
+#include "InflationInjection.H"
#include "KinematicLookupTableInjection.H"
#include "ManualInjection.H"
#include "NoInjection.H"
#include "PatchInjection.H"
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelInjectionModels(ParcelType) \
@@ -63,6 +65,12 @@ License
ParcelType \
); \
makeInjectionModelType \
+ ( \
+ InflationInjection, \
+ KinematicCloud, \
+ ParcelType \
+ ); \
+ makeInjectionModelType \
( \
KinematicLookupTableInjection, \
KinematicCloud, \
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 3047f909aff..438b32b2252 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -36,7 +36,7 @@ Foam::label Foam::ConeInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
@@ -54,7 +54,7 @@ Foam::scalar Foam::ConeInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 58309fa8654..a9c289d6d48 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -123,14 +123,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Number of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
index 05cfb680a4f..6639c43587f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
@@ -36,7 +36,7 @@ Foam::label Foam::ConeInjectionMP<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
@@ -63,7 +63,7 @@ Foam::scalar Foam::ConeInjectionMP<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
index 1033defe8b5..2b0d4e8c313 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
@@ -133,14 +133,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Number of parcels to introduce over the time step
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index a0dae5cb34f..44cebec9038 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -36,7 +36,7 @@ Foam::label Foam::FieldActivatedInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if (sum(nParcelsInjected_) < nParcelsPerInjector_*positions_.size())
{
@@ -54,7 +54,7 @@ Foam::scalar Foam::FieldActivatedInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if (sum(nParcelsInjected_) < nParcelsPerInjector_*positions_.size())
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 282e876cc66..9acf379154d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -123,14 +123,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
new file mode 100644
index 00000000000..e1d3bd6d3dd
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -0,0 +1,466 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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 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
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "InflationInjection.H"
+#include "mathematicalConstants.H"
+#include "PackedBoolList.H"
+#include "Switch.H"
+#include "cellSet.H"
+#include "ListListOps.H"
+
+using namespace Foam::constant::mathematical;
+
+// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
+(
+ const scalar time0,
+ const scalar time1
+)
+{
+ const polyMesh& mesh = this->owner().mesh();
+
+ List<DynamicList<typename CloudType::parcelType*> >& cellOccupancy =
+ this->owner().cellOccupancy();
+
+ scalar gR = growthRate_().value(time1);
+
+ scalar dT = time1 - time0;
+
+ // Inflate existing particles
+
+ forAll(inflationCells_, iCI)
+ {
+ label cI = inflationCells_[iCI];
+
+ typename CloudType::parcelType* pPtr = NULL;
+
+ forAll(cellOccupancy[cI], cPI)
+ {
+ pPtr = cellOccupancy[cI][cPI];
+
+ scalar dTarget = pPtr->dTarget();
+
+ pPtr->d() = min(dTarget, pPtr->d() + gR*dT);
+ }
+ }
+
+ // Generate new particles
+
+ newParticles_.clear();
+
+ Random& rnd = this->owner().rndGen();
+
+ // Diameter factor, when splitting particles into 4, this is the
+ // factor that modifies the diameter.
+ scalar dFact = sqrt(2.0)/(sqrt(3.0) + sqrt(2.0));
+
+ if ((time0 >= 0.0) && (time0 < duration_))
+ {
+ volumeAccumulator_ +=
+ fraction_*flowRateProfile_().integrate(time0, time1);
+ }
+
+ labelHashSet cellCentresUsed;
+
+ // Loop escape counter
+ label maxIterations = max
+ (
+ 1,
+ (10*volumeAccumulator_)
+ /CloudType::parcelType::volume(parcelPDF_().minValue())
+ );
+
+ label iterationNo = 0;
+
+ // Info<< "Accumulated volume to inject: "
+ // << returnReduce(volumeAccumulator_, sumOp<scalar>()) << endl;
+
+ while (!generationCells_.empty() && volumeAccumulator_ > 0)
+ {
+ if (iterationNo > maxIterations)
+ {
+ WarningIn
+ (
+ "Foam::label "
+ "Foam::InflationInjection<CloudType>::parcelsToInject"
+ "("
+ "const scalar time0, "
+ "const scalar time1"
+ ")"
+ )
+ << "Maximum particle split iterations ("
+ << maxIterations << ") exceeded" << endl;
+
+ break;
+ }
+
+ label cI =
+ generationCells_[rnd.integer(0, generationCells_.size() - 1)];
+
+ // Pick a particle at random from the cell - if there are
+ // none, insert one at the cell centre. Otherwise, split an
+ // existing particle into four new ones.
+
+ if (cellOccupancy[cI].empty())
+ {
+ if (!cellCentresUsed.found(cI))
+ {
+ scalar dNew = parcelPDF_().sample();
+
+ newParticles_.append
+ (
+ vectorPairScalarPair
+ (
+ Pair<vector>(mesh.cellCentres()[cI], vector::zero),
+ Pair<scalar>(dNew, dNew)
+ )
+ );
+
+ volumeAccumulator_ -= CloudType::parcelType::volume(dNew);
+
+ cellCentresUsed.insert(cI);
+ }
+ }
+ else
+ {
+ label cPI = rnd.integer(0, cellOccupancy[cI].size() - 1);
+
+ // This has to be a reference to the pointer so that it
+ // can be set to NULL when the particle is deleted.
+ typename CloudType::parcelType*& pPtr = cellOccupancy[cI][cPI];
+
+ if (pPtr != NULL)
+ {
+ scalar pD = pPtr->d();
+
+ // Select bigger particles by preference
+ if ((pD/pPtr->dTarget()) < rnd.scalar01())
+ {
+ continue;
+ }
+
+ const point& pP = pPtr->position();
+ const vector& pU = pPtr->U();
+
+ // Generate a tetrahedron of new positions with the
+ // four new spheres fitting inside the old one, where
+ // a is the diameter of the new spheres, and is
+ // related to the diameter of the enclosing sphere, A,
+ // by a = sqrt(2)*A/(sqrt(3) + sqrt(2));
+
+ // Positions around the origin, which is the
+ // tetrahedron centroid (centre of old sphere).
+
+ // x = a/sqrt(3)
+ // r = a/(2*sqrt(6))
+ // R = sqrt(3)*a/(2*sqrt(2))
+ // d = a/(2*sqrt(3))
+
+ // p0(x, 0, -r)
+ // p1(-d, a/2, -r)
+ // p2(-d, -a/2, -r)
+ // p3(0, 0, R)
+
+ scalar a = pD*dFact;
+
+ scalar x = a/sqrt(3.0);
+ scalar r = a/(2.0*sqrt(6.0));
+ scalar R = sqrt(3.0)*a/(2.0*sqrt(2.0));
+ scalar d = a/(2.0*sqrt(3.0));
+
+ scalar dNew = parcelPDF_().sample();
+ scalar volNew = CloudType::parcelType::volume(dNew);
+
+ newParticles_.append
+ (
+ vectorPairScalarPair
+ (
+ Pair<vector>(vector(x, 0, -r) + pP, pU),
+ Pair<scalar>(a, dNew)
+ )
+ );
+ volumeAccumulator_ -= volNew;
+
+ dNew = parcelPDF_().sample();
+ newParticles_.append
+ (
+ vectorPairScalarPair
+ (
+ Pair<vector>(vector(-d, a/2, -r) + pP, pU),
+ Pair<scalar>(a, dNew)
+ )
+ );
+ volumeAccumulator_ -= volNew;
+
+ dNew = parcelPDF_().sample();
+ newParticles_.append
+ (
+ vectorPairScalarPair
+ (
+ Pair<vector>(vector(-d, -a/2, -r) + pP, pU),
+ Pair<scalar>(a, dNew)
+ )
+ );
+ volumeAccumulator_ -= volNew;
+
+ dNew = parcelPDF_().sample();
+ newParticles_.append
+ (
+ vectorPairScalarPair
+ (
+ Pair<vector>(vector(0, 0, R) + pP, pU),
+ Pair<scalar>(a, dNew)
+ )
+ );
+ volumeAccumulator_ -= volNew;
+
+ // Account for the lost volume of the particle which
+ // is to be deleted
+ volumeAccumulator_ += CloudType::parcelType::volume
+ (
+ pPtr->dTarget()
+ );
+
+ this->owner().deleteParticle(*pPtr);
+
+ pPtr = NULL;
+ }
+ }
+
+ iterationNo++;
+ }
+
+ if (Pstream::parRun())
+ {
+ List<List<vectorPairScalarPair> > gatheredNewParticles
+ (
+ Pstream::nProcs()
+ );
+
+ gatheredNewParticles[Pstream::myProcNo()] = newParticles_;
+
+ // Gather data onto master
+ Pstream::gatherList(gatheredNewParticles);
+
+ // Combine
+ List<vectorPairScalarPair> combinedNewParticles
+ (
+ ListListOps::combine<List<vectorPairScalarPair> >
+ (
+ gatheredNewParticles,
+ accessOp<List<vectorPairScalarPair> >()
+ )
+ );
+
+ if (Pstream::master())
+ {
+ newParticles_ = combinedNewParticles;
+ }
+
+ Pstream::scatter(newParticles_);
+ }
+
+ return newParticles_.size();
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::InflationInjection<CloudType>::volumeToInject
+(
+ const scalar time0,
+ const scalar time1
+)
+{
+ if ((time0 >= 0.0) && (time0 < duration_))
+ {
+ return fraction_*flowRateProfile_().integrate(time0, time1);
+ }
+ else
+ {
+ return 0.0;
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::InflationInjection<CloudType>::InflationInjection
+(
+ const dictionary& dict,
+ CloudType& owner
+)
+:
+ InjectionModel<CloudType>(dict, owner, typeName),
+ generationSetName_(this->coeffDict().lookup("generationCellSet")),
+ inflationSetName_(this->coeffDict().lookup("inflationCellSet")),
+ generationCells_(),
+ inflationCells_(),
+ duration_(readScalar(this->coeffDict().lookup("duration"))),
+ flowRateProfile_
+ (
+ DataEntry<scalar>::New
+ (
+ "flowRateProfile",
+ this->coeffDict()
+ )
+ ),
+ growthRate_
+ (
+ DataEntry<scalar>::New
+ (
+ "growthRate",
+ this->coeffDict()
+ )
+ ),
+ newParticles_(),
+ volumeAccumulator_(0.0),
+ fraction_(1.0),
+ parcelPDF_
+ (
+ pdfs::pdf::New
+ (
+ this->coeffDict().subDict("parcelPDF"),
+ owner.rndGen()
+ )
+ )
+{
+ cellSet generationCells(this->owner().mesh(), generationSetName_);
+
+ generationCells_ = generationCells.toc();
+
+ cellSet inflationCells(this->owner().mesh(), inflationSetName_);
+
+ // Union of cellSets
+ inflationCells |= generationCells;
+
+ inflationCells_ = inflationCells.toc();
+
+ if (Pstream::parRun())
+ {
+ scalar generationVolume = 0.0;
+
+ forAll(generationCells_, gCI)
+ {
+ label cI = generationCells_[gCI];
+
+ generationVolume += this->owner().mesh().cellVolumes()[cI];
+ }
+
+ scalar totalGenerationVolume = generationVolume;
+
+ reduce(totalGenerationVolume, sumOp<scalar>());
+
+ fraction_ = generationVolume/totalGenerationVolume;
+ }
+
+ // Set total volume/mass to inject
+ this->volumeTotal_ = fraction_*flowRateProfile_().integrate(0.0, duration_);
+ this->massTotal_ *= fraction_;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::InflationInjection<CloudType>::~InflationInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::InflationInjection<CloudType>::active() const
+{
+ return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::InflationInjection<CloudType>::timeEnd() const
+{
+ return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::InflationInjection<CloudType>::setPositionAndCell
+(
+ const label parcelI,
+ const label,
+ const scalar,
+ vector& position,
+ label& cellOwner,
+ label& tetFaceI,
+ label& tetPtI
+)
+{
+ position = newParticles_[parcelI].first().first();
+
+ this->findCellAtPosition
+ (
+ cellOwner,
+ tetFaceI,
+ tetPtI,
+ position,
+ false
+ );
+}
+
+
+template<class CloudType>
+void Foam::InflationInjection<CloudType>::setProperties
+(
+ const label parcelI,
+ const label,
+ const scalar,
+ typename CloudType::parcelType& parcel
+)
+{
+ parcel.U() = newParticles_[parcelI].first().second();
+
+ parcel.d() = newParticles_[parcelI].second().first();
+
+ parcel.dTarget() = newParticles_[parcelI].second().second();
+}
+
+
+template<class CloudType>
+bool Foam::InflationInjection<CloudType>::fullyDescribed() const
+{
+ return false;
+}
+
+
+template<class CloudType>
+bool Foam::InflationInjection<CloudType>::validInjection(const label)
+{
+ return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
new file mode 100644
index 00000000000..70724124300
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+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 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
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::InflationInjection
+
+Description
+ Inflation injection - creates new particles by splitting existing
+ particles within in a set of generation cells, then inflating them
+ to a target diameter within the generation cells and an additional
+ set of inflation cells.
+
+SourceFiles
+ InflationInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef InflationInjection_H
+#define InflationInjection_H
+
+#include "InjectionModel.H"
+#include "pdf.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Structure to hold:
+// + position = vectorPairScalarPair::first().first()
+// + velocity = vectorPairScalarPair::first().second()
+// + diameter = vectorPairScalarPair::second().first()
+// + target diameter = vectorPairScalarPair::second().second()
+// One structure to allow single operation parallel comms
+typedef Tuple2<Pair<vector>, Pair<scalar> > vectorPairScalarPair;
+
+
+/*---------------------------------------------------------------------------*\
+ Class InflationInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class InflationInjection
+:
+ public InjectionModel<CloudType>
+{
+ // Private data
+
+ //- Name of cellSet for generating new particles
+ word generationSetName_;
+
+ //- Name of cellSet for inflating new particles
+ word inflationSetName_;
+
+ //- Set of cells to generate particles in
+ labelList generationCells_;
+
+ //- Set of cells to inflate particles in, includes all
+ // generation cells
+ labelList inflationCells_;
+
+ //- Injection duration [s]
+ const scalar duration_;
+
+ //- Flow rate profile relative to SOI [m3/s]
+ const autoPtr<DataEntry<scalar> > flowRateProfile_;
+
+ //- Growth rate of particle diameters towards target [m/s]
+ const autoPtr<DataEntry<scalar> > growthRate_;
+
+ //- Positions, velocities, diameters and target diameters of
+ // new particles after splitting
+ DynamicList<vectorPairScalarPair> newParticles_;
+
+ //- Accumulation variable to carry over volume from one injection
+ // to the next
+ scalar volumeAccumulator_;
+
+ //- Fraction of injection controlled by this processor
+ scalar fraction_;
+
+ //- Parcel size PDF model
+ const autoPtr<pdfs::pdf> parcelPDF_;
+
+
+protected:
+
+ // Protected Member Functions
+
+ //- Number of parcels to introduce over the time step relative to SOI
+ label parcelsToInject
+ (
+ const scalar time0,
+ const scalar time1
+ );
+
+ //- Volume of parcels to introduce over the time step relative to SOI
+ scalar volumeToInject
+ (
+ const scalar time0,
+ const scalar time1
+ );
+
+
+public:
+
+ //- Runtime type information
+ TypeName("InflationInjection");
+
+
+ // Constructors
+
+ //- Construct from dictionary
+ InflationInjection
+ (
+ const dictionary& dict,
+ CloudType& owner
+ );
+
+
+ //- Destructor
+ virtual ~InflationInjection();
+
+
+ // Member Functions
+
+ //- Flag to indicate whether model activates injection model
+ bool active() const;
+
+ //- Return the end-of-injection time
+ scalar timeEnd() const;
+
+
+ // Injection geometry
+
+ //- Set the injection position and owner cell, tetFace and tetPt
+ virtual void setPositionAndCell
+ (
+ const label parcelI,
+ const label nParcels,
+ const scalar time,
+ vector& position,
+ label& cellOwner,
+ label& tetFaceI,
+ label& tetPtI
+ );
+
+ //- Set the parcel properties
+ virtual void setProperties
+ (
+ const label parcelI,
+ const label nParcels,
+ const scalar time,
+ typename CloudType::parcelType& parcel
+ );
+
+ //- Flag to identify whether model fully describes the parcel
+ virtual bool fullyDescribed() const;
+
+ //- Return flag to identify whether or not injection of parcelI is
+ // permitted
+ virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+# include "InflationInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 9136baa6079..5a386e4397e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -159,6 +159,8 @@ bool Foam::InjectionModel<CloudType>::findCellAtPosition
reduce(procI, maxOp<label>());
+ // Ensure that only one processor attempts to insert this Parcel
+
if (procI != Pstream::myProcNo())
{
cellI = -1;
@@ -166,11 +168,12 @@ bool Foam::InjectionModel<CloudType>::findCellAtPosition
tetPtI = -1;
}
- // Last chance - find nearest cell and try that one
- // - the point is probably on an edge
+ // Last chance - find nearest cell and try that one - the point is
+ // probably on an edge
if (procI == -1)
{
cellI = owner_.mesh().findNearestCell(position);
+
if (cellI >= 0)
{
position += SMALL*(cellCentres[cellI] - position);
@@ -428,14 +431,15 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
const scalar padTime = max(0.0, SOI_ - time0_);
// Introduce new parcels linearly across carrier phase timestep
- for (label parcelI=0; parcelI<newParcels; parcelI++)
+ for (label parcelI = 0; parcelI < newParcels; parcelI++)
{
if (validInjection(parcelI))
{
// Calculate the pseudo time of injection for parcel 'parcelI'
scalar timeInj = time0_ + padTime + deltaT*parcelI/newParcels;
- // Determine the injection position and owner cell
+ // Determine the injection position and owner cell,
+ // tetFace and tetPt
label cellI = -1;
label tetFaceI = -1;
label tetPtI = -1;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 542e038b4ac..5b225c07814 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -156,14 +156,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const = 0;
+ ) = 0;
//- Volume of parcels to introduce over the time step relative to SOI
virtual scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const = 0;
+ ) = 0;
//- Additional flag to identify whether or not injection of parcelI is
// permitted
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index 45fd5b0df6a..b87449f225d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -33,7 +33,7 @@ Foam::label Foam::KinematicLookupTableInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
@@ -51,7 +51,7 @@ Foam::scalar Foam::KinematicLookupTableInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
scalar volume = 0.0;
if ((time0 >= 0.0) && (time0 < duration_))
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index 1692c92a0f0..ff840187f26 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -100,14 +100,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index b7e3c702274..48b156d1e2e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -37,7 +37,7 @@ Foam::label Foam::ManualInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((0.0 >= time0) && (0.0 < time1))
{
@@ -55,7 +55,7 @@ Foam::scalar Foam::ManualInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
// All parcels introduced at SOI
if ((0.0 >= time0) && (0.0 < time1))
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index a001f940534..b4feea97441 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -95,14 +95,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index 6303a8f30fa..8391c3654b6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -33,7 +33,7 @@ Foam::label Foam::NoInjection<CloudType>::parcelsToInject
(
const scalar,
const scalar
-) const
+)
{
return 0;
}
@@ -44,7 +44,7 @@ Foam::scalar Foam::NoInjection<CloudType>::volumeToInject
(
const scalar,
const scalar
-) const
+)
{
return 0.0;
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index d5026cc75d4..c16a9367785 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -60,14 +60,14 @@ protected:
(
const scalar,
const scalar
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar,
const scalar
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 8c50cec0e09..08854693073 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -34,7 +34,7 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
@@ -52,7 +52,7 @@ Foam::scalar Foam::PatchInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index ee6a5edeb0a..85dbb2fcb63 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -101,14 +101,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 8ba48ca48d0..5c4b49370b1 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -32,7 +32,7 @@ Foam::label Foam::ReactingLookupTableInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
@@ -50,7 +50,7 @@ Foam::scalar Foam::ReactingLookupTableInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
scalar volume = 0.0;
if ((time0 >= 0.0) && (time0 < duration_))
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index 88bb33005f2..e13169a5b75 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -103,14 +103,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index a97ab2d4d89..1178b5cc33f 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -33,7 +33,7 @@ Foam::ReactingMultiphaseLookupTableInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
@@ -52,7 +52,7 @@ Foam::ReactingMultiphaseLookupTableInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
scalar volume = 0.0;
if ((time0 >= 0.0) && (time0 < duration_))
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 289f664550e..5b0ecae3793 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -106,14 +106,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index 6138a8a5f54..6d7c9aef2cb 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -33,7 +33,7 @@ Foam::label Foam::ThermoLookupTableInjection<CloudType>::parcelsToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
if ((time0 >= 0.0) && (time0 < duration_))
{
@@ -51,7 +51,7 @@ Foam::scalar Foam::ThermoLookupTableInjection<CloudType>::volumeToInject
(
const scalar time0,
const scalar time1
-) const
+)
{
scalar volume = 0.0;
if ((time0 >= 0.0) && (time0 < duration_))
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index c66f0778f64..4fd93884b46 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -102,14 +102,14 @@ protected:
(
const scalar time0,
const scalar time1
- ) const;
+ );
//- Volume of parcels to introduce over the time step relative to SOI
scalar volumeToInject
(
const scalar time0,
const scalar time1
- ) const;
+ );
public:
--
GitLab