diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
index c05a7b3e043abb1f9132f55e4a6f7d997307c105..b017f50270ad14935a7fb070d2439dd57f2c4bd1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
@@ -26,7 +26,7 @@ Class
Foam::NoDrag
Description
- Dummy drag model for 'no drag'
+ Dummy drag model for 'none'
\*---------------------------------------------------------------------------*/
@@ -51,7 +51,7 @@ class NoDrag
public:
//- Runtime type information
- TypeName("NoDrag");
+ TypeName("none");
// Constructors
@@ -59,8 +59,8 @@ public:
//- Construct from dictionary
NoDrag
(
- const dictionary& dict,
- CloudType& owner
+ const dictionary&,
+ CloudType&
);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 0dd1b106c94a037ca3ec11264d32cf7fc353c3dd..0aaeb44cd4619d85019bce8d6628517956055e05 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -29,6 +29,61 @@ License
// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::readProps()
+{
+ IOobject propsDictHeader
+ (
+ "injectionProperties",
+ owner_.db().time().timeName(),
+ "uniform/Lagrangian"/owner_.name(),
+ owner_.db(),
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE,
+ false
+ );
+
+ if (propsDictHeader.headerOk())
+ {
+ const IOdictionary propsDict(propsDictHeader);
+
+ propsDict.readIfPresent("massInjected", massInjected_);
+ propsDict.readIfPresent("nInjections", nInjections_);
+ propsDict.readIfPresent("parcelsAddedTotal", parcelsAddedTotal_);
+ propsDict.readIfPresent("timeStep0", timeStep0_);
+ }
+}
+
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::writeProps()
+{
+ if (owner_.db().time().outputTime())
+ {
+ IOdictionary propsDict
+ (
+ IOobject
+ (
+ "injectionProperties",
+ owner_.db().time().timeName(),
+ "uniform/Lagrangian"/owner_.name(),
+ owner_.db(),
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ )
+ );
+
+ propsDict.add("massInjected", massInjected_);
+ propsDict.add("nInjections", nInjections_);
+ propsDict.add("parcelsAddedTotal", parcelsAddedTotal_);
+ propsDict.add("timeStep0", timeStep0_);
+
+ propsDict.regIOobject::write();
+ }
+}
+
+
template<class CloudType>
void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
(
@@ -114,7 +169,7 @@ void Foam::InjectionModel<CloudType>::findCellAtPosition
{
FatalErrorIn
(
- "Foam::InjectionModel<CloudType>::findCellAtPosition"
+ "Foam::InjectionModel<CloudType>::findCellAtPosition\n"
"(\n"
" label&,\n"
" vector&\n"
@@ -156,7 +211,7 @@ Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
FatalErrorIn
(
"Foam::scalar "
- "Foam::InjectionModel<CloudType>::setNumberOfParticles"
+ "Foam::InjectionModel<CloudType>::setNumberOfParticles\n"
"(\n"
" const label,\n"
" const scalar,\n"
@@ -186,19 +241,42 @@ void Foam::InjectionModel<CloudType>::postInjectCheck()
// Increment total number of parcels added
parcelsAddedTotal_ += parcelsAdded_;
- // Reset parcel counters
- parcelsAdded_ = 0;
-
// Update time for start of next injection
time0_ = owner_.db().time().value();
// Increment number of injections
nInjections_++;
+
+ // Reset added parcels counter
+ parcelsAdded_ = 0;
+
+ writeProps();
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
+:
+ dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null),
+ SOI_(0.0),
+ volumeTotal_(0.0),
+ massTotal_(0.0),
+ massInjected_(0.0),
+ nInjections_(0),
+ parcelsAdded_(0),
+ parcelsAddedTotal_(0),
+ parcelBasis_(pbNumber),
+ time0_(0.0),
+ timeStep0_(0.0)
+{
+ readProps();
+}
+
+
template<class CloudType>
Foam::InjectionModel<CloudType>::InjectionModel
(
@@ -206,7 +284,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
CloudType& owner,
const word& type
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner),
coeffDict_(dict.subDict(type + "Coeffs")),
SOI_(readScalar(coeffDict_.lookup("SOI"))),
@@ -216,16 +295,16 @@ Foam::InjectionModel<CloudType>::InjectionModel
nInjections_(0),
parcelsAdded_(0),
parcelsAddedTotal_(0),
- parcelBasisType_(coeffDict_.lookup("parcelBasisType")),
parcelBasis_(pbNumber),
time0_(owner.db().time().value()),
timeStep0_(0.0)
{
- if (parcelBasisType_ == "mass")
+ word parcelBasisType = coeffDict_.lookup("parcelBasisType");
+ if (parcelBasisType == "mass")
{
parcelBasis_ = pbMass;
}
- else if (parcelBasisType_ == "number")
+ else if (parcelBasisType == "number")
{
parcelBasis_ = pbNumber;
}
@@ -233,7 +312,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
{
FatalErrorIn
(
- "Foam::InjectionModel<CloudType>::InjectionModel"
+ "Foam::InjectionModel<CloudType>::InjectionModel\n"
"(\n"
" const dictionary&,\n"
" CloudType&,\n"
@@ -242,6 +321,8 @@ Foam::InjectionModel<CloudType>::InjectionModel
)<< "parcelBasisType must be either 'number' or 'mass'" << nl
<< exit(FatalError);
}
+
+ readProps();
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index ad2448681e64e4ad1ba752406c203bcfe8e95879..dd7d71de2484d406aee674e900f62c6c39b46118 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -80,6 +80,15 @@ private:
const dictionary coeffDict_;
+ // Private member functions
+
+ //- Read injector properties from previous run (if applicable)
+ void readProps();
+
+ //- Write injector properties
+ void writeProps();
+
+
protected:
// Protected data
@@ -114,13 +123,8 @@ protected:
// Injection properties per Lagrangian time step
- // Parcel basis
-
- //- Parcel basis name
- const word parcelBasisType_;
-
- //- Parcel basis enumeration
- parcelBasis parcelBasis_;
+ //- Parcel basis enumeration
+ parcelBasis parcelBasis_;
//- Continuous phase time at start of injection time step [s]
scalar time0_;
@@ -147,7 +151,7 @@ protected:
//- Determine properties for next time step/injection interval
- void prepareForNextTimeStep
+ virtual void prepareForNextTimeStep
(
const scalar time0,
const scalar time1,
@@ -161,7 +165,7 @@ protected:
virtual void findCellAtPosition(label& cellI, vector& position);
//- Set number of particles to inject given parcel properties
- scalar setNumberOfParticles
+ virtual scalar setNumberOfParticles
(
const label parcels,
const scalar volume,
@@ -171,7 +175,7 @@ protected:
);
//- Post injection checks
- void postInjectCheck();
+ virtual void postInjectCheck();
public:
@@ -195,6 +199,9 @@ public:
// Constructors
+ //- Construct null from owner
+ InjectionModel(CloudType& owner);
+
//- Construct from dictionary
InjectionModel
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index 43c03392f670e54b9e95abcded4d8f0015166543..fcbd1b6981d68e7d194d45a99d92100f7dc47ca3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -56,11 +56,11 @@ Foam::scalar Foam::NoInjection<CloudType>::volumeToInject
template<class CloudType>
Foam::NoInjection<CloudType>::NoInjection
(
- const dictionary& dict,
+ const dictionary&,
CloudType& owner
)
:
- InjectionModel<CloudType>(dict, owner, typeName)
+ InjectionModel<CloudType>(owner)
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index d7df9867e253598e7b43d15f70145725617c1992..cb849a4951f865f7121a8aff44b330c4033c84e9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -26,7 +26,7 @@ Class
Foam::NoInjection
Description
- Place holder for 'no injection' option
+ Place holder for 'none' option
SourceFiles
NoInjection.C
@@ -44,7 +44,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class NoInjection Declaration
+ Class NoInjection Declaration
\*---------------------------------------------------------------------------*/
template<class CloudType>
@@ -74,7 +74,7 @@ protected:
public:
//- Runtime type information
- TypeName("NoInjection");
+ TypeName("none");
// Constructors
@@ -82,8 +82,8 @@ public:
//- Construct from components
NoInjection
(
- const dictionary& dict,
- CloudType& owner
+ const dictionary&,
+ CloudType&
);
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
index 4029aa0570885ab33509d7804fa2f5369deea657..06035d7224f0fa18fc5ffc667add95147cfe98f0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -31,11 +31,11 @@ License
template <class CloudType>
Foam::NoPhaseChange<CloudType>::NoPhaseChange
(
- const dictionary& dict,
- CloudType& cloud
+ const dictionary&,
+ CloudType& owner
)
:
- PhaseChangeModel<CloudType>(dict, cloud, typeName)
+ PhaseChangeModel<CloudType>(owner)
{}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
index 74b065b75a8123ce6f07bf948a3b6dfa55763932..92a9dd22e5d379b309601457539de77d93d4b46b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -26,7 +26,7 @@ Class
Foam::NoPhaseChange
Description
- Dummy phase change model for 'no phase change'
+ Dummy phase change model for 'none'
\*---------------------------------------------------------------------------*/
@@ -51,17 +51,13 @@ class NoPhaseChange
public:
//- Runtime type information
- TypeName("NoPhaseChange");
+ TypeName("none");
// Constructors
//- Construct from dictionary
- NoPhaseChange
- (
- const dictionary& dict,
- CloudType& cloud
- );
+ NoPhaseChange(const dictionary&, CloudType&);
//- Destructor
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index c18716563246e194790d2cbc939a56b4b6a2c2f4..724da1e762f5f94852e7433be0c7ee68786647b9 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -28,6 +28,17 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
+(
+ CloudType& owner
+)
+: dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null)
+{}
+
+
template<class CloudType>
Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
(
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index 1a97370529e83f32a3f7f857851a4f30d8950ac6..22f12088b488c6cceed219bd77a9b9f231f99a3b 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -94,6 +94,9 @@ public:
// Constructors
+ //- Construct null from owner
+ PhaseChangeModel(CloudType& owner);
+
//- Construct from dictionary
PhaseChangeModel
(
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 31776c1bd18e4708f3a9a70791e02dd3d6193891..65ff10c0f29d74e73f6a9ff82dc9674d7446cf48 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -26,7 +26,7 @@ Class
Foam::NoSurfaceReaction
Description
- Dummy Devolatisation model for 'no devolatisation'
+ Dummy surface reaction model for 'none'
\*---------------------------------------------------------------------------*/
@@ -51,7 +51,7 @@ class NoSurfaceReaction
public:
//- Runtime type information
- TypeName("NoSurfaceReaction");
+ TypeName("none");
// Constructors
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
index 1173ea1c59d17e30077a49cacf61a6194957a55d..c9fa9c4fceef975b7fd5f9303b63beda35939166 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
@@ -28,6 +28,18 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
+(
+ CloudType& owner
+)
+:
+ dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null)
+{}
+
+
template<class CloudType>
Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
(
@@ -35,7 +47,8 @@ Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
CloudType& owner,
const word& type
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner),
coeffDict_(dict.subDict(type + "Coeffs"))
{}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index dbeef7c237cd54edf673eb44b3969dadf19f0a5d..339af3560b1c67337962b2c0d53ccc41b8ae2b76 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -91,6 +91,9 @@ public:
// Constructors
+ //- Construct null from owner
+ SurfaceReactionModel(CloudType& owner);
+
//- Construct from dictionary
SurfaceReactionModel
(
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
index 913ea7fa1d35d9797741e7d09e5f6e1d2fe3c932..6a3d3efeb2363fc23743977e7e42ebfa7bd13e0d 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -28,6 +28,18 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
+(
+ CloudType& owner
+)
+:
+ dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null)
+{}
+
+
template<class CloudType>
Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
(
@@ -35,7 +47,8 @@ Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
CloudType& owner,
const word& type
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner),
coeffDict_(dict.subDict(type + "Coeffs"))
{}
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index 1195d6a2a09497635feaf4ae6dc977840656a751..004482a040f624c634e0fbf13aaf73890556f287 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -88,6 +88,9 @@ public:
// Constructors
+ //- Construct null from owner
+ DevolatilisationModel(CloudType& owner);
+
//- Construct from dictionary
DevolatilisationModel
(
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index 745fcc8d52c1463bacb2d98aae3358b141f4f784..9d7ff147491b21562a70d9d4d9018376addf3bcf 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -31,11 +31,11 @@ License
template <class CloudType>
Foam::NoDevolatilisation<CloudType>::NoDevolatilisation
(
- const dictionary& dict,
- CloudType& cloud
+ const dictionary&,
+ CloudType& owner
)
:
- DevolatilisationModel<CloudType>(dict, cloud, typeName)
+ DevolatilisationModel<CloudType>(owner)
{}
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index 5f8462aad70d4c5a618b32e14e428f522f931152..915547180a635a8c56c55e1d7783421b7d269635 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -26,7 +26,7 @@ Class
Foam::NoDevolatilisation
Description
- Dummy devolatilisation model for 'no devolatilisation'
+ Dummy devolatilisation model for 'none'
\*---------------------------------------------------------------------------*/
@@ -52,17 +52,13 @@ class NoDevolatilisation
public:
//- Runtime type information
- TypeName("NoDevolatilisation");
+ TypeName("none");
// Constructors
//- Construct from dictionary
- NoDevolatilisation
- (
- const dictionary& dict,
- CloudType& cloud
- );
+ NoDevolatilisation(const dictionary&, CloudType& owner);
//- Destructor
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index c94fe00d4a2b4305eab4a7890bd429a556e24f18..f294d382a71116f935cfe6b3798c9938711d81ef 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -28,6 +28,15 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+template<class CloudType>
+Foam::HeatTransferModel<CloudType>::HeatTransferModel(CloudType& owner)
+:
+ dict_(dictionary::null),
+ owner_(owner),
+ coeffDict_(dictionary::null)
+{}
+
+
template<class CloudType>
Foam::HeatTransferModel<CloudType>::HeatTransferModel
(
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index cfb5c32c5f49759cc3f5d47783bdaa474e5b274d..1924be16c9bef032cbdd6b9d30eed5d894752ab1 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -86,6 +86,9 @@ public:
// Constructors
+ //- Construct null from owner
+ HeatTransferModel(CloudType& owner);
+
//- Construct from dictionary
HeatTransferModel
(
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
index ab80ae9895f3109e6d769fdcbd39dfdf88c9ebbb..c50dd4d511f29a3ba4ff25980140e949e57d96a6 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
@@ -31,11 +31,11 @@ License
template <class CloudType>
Foam::NoHeatTransfer<CloudType>::NoHeatTransfer
(
- const dictionary& dict,
- CloudType& cloud
+ const dictionary&,
+ CloudType& owner
)
:
- HeatTransferModel<CloudType>(dict, cloud, typeName)
+ HeatTransferModel<CloudType>(owner)
{}
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
index 89112fef53363bf42f576d889d0d7274d023902d..f03b4b3dc5fb1fc5ea169d1ef1f354e5156c0256 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
@@ -26,7 +26,7 @@ Class
Foam::NoHeatTransfer
Description
- Dummy heat transfer model for 'no heat transfer'
+ Dummy heat transfer model for 'none'
\*---------------------------------------------------------------------------*/
@@ -40,7 +40,7 @@ Description
namespace Foam
{
/*---------------------------------------------------------------------------*\
- Class NoHeatTransfer Declaration
+ Class NoHeatTransfer Declaration
\*---------------------------------------------------------------------------*/
template<class CloudType>
@@ -51,17 +51,13 @@ class NoHeatTransfer
public:
//- Runtime type information
- TypeName("NoHeatTransfer");
+ TypeName("none");
// Constructors
//- Construct from dictionary
- NoHeatTransfer
- (
- const dictionary& dict,
- CloudType& cloud
- );
+ NoHeatTransfer(const dictionary&, CloudType& owner);
//- Destructor