Commit 66fdc593 authored by andy's avatar andy
Browse files

ENH: lagrangian - removed unused code

parent b55f84d9
......@@ -104,17 +104,6 @@ public:
//- Construct from dictionary
constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio
);
// Member functions
......
......@@ -59,29 +59,6 @@ inline Foam::CollidingParcel<ParcelType>::constantProperties::constantProperties
{}
template<class ParcelType>
inline Foam::CollidingParcel<ParcelType>::constantProperties::constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio
)
:
ParcelType::constantProperties
(
parcelTypeId,
rhoMin,
rho0,
minParticleMass
),
youngsModulus_(this->dict_, youngsModulus),
poissonsRatio_(this->dict_, poissonsRatio)
{}
template<class ParcelType>
inline Foam::CollidingParcel<ParcelType>::CollidingParcel
(
......
......@@ -122,15 +122,6 @@ public:
//- Construct from dictionary
constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass
);
// Member functions
......
......@@ -69,23 +69,6 @@ inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
{}
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass
)
:
dict_(dictionary::null),
parcelTypeId_(dict_, parcelTypeId),
rhoMin_(dict_, rhoMin),
rho0_(dict_, rho0),
minParticleMass_(dict_, minParticleMass)
{}
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::KinematicParcel
(
......
......@@ -506,14 +506,19 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
scalarField& Cs
) const
{
// Check that model is active, and that the parcel temperature is
// within necessary limits for devolatilisation to occur
if
(
!td.cloud().devolatilisation().active()
|| T < td.cloud().constProps().TDevol()
|| canCombust == -1
)
// Check that model is active
if (!td.cloud().devolatilisation().active())
{
return;
}
// Initialise demand-driven constants
(void)td.cloud().constProps().TDevol();
(void)td.cloud().constProps().LDevol();
// Check that the parcel temperature is within necessary limits for
// devolatilisation to occur
if (T < td.cloud().constProps().TDevol() || canCombust == -1)
{
return;
}
......@@ -604,11 +609,22 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
) const
{
// Check that model is active
if (!td.cloud().surfaceReaction().active() || (canCombust != 1))
if (!td.cloud().surfaceReaction().active())
{
return;
}
// Initialise demand-driven constants
(void)td.cloud().constProps().hRetentionCoeff();
(void)td.cloud().constProps().TMax();
// Check that model is active
if (canCombust != 1)
{
return;
}
// Update surface reactions
const scalar hReaction = td.cloud().surfaceReaction().calculate
(
......
......@@ -106,27 +106,6 @@ public:
//- Construct from dictionary
constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio,
const scalar T0,
const scalar TMin,
const scalar TMax,
const scalar Cp0,
const scalar epsilon0,
const scalar f0,
const scalar pMin,
const Switch& constantVolume,
const scalar TDevol,
const scalar LDevol,
const scalar hRetentionCoeff
);
// Access
......
......@@ -64,52 +64,6 @@ constantProperties
{}
template<class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio,
const scalar T0,
const scalar TMin,
const scalar TMax,
const scalar Cp0,
const scalar epsilon0,
const scalar f0,
const scalar pMin,
const Switch& constantVolume,
const scalar TDevol,
const scalar LDevol,
const scalar hRetentionCoeff
)
:
ParcelType::constantProperties
(
parcelTypeId,
rhoMin,
rho0,
minParticleMass,
youngsModulus,
poissonsRatio,
T0,
TMin,
TMax,
Cp0,
epsilon0,
f0,
pMin,
constantVolume
),
TDevol_(this->dict_, TDevol),
LDevol_(this->dict_, LDevol),
hRetentionCoeff_(this->dict_, hRetentionCoeff)
{}
template<class ParcelType>
inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
(
......
......@@ -60,9 +60,14 @@ void Foam::ReactingParcel<ParcelType>::calcPhaseChange
typedef typename TrackData::cloudType::reactingCloudType reactingCloudType;
PhaseChangeModel<reactingCloudType>& phaseChange = td.cloud().phaseChange();
if (!phaseChange.active())
{
return;
}
scalar Tvap = phaseChange.Tvap(YComponents);
if (!phaseChange.active() || T < Tvap || YPhase < SMALL)
if (T < Tvap || YPhase < SMALL)
{
return;
}
......
......@@ -95,25 +95,6 @@ public:
//- Construct from dictionary
constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio,
const scalar T0,
const scalar TMin,
const scalar TMax,
const scalar Cp0,
const scalar epsilon0,
const scalar f0,
const scalar pMin,
const Switch& constantVolume
);
// Access
......
......@@ -59,45 +59,6 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
{}
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio,
const scalar T0,
const scalar TMin,
const scalar TMax,
const scalar Cp0,
const scalar epsilon0,
const scalar f0,
const scalar pMin,
const Switch& constantVolume
)
:
ParcelType::constantProperties
(
parcelTypeId,
rhoMin,
rho0,
minParticleMass,
youngsModulus,
poissonsRatio,
T0,
TMin,
TMax,
Cp0,
epsilon0,
f0
),
pMin_(this->dict_, pMin),
constantVolume_(this->dict_, constantVolume)
{}
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::ReactingParcel
(
......
......@@ -109,23 +109,6 @@ public:
//- Construct from dictionary
constantProperties(const dictionary& parentDict);
//- Construct from components
constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio,
const scalar T0,
const scalar TMin,
const scalar TMax,
const scalar Cp0,
const scalar epsilon0,
const scalar f0
);
// Member functions
......
......@@ -70,41 +70,6 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
{}
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio,
const scalar T0,
const scalar TMin,
const scalar TMax,
const scalar Cp0,
const scalar epsilon0,
const scalar f0
)
:
ParcelType::constantProperties
(
parcelTypeId,
rhoMin,
rho0,
minParticleMass,
youngsModulus,
poissonsRatio
),
T0_(this->dict_, T0),
TMin_(this->dict_, TMin),
TMax_(this->dict_, TMax),
Cp0_(this->dict_, Cp0),
epsilon0_(this->dict_, epsilon0),
f0_(this->dict_, f0)
{}
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::ThermoParcel
(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment