Commit 8dcf604c authored by andy's avatar andy
Browse files

ENH: Header file clean-up

ENH: Added construct from components for constantProperties
parent 837c0f3d
......@@ -124,6 +124,17 @@ public:
const bool readFields = true
);
//- Construct from components
constantProperties
(
const label parcelTypeId,
const scalar rhoMin,
const scalar rho0,
const scalar minParticleMass,
const scalar youngsModulus,
const scalar poissonsRatio
);
// Member functions
......
......@@ -85,6 +85,26 @@ 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,
const scalar youngsModulus,
const scalar poissonsRatio
)
:
dict_(dictionary::null),
parcelTypeId_(parcelTypeId),
rhoMin_(rhoMin),
rho0_(rho0),
minParticleMass_(minParticleMass),
youngsModulus_(youngsModulus),
poissonsRatio_(poissonsRatio)
{}
template<class ParcelType>
inline Foam::KinematicParcel<ParcelType>::KinematicParcel
......
......@@ -38,8 +38,8 @@ SourceFiles
#ifndef ReactingMultiphaseParcel_H
#define ReactingMultiphaseParcel_H
#include "ReactingParcel.H"
#include "ReactingMultiphaseCloud.H"
#include "particle.H"
#include "SLGThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -26,8 +26,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class ParcelType>
inline
Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties()
:
ParcelType::constantProperties(),
......@@ -37,8 +36,7 @@ constantProperties()
template<class ParcelType>
inline
Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
constantProperties
(
const constantProperties& cp
......@@ -227,4 +225,5 @@ inline bool& Foam::ReactingMultiphaseParcel<ParcelType>::canCombust()
return canCombust_;
}
// ************************************************************************* //
......@@ -24,8 +24,9 @@ License
\*---------------------------------------------------------------------------*/
#include "ReactingParcel.H"
#include "mathematicalConstants.H"
#include "specie.H"
#include "CompositionModel.H"
#include "mathematicalConstants.H"
using namespace Foam::constant::mathematical;
......
......@@ -38,8 +38,8 @@ SourceFiles
#ifndef ReactingParcel_H
#define ReactingParcel_H
#include "ThermoParcel.H"
#include "ReactingCloud.H"
#include "particle.H"
#include "SLGThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -104,6 +104,27 @@ public:
const bool readFields = true
);
//- 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 Cp0,
const scalar epsilon0,
const scalar f0,
const scalar Pr,
const scalar pMin,
const Switch& constantVolume,
const scalar Tvap,
const scalar Tbp
);
// Access
......@@ -136,7 +157,6 @@ public:
autoPtr<interpolation<scalar> > pInterp_;
public:
typedef typename ParcelType::template TrackingData<CloudType>::trackPart
......@@ -403,7 +423,7 @@ public:
const CompositionType& compModel
);
//- Read - composition supplied
//- Write - composition supplied
template<class CloudType>
static void writeFields(const CloudType& c);
......
......@@ -74,6 +74,49 @@ 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 Cp0,
const scalar epsilon0,
const scalar f0,
const scalar Pr,
const scalar pMin,
const Switch& constantVolume,
const scalar Tvap,
const scalar Tbp
)
:
ParcelType::constantProperties
(
parcelTypeId,
rhoMin,
rho0,
minParticleMass,
youngsModulus,
poissonsRatio,
T0,
TMin,
Cp0,
epsilon0,
f0,
Pr
),
pMin_(pMin),
constantVolume_(constantVolume),
Tvap_(Tvap),
Tbp_(Tbp)
{}
template<class ParcelType>
inline Foam::ReactingParcel<ParcelType>::ReactingParcel
(
......
......@@ -39,8 +39,8 @@ SourceFiles
#ifndef ThermoParcel_H
#define ThermoParcel_H
#include "KinematicParcel.H"
#include "ThermoCloud.H"
#include "particle.H"
#include "SLGThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -112,6 +112,23 @@ public:
const bool readFields = true
);
//- 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 Cp0,
const scalar epsilon0,
const scalar f0,
const scalar Pr
);
// Member functions
......
......@@ -81,6 +81,41 @@ 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 Cp0,
const scalar epsilon0,
const scalar f0,
const scalar Pr
)
:
ParcelType::constantProperties
(
parcelTypeId,
rhoMin,
rho0,
minParticleMass,
youngsModulus,
poissonsRatio
),
T0_(T0),
TMin_(TMin),
Cp0_(Cp0),
epsilon0_(epsilon0),
f0_(f0),
Pr_(Pr)
{}
template<class ParcelType>
inline Foam::ThermoParcel<ParcelType>::ThermoParcel
(
......
......@@ -38,6 +38,7 @@ SourceFiles
#ifndef CompositionModel_H
#define CompositionModel_H
#include "SubModelBase.H"
#include "IOdictionary.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
......
Markdown is supported
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