ENH: Removed dimensions from cloud constant props (not used)

This commit is contained in:
andy
2010-10-18 16:11:01 +01:00
parent e54dae6db7
commit 2ae6047ac0
16 changed files with 177 additions and 216 deletions

View File

@ -36,20 +36,11 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
)
:
dict_(parentDict.subDict("constantProperties")),
rhoMin_(dimensionedScalar(dict_.lookup("rhoMin")).value()),
rho0_(dimensionedScalar(dict_.lookup("rho0")).value()),
minParticleMass_
(
dimensionedScalar(dict_.lookup("minParticleMass")).value()
),
youngsModulus_
(
dimensionedScalar(dict_.lookup("youngsModulus")).value()
),
poissonsRatio_
(
dimensionedScalar(dict_.lookup("poissonsRatio")).value()
)
rhoMin_(readScalar(dict_.lookup("rhoMin"))),
rho0_(readScalar(dict_.lookup("rho0"))),
minParticleMass_(readScalar(dict_.lookup("minParticleMass"))),
youngsModulus_(readScalar(dict_.lookup("youngsModulus"))),
poissonsRatio_(readScalar(dict_.lookup("poissonsRatio")))
{}

View File

@ -33,11 +33,8 @@ constantProperties
)
:
ReactingParcel<ParcelType>::constantProperties(parentDict),
LDevol_(dimensionedScalar(this->dict().lookup("LDevol")).value()),
hRetentionCoeff_
(
dimensionedScalar(this->dict().lookup("hRetentionCoeff")).value()
)
LDevol_(readScalar(this->dict().lookup("LDevol"))),
hRetentionCoeff_(readScalar(this->dict().lookup("hRetentionCoeff")))
{
if ((hRetentionCoeff_ < 0) || (hRetentionCoeff_ > 1))
{

View File

@ -32,10 +32,10 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
)
:
ThermoParcel<ParcelType>::constantProperties(parentDict),
pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()),
pMin_(readScalar(this->dict().lookup("pMin"))),
constantVolume_(this->dict().lookup("constantVolume")),
Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()),
Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value())
Tvap_(readScalar(this->dict().lookup("Tvap"))),
Tbp_(readScalar(this->dict().lookup("Tbp")))
{}

View File

@ -32,12 +32,12 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
)
:
KinematicParcel<ParcelType>::constantProperties(parentDict),
T0_(dimensionedScalar(this->dict().lookup("T0")).value()),
TMin_(dimensionedScalar(this->dict().lookup("TMin")).value()),
cp0_(dimensionedScalar(this->dict().lookup("cp0")).value()),
epsilon0_(dimensionedScalar(this->dict().lookup("epsilon0")).value()),
f0_(dimensionedScalar(this->dict().lookup("f0")).value()),
Pr_(dimensionedScalar(this->dict().lookup("Pr")).value())
T0_(readScalar(this->dict().lookup("T0"))),
TMin_(readScalar(this->dict().lookup("TMin"))),
cp0_(readScalar(this->dict().lookup("cp0"))),
epsilon0_(readScalar(this->dict().lookup("epsilon0"))),
f0_(readScalar(this->dict().lookup("f0"))),
Pr_(readScalar(this->dict().lookup("Pr")))
{}

View File

@ -27,22 +27,22 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [1 -1 -2 0 0] 2e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 4187;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
Tvap Tvap [ 0 0 0 1 0 ] 400;
Tbp Tvap [ 0 0 0 1 0 ] 400;
LDevol LDevol [ 0 0 0 0 0 ] 0;
hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
youngsModulus 2e9;
poissonsRatio 0.35;
T0 300;
cp0 4187;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 400;
Tbp 400;
LDevol 0;
hRetentionCoeff 1;
constantVolume true;
}

View File

@ -27,17 +27,17 @@ parcelTypeId 2;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
rho0 rho0 [ 1 -3 0 0 0 ] 2500;
youngsModulus youngsModulus [1 -1 -2 0 0] 40e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.25;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 900;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
rhoMin 1e-15;
TMin 200;
minParticleMass 1e-15;
rho0 2500;
youngsModulus 40e9;
poissonsRatio 0.25;
T0 300;
cp0 900;
epsilon0 1;
f0 0.5;
Pr 0.7;
}
interpolationSchemes

View File

@ -27,22 +27,22 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 4100;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
Tvap Tvap [ 0 0 0 1 0 ] 273;
Tbp Tvap [ 0 0 0 1 0 ] 373;
LDevol LDevol [ 0 0 0 0 0 ] 0;
hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
T0 300;
cp0 4100;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
LDevol 0;
hRetentionCoeff 1;
constantVolume false;
}

View File

@ -27,22 +27,22 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 350;
cp0 cp0 [ 0 2 -2 -1 0 ] 4100;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Tvap Tvap [ 0 0 0 1 0 ] 284;
Tbp Tbp [ 0 0 0 1 0 ] 373;
Pr Pr [ 0 0 0 0 0 ] 0.7;
LDevol LDevol [ 0 0 0 0 0 ] 0;
hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
T0 350;
cp0 4100;
epsilon0 1;
f0 0.5;
Tvap 284;
Tbp 373;
Pr 0.7;
LDevol 0;
hRetentionCoeff 1;
constantVolume false;
}

