ENH: Re-shuffled particle parcelTypeId label and radition flag

This commit is contained in:
andy
2010-10-18 17:41:31 +01:00
parent 83db9efc84
commit f2d170a215
18 changed files with 143 additions and 92 deletions

View File

@ -318,7 +318,6 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
solution_(mesh_, particleProperties_.subDict("solution")),
constProps_(particleProperties_),
subModelProperties_(particleProperties_.subDict("subModels")),
parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))),
cellValueSourceCorrection_
(
particleProperties_.lookup("cellValueSourceCorrection")

View File

@ -201,10 +201,6 @@ protected:
//- Sub-models dictionary
const dictionary& subModelProperties_;
//- Parcel type id - used to flag the type of parcels issued by this
// cloud
const label parcelTypeId_;
//- Flag to correct cell values with latest transfer information
// during the lagrangian timestep
const Switch cellValueSourceCorrection_;
@ -361,9 +357,6 @@ public:
// Cloud data
//- Return the parcel type id
inline label parcelTypeId() const;
//- Return refernce to the random object
inline Random& rndGen();

View File

@ -93,13 +93,6 @@ inline bool Foam::KinematicCloud<ParcelType>::hasWallImpactDistance() const
}
template<class ParcelType>
inline Foam::label Foam::KinematicCloud<ParcelType>::parcelTypeId() const
{
return parcelTypeId_;
}
template<class ParcelType>
inline const Foam::fvMesh& Foam::KinematicCloud<ParcelType>::mesh() const
{

View File

@ -170,7 +170,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
this->solution().integrationSchemes()
)
),
radiation_(this->particleProperties().lookup("radiation")),
radiation_(this->subModelProperties().lookup("radiation")),
hsTrans_
(
IOobject

View File

@ -96,6 +96,10 @@ public:
//- Constant properties dictionary
const dictionary dict_;
//- Parcel type id - used for post-processing to flag the type
// of parcels issued by this cloud
const label parcelTypeId_;
//- Minimum density [kg/m3]
const scalar rhoMin_;
@ -122,6 +126,9 @@ public:
//- Return const access to the constant properties dictionary
inline const dictionary& dict() const;
//- Return const access to the parcel type id
inline label parcelTypeId() const;
//- Return const access to the minimum density
inline scalar rhoMin() const;

View File

@ -36,6 +36,7 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
)
:
dict_(parentDict.subDict("constantProperties")),
parcelTypeId_(readLabel(dict_.lookup("parcelTypeId"))),
rhoMin_(readScalar(dict_.lookup("rhoMin"))),
rho0_(readScalar(dict_.lookup("rho0"))),
minParticleMass_(readScalar(dict_.lookup("minParticleMass"))),
@ -79,7 +80,7 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
:
Particle<ParcelType>(owner, position, cellI, tetFaceI, tetPtI),
active_(true),
typeId_(owner.parcelTypeId()),
typeId_(owner.constProps().parcelTypeId()),
nParticle_(0),
d_(0.0),
dTarget_(0.0),
@ -146,6 +147,14 @@ Foam::KinematicParcel<ParcelType>::constantProperties::dict() const
}
template<class ParcelType>
inline Foam::label
Foam::KinematicParcel<ParcelType>::constantProperties::parcelTypeId() const
{
return parcelTypeId_;
}
template <class ParcelType>
inline Foam::scalar
Foam::KinematicParcel<ParcelType>::constantProperties::rhoMin() const

View File

