From 66fdc593e0b70877ea9ebea06cac1e224f36eb39 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 7 Nov 2013 12:26:14 +0000
Subject: [PATCH] ENH: lagrangian - removed unused code
---
.../CollidingParcel/CollidingParcel.H | 11 -----
.../CollidingParcel/CollidingParcelI.H | 23 ----------
.../KinematicParcel/KinematicParcel.H | 9 ----
.../KinematicParcel/KinematicParcelI.H | 17 -------
.../ReactingMultiphaseParcel.C | 34 ++++++++++----
.../ReactingMultiphaseParcel.H | 21 ---------
.../ReactingMultiphaseParcelI.H | 46 -------------------
.../Templates/ReactingParcel/ReactingParcel.C | 7 ++-
.../Templates/ReactingParcel/ReactingParcel.H | 19 --------
.../ReactingParcel/ReactingParcelI.H | 39 ----------------
.../Templates/ThermoParcel/ThermoParcel.H | 17 -------
.../Templates/ThermoParcel/ThermoParcelI.H | 35 --------------
12 files changed, 31 insertions(+), 247 deletions(-)
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
index 6fd579cd7bf..d6c18751580 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcel.H
@@ -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
diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
index 9490aba9c7e..cc5940fcda8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollidingParcelI.H
@@ -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
(
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index b7b24059a3d..63d15118452 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -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
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 19dc18c1301..5002d60d941 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -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
(
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
index 12359be6715..31d6059c501 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -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
(
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
index 5623601e911..63f06904cee 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -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
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
index 0c87df2267b..6bcd5c52b94 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -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
(
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index f678e7cf426..02d68c78c7b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -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;
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 27f3bcbcb96..7ee7d36e733 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -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
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index 24b4f1be547..d4bb6002c18 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -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
(
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index 695097355f0..4e405344ed5 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -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
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index 21007647586..e9281af259f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -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
(
--
GitLab