View File

@ -27,22 +27,22 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 350;
cp0 cp0 [ 0 2 -2 -1 0 ] 4100;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Tvap Tvap [ 0 0 0 1 0 ] 273;
Tbp Tbp [ 0 0 0 1 0 ] 373;
Pr Pr [ 0 0 0 0 0 ] 0.7;
LDevol LDevol [ 0 0 0 0 0 ] 0;
hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
T0 350;
cp0 4100;
epsilon0 1;
f0 0.5;
Tvap 273;
Tbp 373;
Pr 0.7;
LDevol 0;
hRetentionCoeff 1;
constantVolume false;
}

View File

@ -27,21 +27,21 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 4187;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
Tvap Tvap [ 0 0 0 1 0 ] 273;
Tbp Tvap [ 0 0 0 1 0 ] 373;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
minParticleMass 1e-15;
T0 300;
cp0 4187;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
youngsModulus youngsModulus [ 0 0 0 0 0 ] 0;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0;
youngsModulus 0;
poissonsRatio 0;
}
interpolationSchemes

View File

@ -27,20 +27,20 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [0 0 0 0 0] 0;
poissonsRatio poissonsRatio [0 0 0 0 0] 0;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 4187;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
Tvap Tvap [ 0 0 0 1 0 ] 273;
Tbp Tvap [ 0 0 0 1 0 ] 373;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 0;
poissonsRatio 0;
minParticleMass 1e-15;
T0 300;
cp0 4187;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}

View File

@ -27,20 +27,20 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 4187;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
Tvap Tvap [ 0 0 0 1 0 ] 273;
Tbp Tvap [ 0 0 0 1 0 ] 373;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
T0 300;
cp0 4187;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}
@ -90,33 +90,6 @@ subModels
SurfaceFilmModel ThermoSurfaceFilm; // none;
ConeInjectionCoeffs
{
SOI 0.000;
duration 10.000;
position (0.5 0.8 1.45);
direction (0 -0.5 -1);
massTotal massTotal [ 1 0 0 0 0 ] 0.025; // 1e-3;
parcelsPerSecond 500;
parcelBasisType mass;
flowRateProfile constant 0.01;
Umag constant 5;
thetaInner constant 0;
thetaOuter constant 30;
parcelPDF
{
pdfType RosinRammler;
RosinRammlerPDF
{
minValue 5e-04;
maxValue 0.0012;
d 7.5e-05;
n 0.5;
}
}
}
ConeInjectionMPCoeffs
{
SOI 0.000;

View File

@ -27,20 +27,20 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 4187;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
Tvap Tvap [ 0 0 0 1 0 ] 273;
Tbp Tvap [ 0 0 0 1 0 ] 373;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
T0 300;
cp0 4187;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}

View File

@ -27,20 +27,20 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
pMin pMin [ 1 -1 2 0 0 ] 1000;
rho0 rho0 [ 1 -3 0 0 0 ] 1000;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 4187;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
Tvap Tvap [ 0 0 0 1 0 ] 273;
Tbp Tvap [ 0 0 0 1 0 ] 373;
rhoMin 1e-15;
TMin 200;
pMin 1000;
rho0 1000;
youngsModulus 1e9;
poissonsRatio 0.35;
minParticleMass 1e-15;
T0 300;
cp0 4187;
epsilon0 1;
f0 0.5;
Pr 0.7;
Tvap 273;
Tbp 373;
constantVolume false;
}

View File

@ -25,11 +25,11 @@ parcelTypeId 2;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
rho0 rho0 [ 1 -3 0 0 0 ] 5000;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
rhoMin 1e-15;
minParticleMass 1e-15;
rho0 5000;
youngsModulus 1e9;
poissonsRatio 0.35;
}
interpolationSchemes

View File

@ -27,17 +27,17 @@ parcelTypeId 1;
constantProperties
{
rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15;
TMin TMin [ 0 0 0 1 0 ] 200;
minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15;
rho0 rho0 [ 1 -3 0 0 0 ] 2500;
youngsModulus youngsModulus [1 -1 -2 0 0] 1e9;
poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35;
T0 T0 [ 0 0 0 1 0 ] 300;
cp0 cp0 [ 0 2 -2 -1 0 ] 900;
epsilon0 epsilon0 [ 0 0 0 0 0 ] 1;
f0 f0 [ 0 0 0 0 0 ] 0.5;
Pr Pr [ 0 0 0 0 0 ] 0.7;
rhoMin 1e-15;
TMin 200;
minParticleMass 1e-15;
rho0 2500;
youngsModulus 1e9;
poissonsRatio 0.35;
T0 300;
cp0 900;
epsilon0 1;
f0 0.5;
Pr 0.7;
}
interpolationSchemes