@ -38,28 +38,31 @@ solution
}
}
radiation on;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
youngsModulus 2e9;
poissonsRatio 0.35;
T0 300;
cp0 4187;
youngsModulus 2e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 400;
Tbp 400;
LDevol 0;
hRetentionCoeff 1;
constantVolume true;
}
@ -97,6 +100,8 @@ subModels
SurfaceFilmModel none;
radiation on;
ManualInjectionCoeffs
{
massTotal massTotal [ 1 0 0 0 0 ] 0.0001;

View File

@ -37,22 +37,24 @@ solution
}
}
radiation on;
parcelTypeId 2;
constantProperties
{
parcelTypeId 2;
rhoMin 1e-15;
TMin 200;
minParticleMass 1e-15;
rho0 2500;
youngsModulus 40e9;
poissonsRatio 0.25;
T0 300;
cp0 900;
youngsModulus 40e9;
poissonsRatio 0.25;
epsilon0 1;
f0 0.5;
Pr 0.7;
}
@ -82,6 +84,8 @@ subModels
SurfaceFilmModel none;
radiation on;
ManualInjectionCoeffs
{
massTotal massTotal [ 1 0 0 0 0 ] 0.0001;

View File

@ -38,28 +38,31 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
rho0 1000;
T0 300;
cp0 4100;
youngsModulus 1e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
LDevol 0;
hRetentionCoeff 1;
constantVolume false;
}
@ -97,6 +100,8 @@ subModels
CollisionModel none;
radiation off;
ReactingMultiphaseLookupTableInjectionCoeffs
{
massTotal massTotal [ 1 0 0 0 0 ] 1e-2;

View File

@ -38,28 +38,31 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
rho0 1000;
T0 350;
cp0 4100;
youngsModulus 1e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Tvap 284;
Tbp 373;
Pr 0.7;
LDevol 0;
hRetentionCoeff 1;
constantVolume false;
}
@ -99,6 +102,8 @@ subModels
CollisionModel none;
radiation off;
ManualInjectionCoeffs
{
massTotal massTotal [ 1 0 0 0 0 ] 5.23599e-10; // 1 droplet of density 1000 kg/m3

View File

@ -38,28 +38,31 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
rho0 1000;
T0 350;
cp0 4100;
youngsModulus 1e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Tvap 273;
Tbp 373;
Pr 0.7;
LDevol 0;
hRetentionCoeff 1;
constantVolume false;
}
@ -99,6 +102,8 @@ subModels
CollisionModel none;
radiation off;
PatchInjectionCoeffs
{
SOI 0.01;

View File

@ -38,27 +38,29 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
cp0 4187;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
youngsModulus 0;
poissonsRatio 0;
constantVolume false;
}
particleForces
@ -91,6 +93,8 @@ subModels
SurfaceFilmModel ThermoSurfaceFilm;
radiation off;
StandardWallInteractionCoeffs
{
type rebound;

View File

@ -38,26 +38,28 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 0;
poissonsRatio 0;
minParticleMass 1e-15;
rho0 1000;
T0 300;
cp0 4187;
youngsModulus 0;
poissonsRatio 0;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}
@ -91,6 +93,8 @@ subModels
SurfaceFilmModel ThermoSurfaceFilm; // none;
radiation off;
ConeInjectionCoeffs
{
SOI 0.000;

View File

@ -38,26 +38,28 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
rho0 1000;
T0 300;
cp0 4187;
youngsModulus 1e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}
@ -91,6 +93,8 @@ subModels
SurfaceFilmModel ThermoSurfaceFilm; // none;
radiation off;
ConeInjectionMPCoeffs
{
SOI 0.000;

View File

@ -38,26 +38,28 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
rho0 1000;
T0 300;
cp0 4187;
youngsModulus 1e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}
@ -91,6 +93,8 @@ subModels
SurfaceFilmModel ThermoSurfaceFilm;
radiation off;
StandardWallInteractionCoeffs
{
type rebound;

View File

@ -38,26 +38,28 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
rho0 1000;
T0 300;
cp0 4187;
youngsModulus 1e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}
@ -91,6 +93,8 @@ subModels
SurfaceFilmModel none;
radiation off;
ManualInjectionCoeffs
{
massTotal massTotal [ 1 0 0 0 0 ] 1e-8;

View File

@ -34,13 +34,15 @@ solution
}
}
parcelTypeId 2;
constantProperties
{
parcelTypeId 2;
rhoMin 1e-15;
minParticleMass 1e-15;
rho0 5000;
youngsModulus 1e9;
poissonsRatio 0.35;
}

View File

@ -37,22 +37,24 @@ solution
}
}
radiation off;
parcelTypeId 1;
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
minParticleMass 1e-15;
rho0 2500;
youngsModulus 1e9;
poissonsRatio 0.35;
T0 300;
cp0 900;
youngsModulus 1e9;
poissonsRatio 0.35;
epsilon0 1;
f0 0.5;
Pr 0.7;
}
@ -82,6 +84,8 @@ subModels
SurfaceFilmModel none;
radiation off;
ManualInjectionCoeffs
{
massTotal massTotal [ 1 0 0 0 0 ] 0.0001;