From a5f6e005e88621bc897fbd6c439cea2bdd5bbafe Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 9 Dec 2013 09:44:12 +0000
Subject: [PATCH] ENH: Updated film sub-models to use new base class
---
.../constantFilmThermo/constantFilmThermo.C | 26 +++++++++----------
.../constantFilmThermo/constantFilmThermo.H | 2 +-
.../filmThermoModel/filmThermoModel.C | 10 +++----
.../filmThermoModel/filmThermoModel.H | 14 +++++-----
.../filmThermoModel/filmThermoModelNew.C | 4 +--
.../liquidFilmThermo/liquidFilmThermo.C | 10 +++----
.../liquidFilmThermo/liquidFilmThermo.H | 2 +-
.../filmTurbulenceModel/filmTurbulenceModel.C | 10 +++----
.../filmTurbulenceModel/filmTurbulenceModel.H | 14 +++++-----
.../filmTurbulenceModelNew.C | 4 +--
.../filmTurbulenceModel/laminar/laminar.C | 4 +--
.../filmTurbulenceModel/laminar/laminar.H | 2 +-
.../contactAngleForce/contactAngleForce.C | 10 +++----
.../contactAngleForce/contactAngleForce.H | 2 +-
.../submodels/kinematic/force/force/force.C | 12 ++++-----
.../submodels/kinematic/force/force/force.H | 14 +++++-----
.../kinematic/force/force/forceNew.C | 4 +--
.../kinematic/force/forceList/forceList.C | 6 ++---
.../kinematic/force/forceList/forceList.H | 6 ++---
.../thermocapillaryForce.C | 4 +--
.../thermocapillaryForce.H | 4 +--
.../curvatureSeparation/curvatureSeparation.C | 6 ++---
.../curvatureSeparation/curvatureSeparation.H | 4 +--
.../drippingInjection/drippingInjection.C | 8 +++---
.../drippingInjection/drippingInjection.H | 4 +--
.../injectionModel/injectionModel.C | 12 ++++-----
.../injectionModel/injectionModel.H | 16 ++++++------
.../injectionModel/injectionModelNew.C | 11 +++++---
.../injectionModelList/injectionModelList.C | 6 ++---
.../injectionModelList/injectionModelList.H | 8 +++---
.../removeInjection/removeInjection.C | 6 ++---
.../removeInjection/removeInjection.H | 2 +-
.../constantRadiation/constantRadiation.C | 8 +++---
.../constantRadiation/constantRadiation.H | 4 +--
.../filmRadiationModel/filmRadiationModel.C | 15 +++++------
.../filmRadiationModel/filmRadiationModel.H | 16 ++++++------
.../filmRadiationModelNew.C | 6 ++---
.../noRadiation/noRadiation.C | 2 +-
.../noRadiation/noRadiation.H | 4 +--
.../primaryRadiation/primaryRadiation.C | 2 +-
.../primaryRadiation/primaryRadiation.H | 4 +--
.../standardRadiation/standardRadiation.C | 6 ++---
.../standardRadiation/standardRadiation.H | 4 +--
.../constantViscosity/constantViscosity.C | 4 +--
.../constantViscosity/constantViscosity.H | 2 +-
.../filmViscosityModel/filmViscosityModel.C | 6 ++---
.../filmViscosityModel/filmViscosityModel.H | 12 ++++-----
.../filmViscosityModelNew.C | 4 +--
.../liquidViscosity/liquidViscosity.C | 2 +-
.../liquidViscosity/liquidViscosity.H | 2 +-
.../thixotropicViscosity.C | 14 +++++-----
.../thixotropicViscosity.H | 2 +-
.../constantHeatTransfer.C | 6 ++---
.../constantHeatTransfer.H | 4 +--
.../heatTransferModel/heatTransferModel.C | 12 ++++-----
.../heatTransferModel/heatTransferModel.H | 16 ++++++------
.../heatTransferModel/heatTransferModelNew.C | 6 ++---
.../mappedConvectiveHeatTransfer.C | 4 +--
.../mappedConvectiveHeatTransfer.H | 4 +--
.../noPhaseChange/noPhaseChange.C | 4 +--
.../noPhaseChange/noPhaseChange.H | 4 +--
.../phaseChangeModel/phaseChangeModel.C | 12 ++++-----
.../phaseChangeModel/phaseChangeModel.H | 16 ++++++------
.../phaseChangeModel/phaseChangeModelNew.C | 6 ++---
.../solidification/solidification.C | 8 +++---
.../solidification/solidification.H | 2 +-
.../standardPhaseChange/standardPhaseChange.C | 8 +++---
.../standardPhaseChange/standardPhaseChange.H | 4 +--
68 files changed, 242 insertions(+), 240 deletions(-)
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
index 38aa29885fb..6e964ac37d9 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
@@ -49,7 +49,7 @@ addToRunTimeSelectionTable
void constantFilmThermo::init(thermoData& td)
{
- if (coeffs_.readIfPresent(td.name_, td.value_))
+ if (coeffDict_.readIfPresent(td.name_, td.value_))
{
td.set_ = true;
}
@@ -60,12 +60,12 @@ void constantFilmThermo::init(thermoData& td)
constantFilmThermo::constantFilmThermo
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
filmThermoModel(typeName, owner, dict),
- name_(coeffs_.lookup("specieName")),
+ name_(coeffDict_.lookup("specieName")),
rho0_("rho0"),
mu0_("mu0"),
sigma0_("sigma0"),
@@ -110,7 +110,7 @@ scalar constantFilmThermo::rho
{
if (!rho0_.set_)
{
- coeffs_.lookup(rho0_.name_) >> rho0_.value_;
+ coeffDict_.lookup(rho0_.name_) >> rho0_.value_;
rho0_.set_ = true;
}
@@ -126,7 +126,7 @@ scalar constantFilmThermo::mu
{
if (!mu0_.set_)
{
- coeffs_.lookup(mu0_.name_) >> mu0_.value_;
+ coeffDict_.lookup(mu0_.name_) >> mu0_.value_;
mu0_.set_ = true;
}
@@ -142,7 +142,7 @@ scalar constantFilmThermo::sigma
{
if (!sigma0_.set_)
{
- coeffs_.lookup(sigma0_.name_) >> sigma0_.value_;
+ coeffDict_.lookup(sigma0_.name_) >> sigma0_.value_;
sigma0_.set_ = true;
}
@@ -158,7 +158,7 @@ scalar constantFilmThermo::Cp
{
if (!Cp0_.set_)
{
- coeffs_.lookup(Cp0_.name_) >> Cp0_.value_;
+ coeffDict_.lookup(Cp0_.name_) >> Cp0_.value_;
Cp0_.set_ = true;
}
@@ -174,7 +174,7 @@ scalar constantFilmThermo::kappa
{
if (!kappa0_.set_)
{
- coeffs_.lookup(kappa0_.name_) >> kappa0_.value_;
+ coeffDict_.lookup(kappa0_.name_) >> kappa0_.value_;
kappa0_.set_ = true;
}
@@ -190,7 +190,7 @@ scalar constantFilmThermo::D
{
if (!D0_.set_)
{
- coeffs_.lookup(D0_.name_) >> D0_.value_;
+ coeffDict_.lookup(D0_.name_) >> D0_.value_;
D0_.set_ = true;
}
@@ -206,7 +206,7 @@ scalar constantFilmThermo::hl
{
if (!hl0_.set_)
{
- coeffs_.lookup(hl0_.name_) >> hl0_.value_;
+ coeffDict_.lookup(hl0_.name_) >> hl0_.value_;
hl0_.set_ = true;
}
@@ -222,7 +222,7 @@ scalar constantFilmThermo::pv
{
if (!pv0_.set_)
{
- coeffs_.lookup(pv0_.name_) >> pv0_.value_;
+ coeffDict_.lookup(pv0_.name_) >> pv0_.value_;
pv0_.set_ = true;
}
@@ -234,7 +234,7 @@ scalar constantFilmThermo::W() const
{
if (!W0_.set_)
{
- coeffs_.lookup(W0_.name_) >> W0_.value_;
+ coeffDict_.lookup(W0_.name_) >> W0_.value_;
W0_.set_ = true;
}
@@ -246,7 +246,7 @@ scalar constantFilmThermo::Tb(const scalar p) const
{
if (!Tb0_.set_)
{
- coeffs_.lookup(Tb0_.name_) >> Tb0_.value_;
+ coeffDict_.lookup(Tb0_.name_) >> Tb0_.value_;
Tb0_.set_ = true;
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
index cfb2ec4088d..107b967d690 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
@@ -144,7 +144,7 @@ public:
//- Construct from surface film model and dictionary
constantFilmThermo
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C
index f6bd0c21d3e..173e512bfa2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C
@@ -43,21 +43,21 @@ defineRunTimeSelectionTable(filmThermoModel, dictionary);
filmThermoModel::filmThermoModel
(
- const surfaceFilmModel& owner
+ surfaceFilmModel& owner
)
:
- subModelBase(owner)
+ filmSubModelBase(owner)
{}
filmThermoModel::filmThermoModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
- subModelBase(type, owner, dict)
+ filmSubModelBase(owner, dict, typeName, modelType)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H
index 135122b9e60..86ce265ee33 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H
@@ -36,7 +36,7 @@ SourceFiles
#ifndef filmThermoModel_H
#define filmThermoModel_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +54,7 @@ namespace surfaceFilmModels
class filmThermoModel
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -81,7 +81,7 @@ public:
filmThermoModel,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
),
(owner, dict)
@@ -90,13 +90,13 @@ public:
// Constructors
//- Construct null
- filmThermoModel(const surfaceFilmModel& owner);
+ filmThermoModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
filmThermoModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
);
@@ -106,7 +106,7 @@ public:
//- Return a reference to the selected phase change model
static autoPtr<filmThermoModel> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
index be21e344835..b2622dde861 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmThermoModel> filmThermoModel::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict
)
{
@@ -53,7 +53,7 @@ autoPtr<filmThermoModel> filmThermoModel::New
{
FatalErrorIn
(
- "filmThermoModel::New(const surfaceFilmModel&, const dictionary&)"
+ "filmThermoModel::New(surfaceFilmModel&, const dictionary&)"
) << "Unknown filmThermoModel type " << modelType << nl << nl
<< "Valid filmThermoModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc()
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index 2b012fd61f5..cb18596cbef 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -104,7 +104,7 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
liquidFilmThermo::liquidFilmThermo
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
@@ -112,16 +112,16 @@ liquidFilmThermo::liquidFilmThermo
name_("unknown_liquid"),
liquidPtr_(NULL),
ownLiquid_(false),
- useReferenceValues_(readBool(coeffs_.lookup("useReferenceValues"))),
+ useReferenceValues_(readBool(coeffDict_.lookup("useReferenceValues"))),
pRef_(0.0),
TRef_(0.0)
{
- initLiquid(coeffs_);
+ initLiquid(coeffDict_);
if (useReferenceValues_)
{
- coeffs_.lookup("pRef") >> pRef_;
- coeffs_.lookup("TRef") >> TRef_;
+ coeffDict_.lookup("pRef") >> pRef_;
+ coeffDict_.lookup("TRef") >> TRef_;
}
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H
index 1b12bec4de9..6c952e43595 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H
@@ -107,7 +107,7 @@ public:
//- Construct from surface film model and dictionary
liquidFilmThermo
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
index a77307e881a..1d17112954e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
@@ -41,20 +41,20 @@ defineRunTimeSelectionTable(filmTurbulenceModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-filmTurbulenceModel::filmTurbulenceModel(const surfaceFilmModel& owner)
+filmTurbulenceModel::filmTurbulenceModel(surfaceFilmModel& owner)
:
- subModelBase(owner)
+ filmSubModelBase(owner)
{}
filmTurbulenceModel::filmTurbulenceModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
- subModelBase(type, owner, dict)
+ filmSubModelBase(owner, dict, typeName, modelType)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
index 571bf83e8d1..31928cd85f9 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
@@ -36,7 +36,7 @@ SourceFiles
#ifndef filmTurbulenceModel_H
#define filmTurbulenceModel_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
#include "fvMatricesFwd.H"
#include "volFieldsFwd.H"
@@ -56,7 +56,7 @@ namespace surfaceFilmModels
class filmTurbulenceModel
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -83,7 +83,7 @@ public:
filmTurbulenceModel,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
),
(owner, dict)
@@ -92,13 +92,13 @@ public:
// Constructors
//- Construct null
- filmTurbulenceModel(const surfaceFilmModel& owner);
+ filmTurbulenceModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
filmTurbulenceModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
);
@@ -108,7 +108,7 @@ public:
//- Return a reference to the selected injection model
static autoPtr<filmTurbulenceModel> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
index 171fd1b85d4..e5153a12be6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmTurbulenceModel> filmTurbulenceModel::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict
)
{
@@ -55,7 +55,7 @@ autoPtr<filmTurbulenceModel> filmTurbulenceModel::New
(
"filmTurbulenceModel::New"
"("
- "const surfaceFilmModel&, "
+ "surfaceFilmModel&, "
"const dictionary&"
")"
) << "Unknown filmTurbulenceModel type " << modelType
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index 99fd8302ec1..a64205df816 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -51,12 +51,12 @@ addToRunTimeSelectionTable(filmTurbulenceModel, laminar, dictionary);
laminar::laminar
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
filmTurbulenceModel(type(), owner, dict),
- Cf_(readScalar(coeffs_.lookup("Cf")))
+ Cf_(readScalar(coeffDict_.lookup("Cf")))
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H
index 397030efffc..ceaecabb25c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H
@@ -80,7 +80,7 @@ public:
// Constructors
//- Construct from surface film model
- laminar(const surfaceFilmModel& owner, const dictionary& dict);
+ laminar(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
index 271af50e7bf..2044f1fb7cb 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
@@ -48,12 +48,12 @@ addToRunTimeSelectionTable(force, contactAngleForce, dictionary);
void contactAngleForce::initialise()
{
- const wordReList zeroForcePatches(coeffs_.lookup("zeroForcePatches"));
+ const wordReList zeroForcePatches(coeffDict_.lookup("zeroForcePatches"));
if (zeroForcePatches.size())
{
const polyBoundaryMesh& pbm = owner_.regionMesh().boundaryMesh();
- scalar dLim = readScalar(coeffs_.lookup("zeroForceDistance"));
+ scalar dLim = readScalar(coeffDict_.lookup("zeroForceDistance"));
Info<< " Assigning zero contact force within " << dLim
<< " of patches:" << endl;
@@ -77,18 +77,18 @@ void contactAngleForce::initialise()
contactAngleForce::contactAngleForce
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
force(typeName, owner, dict),
- Ccf_(readScalar(coeffs_.lookup("Ccf"))),
+ Ccf_(readScalar(coeffDict_.lookup("Ccf"))),
rndGen_(label(0), -1),
distribution_
(
distributionModels::distributionModel::New
(
- coeffs_.subDict("contactAngleDistribution"),
+ coeffDict_.subDict("contactAngleDistribution"),
rndGen_
)
),
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
index a299ecd1b2c..577c861bbf3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
@@ -99,7 +99,7 @@ public:
//- Construct from surface film model
contactAngleForce
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C
index ab505f03b04..976a04913a3 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,20 +41,20 @@ defineRunTimeSelectionTable(force, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-force::force(const surfaceFilmModel& owner)
+force::force(surfaceFilmModel& owner)
:
- subModelBase(owner)
+ filmSubModelBase(owner)
{}
force::force
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
- subModelBase(type, owner, dict)
+ filmSubModelBase(owner, dict, typeName, modelType)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H
index 59389c387bf..16297e9a081 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H
@@ -35,7 +35,7 @@ SourceFiles
#ifndef force_H
#define force_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
#include "fvMatrices.H"
@@ -54,7 +54,7 @@ namespace surfaceFilmModels
class force
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -81,7 +81,7 @@ public:
force,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
),
(owner, dict)
@@ -90,13 +90,13 @@ public:
// Constructors
//- Construct null
- force(const surfaceFilmModel& owner);
+ force(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
force
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
);
@@ -106,7 +106,7 @@ public:
//- Return a reference to the selected force model
static autoPtr<force> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
const word& modelType
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
index 46326a8c53a..54504590e20 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<force> force::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict,
const word& modelType
)
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C
index 85477044e89..a6b54fe2353 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-forceList::forceList(const surfaceFilmModel& owner)
+forceList::forceList(surfaceFilmModel& owner)
:
PtrList<force>()
{}
@@ -44,7 +44,7 @@ forceList::forceList(const surfaceFilmModel& owner)
forceList::forceList
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H
index 418e7a2c1aa..e09dc14d710 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -60,12 +60,12 @@ public:
// Constructors
//- Construct null
- forceList(const surfaceFilmModel& owner);
+ forceList(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
forceList
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
index 9fd71a171ed..0d681da0080 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,7 +45,7 @@ addToRunTimeSelectionTable(force, thermocapillaryForce, dictionary);
thermocapillaryForce::thermocapillaryForce
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H
index 169dc76e9fe..85e404f4b2f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -76,7 +76,7 @@ public:
//- Construct from surface film model
thermocapillaryForce
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
index 0d8011404cf..8dcc59d9850 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
@@ -220,13 +220,13 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
curvatureSeparation::curvatureSeparation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
injectionModel(type(), owner, dict),
gradNHat_(fvc::grad(owner.nHat())),
- deltaByR1Min_(coeffs().lookupOrDefault<scalar>("deltaByR1Min", 0.0)),
+ deltaByR1Min_(coeffDict_.lookupOrDefault<scalar>("deltaByR1Min", 0.0)),
definedPatchRadii_(),
magG_(mag(owner.g().value())),
gHat_(vector::zero)
@@ -247,7 +247,7 @@ curvatureSeparation::curvatureSeparation
gHat_ = owner.g().value()/magG_;
- List<Tuple2<word, scalar> > prIn(coeffs().lookup("definedPatchRadii"));
+ List<Tuple2<word, scalar> > prIn(coeffDict_.lookup("definedPatchRadii"));
const wordList& allPatchNames = owner.regionMesh().boundaryMesh().names();
DynamicList<Tuple2<label, scalar> > prData(allPatchNames.size());
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
index f82a0f1bc56..fa1acd3f4f2 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -121,7 +121,7 @@ public:
//- Construct from surface film model
curvatureSeparation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
index 237e1b243ef..d970b1a3474 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
@@ -50,19 +50,19 @@ addToRunTimeSelectionTable(injectionModel, drippingInjection, dictionary);
drippingInjection::drippingInjection
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
injectionModel(type(), owner, dict),
- deltaStable_(readScalar(coeffs_.lookup("deltaStable"))),
- particlesPerParcel_(readScalar(coeffs_.lookup("particlesPerParcel"))),
+ deltaStable_(readScalar(coeffDict_.lookup("deltaStable"))),
+ particlesPerParcel_(readScalar(coeffDict_.lookup("particlesPerParcel"))),
rndGen_(label(0), -1),
parcelDistribution_
(
distributionModels::distributionModel::New
(
- coeffs_.subDict("parcelDistribution"),
+ coeffDict_.subDict("parcelDistribution"),
rndGen_
)
),
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
index 899ba31d634..e2e2d607e75 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -105,7 +105,7 @@ public:
//- Construct from surface film model
drippingInjection
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
index bc63aeaa942..54fe38147e7 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,20 +41,20 @@ defineRunTimeSelectionTable(injectionModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-injectionModel::injectionModel(const surfaceFilmModel& owner)
+injectionModel::injectionModel(surfaceFilmModel& owner)
:
- subModelBase(owner)
+ filmSubModelBase(owner)
{}
injectionModel::injectionModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
- subModelBase(type, owner, dict)
+ filmSubModelBase(owner, dict, typeName, modelType)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
index c6e14df9455..ea47866b0bc 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ SourceFiles
#ifndef injectionModel_H
#define injectionModel_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
#include "scalarField.H"
@@ -55,7 +55,7 @@ namespace surfaceFilmModels
class injectionModel
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -82,7 +82,7 @@ public:
injectionModel,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
),
(owner, dict)
@@ -91,13 +91,13 @@ public:
// Constructors
//- Construct null
- injectionModel(const surfaceFilmModel& owner);
+ injectionModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
injectionModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
);
@@ -107,7 +107,7 @@ public:
//- Return a reference to the selected injection model
static autoPtr<injectionModel> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
const word& mdoelType
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
index 377b1fc386d..98ec969ae86 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<injectionModel> injectionModel::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict,
const word& modelType
)
@@ -52,7 +52,12 @@ autoPtr<injectionModel> injectionModel::New
{
FatalErrorIn
(
- "injectionModel::New(const surfaceFilmModel&, const dictionary&)"
+ "injectionModel::New"
+ "("
+ "surfaceFilmModel&, "
+ "const dictionary&, "
+ "const word&"
+ ")"
) << "Unknown injectionModel type " << modelType
<< nl << nl << "Valid injectionModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc()
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
index f456477ad57..cd72677ae6b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-injectionModelList::injectionModelList(const surfaceFilmModel& owner)
+injectionModelList::injectionModelList(surfaceFilmModel& owner)
:
PtrList<injectionModel>(),
owner_(owner),
@@ -47,7 +47,7 @@ injectionModelList::injectionModelList(const surfaceFilmModel& owner)
injectionModelList::injectionModelList
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
index 8956ecc5d0c..be62ba45b8b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -60,7 +60,7 @@ private:
// Private data
//- Reference to the owner surface film model
- const surfaceFilmModel& owner_;
+ surfaceFilmModel& owner_;
//- Dictionary
dictionary dict_;
@@ -83,12 +83,12 @@ public:
// Constructors
//- Construct null
- injectionModelList(const surfaceFilmModel& owner);
+ injectionModelList(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
injectionModelList
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C
index 8cd45f60af2..500962636aa 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C
@@ -44,16 +44,16 @@ addToRunTimeSelectionTable(injectionModel, removeInjection, dictionary);
removeInjection::removeInjection
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
injectionModel(type(), owner, dict),
- deltaStable_(coeffs_.lookupOrDefault<scalar>("deltaStable", 0.0)),
+ deltaStable_(coeffDict_.lookupOrDefault<scalar>("deltaStable", 0.0)),
mask_(owner.regionMesh().nCells(), -1)
{
wordReList patches;
- if (coeffs_.readIfPresent("patches", patches))
+ if (coeffDict_.readIfPresent("patches", patches))
{
Info<< " applying to patches:" << nl;
const polyBoundaryMesh& pbm = owner.regionMesh().boundaryMesh();
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H
index fd8c6353446..d9927e35cf8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H
@@ -84,7 +84,7 @@ public:
// Constructors
//- Construct from surface film model
- removeInjection(const surfaceFilmModel& owner, const dictionary& dict);
+ removeInjection(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
index d10288ea0a2..5d82ba0853b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
@@ -52,7 +52,7 @@ addToRunTimeSelectionTable
constantRadiation::constantRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
@@ -82,9 +82,9 @@ constantRadiation::constantRadiation
owner.regionMesh(),
dimensionedScalar("one", dimless, 1.0)
),
- absorptivity_(readScalar(coeffs_.lookup("absorptivity"))),
- timeStart_(readScalar(coeffs_.lookup("timeStart"))),
- duration_(readScalar(coeffs_.lookup("duration")))
+ absorptivity_(readScalar(coeffDict_.lookup("absorptivity"))),
+ timeStart_(readScalar(coeffDict_.lookup("timeStart"))),
+ duration_(readScalar(coeffDict_.lookup("duration")))
{
mask_ = pos(mask_);
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
index 911d53e461a..b1e3b536ebf 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -98,7 +98,7 @@ public:
//- Construct from surface film model and dictionary
constantRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
index 50ef573262b..34c8ffff1d0 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,23 +41,20 @@ defineRunTimeSelectionTable(filmRadiationModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-filmRadiationModel::filmRadiationModel
-(
- const surfaceFilmModel& owner
-)
+filmRadiationModel::filmRadiationModel(surfaceFilmModel& owner)
:
- subModelBase(owner)
+ filmSubModelBase(owner)
{}
filmRadiationModel::filmRadiationModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
- subModelBase(type, owner, dict)
+ filmSubModelBase(owner, dict, typeName, modelType)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
index 0c8c429002f..b53dc659214 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ SourceFiles
#ifndef filmRadiationModel_H
#define filmRadiationModel_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +54,7 @@ namespace surfaceFilmModels
class filmRadiationModel
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -81,7 +81,7 @@ public:
filmRadiationModel,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
),
(owner, dict)
@@ -90,13 +90,13 @@ public:
// Constructors
//- Construct null
- filmRadiationModel(const surfaceFilmModel& owner);
+ filmRadiationModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
filmRadiationModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
);
@@ -106,7 +106,7 @@ public:
//- Return a reference to the selected phase change model
static autoPtr<filmRadiationModel> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
index f50dcfeb776..1f5644fe24f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmRadiationModel> filmRadiationModel::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict
)
{
@@ -55,7 +55,7 @@ autoPtr<filmRadiationModel> filmRadiationModel::New
(
"filmRadiationModel::New"
"("
- "const surfaceFilmModel&, "
+ "surfaceFilmModel&, "
"const dictionary&"
")"
) << "Unknown radiationModel type " << modelType << nl << nl
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
index 258323b7da5..ce200ee3c5e 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
@@ -52,7 +52,7 @@ addToRunTimeSelectionTable
noRadiation::noRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
index 5d05cfe4332..5e6b373f0f6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -77,7 +77,7 @@ public:
//- Construct from surface film model and dictionary
noRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
index aacef9ce1f1..21b982073c1 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
@@ -52,7 +52,7 @@ addToRunTimeSelectionTable
primaryRadiation::primaryRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
index a8904cb1e21..b6568c5c218 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -84,7 +84,7 @@ public:
//- Construct from surface film model and dictionary
primaryRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index 02b5f62f09b..14c2a3bfd8d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -52,7 +52,7 @@ addToRunTimeSelectionTable
standardRadiation::standardRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
@@ -85,8 +85,8 @@ standardRadiation::standardRadiation
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
zeroGradientFvPatchScalarField::typeName
),
- beta_(readScalar(coeffs_.lookup("beta"))),
- kappaBar_(readScalar(coeffs_.lookup("kappaBar")))
+ beta_(readScalar(coeffDict_.lookup("beta"))),
+ kappaBar_(readScalar(coeffDict_.lookup("kappaBar")))
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
index 799bb6c6493..b5b60facc93 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -95,7 +95,7 @@ public:
//- Construct from surface film model and dictionary
standardRadiation
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C
index 0f98226aae6..27fa2f74269 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C
@@ -50,13 +50,13 @@ addToRunTimeSelectionTable
constantViscosity::constantViscosity
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
)
:
filmViscosityModel(typeName, owner, dict, mu),
- mu0_(readScalar(coeffs().lookup("mu0")))
+ mu0_(readScalar(coeffDict_.lookup("mu0")))
{
mu_.internalField() = mu0_;
mu_.correctBoundaryConditions();
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H
index d15ff13ca5c..87432ca2a0b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H
@@ -85,7 +85,7 @@ public:
//- Construct from surface film model
constantViscosity
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
index 69f75267af2..d2f861ab96c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
@@ -43,13 +43,13 @@ defineRunTimeSelectionTable(filmViscosityModel, dictionary);
filmViscosityModel::filmViscosityModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
)
:
- subModelBase(type, owner, dict),
+ filmSubModelBase(owner, dict, typeName, modelType),
mu_(mu)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
index 26489bfa09f..38a7272e074 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
@@ -36,7 +36,7 @@ SourceFiles
#ifndef filmViscosityModel_H
#define filmViscosityModel_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
#include "scalarField.H"
@@ -55,7 +55,7 @@ namespace surfaceFilmModels
class filmViscosityModel
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -90,7 +90,7 @@ public:
filmViscosityModel,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
),
@@ -102,8 +102,8 @@ public:
//- Construct from type name, dictionary and surface film model
filmViscosityModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
);
@@ -114,7 +114,7 @@ public:
//- Return a reference to the selected phase change model
static autoPtr<filmViscosityModel> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
index a78bd24e5ca..6998028f412 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmViscosityModel> filmViscosityModel::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict,
volScalarField& mu
)
@@ -56,7 +56,7 @@ autoPtr<filmViscosityModel> filmViscosityModel::New
(
"filmViscosityModel::New"
"("
- "const surfaceFilmModel&, "
+ "surfaceFilmModel&, "
"const dictionary&, "
"volScalarField&"
")"
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C
index fb58a84e99d..2aaad94c488 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C
@@ -51,7 +51,7 @@ addToRunTimeSelectionTable
liquidViscosity::liquidViscosity
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
)
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H
index 11c980e9367..8004c541fb5 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H
@@ -82,7 +82,7 @@ public:
//- Construct from surface film model
liquidViscosity
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
index a23933030b1..a381c528b66 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
@@ -85,18 +85,18 @@ void thixotropicViscosity::updateMu()
thixotropicViscosity::thixotropicViscosity
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
)
:
filmViscosityModel(typeName, owner, dict, mu),
- a_(coeffs().lookup("a")),
- b_(coeffs().lookup("b")),
- c_(coeffs().lookup("c")),
- d_(coeffs().lookup("d")),
- mu0_(coeffs().lookup("mu0")),
- muInf_(coeffs().lookup("muInf")),
+ a_(coeffDict_.lookup("a")),
+ b_(coeffDict_.lookup("b")),
+ c_(coeffDict_.lookup("c")),
+ d_(coeffDict_.lookup("d")),
+ mu0_(coeffDict_.lookup("mu0")),
+ muInf_(coeffDict_.lookup("muInf")),
K_(1.0 - Foam::sqrt(muInf_/mu0_)),
lambda_
(
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H
index 609b7940e6c..2c60dc42393 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H
@@ -169,7 +169,7 @@ public:
//- Construct from surface film model
thixotropicViscosity
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict,
volScalarField& mu
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
index a8f90b90d44..924aee7087f 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,12 +52,12 @@ addToRunTimeSelectionTable
constantHeatTransfer::constantHeatTransfer
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
heatTransferModel(typeName, owner, dict),
- c0_(readScalar(coeffs_.lookup("c0")))
+ c0_(readScalar(coeffDict_.lookup("c0")))
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
index ef6cc49b617..f8b1c60a263 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ public:
//- Construct from surface film model and dictionary
constantHeatTransfer
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
index cdb42ce1918..6ec53f76cde 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -43,21 +43,21 @@ defineRunTimeSelectionTable(heatTransferModel, dictionary);
heatTransferModel::heatTransferModel
(
- const surfaceFilmModel& owner
+ surfaceFilmModel& owner
)
:
- subModelBase(owner)
+ filmSubModelBase(owner)
{}
heatTransferModel::heatTransferModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
- subModelBase(type, owner, dict)
+ filmSubModelBase(owner, dict, typeName, modelType)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
index ac9249263c1..646c2d734fd 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ SourceFiles
#ifndef heatTransferModel_H
#define heatTransferModel_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,7 +54,7 @@ namespace surfaceFilmModels
class heatTransferModel
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -81,7 +81,7 @@ public:
heatTransferModel,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
),
(owner, dict)
@@ -90,13 +90,13 @@ public:
// Constructors
//- Construct null
- heatTransferModel(const surfaceFilmModel& owner);
+ heatTransferModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
heatTransferModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
);
@@ -106,7 +106,7 @@ public:
//- Return a reference to the selected phase change model
static autoPtr<heatTransferModel> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
index be7b4daa972..33d01843f53 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<heatTransferModel> heatTransferModel::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict
)
{
@@ -53,7 +53,7 @@ autoPtr<heatTransferModel> heatTransferModel::New
{
FatalErrorIn
(
- "heatTransferModel::New(const surfaceFilmModel&, const dictionary&)"
+ "heatTransferModel::New(surfaceFilmModel&, const dictionary&)"
) << "Unknown heatTransferModel type " << modelType << nl << nl
<< "Valid heatTransferModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc()
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
index 83ba62a06c4..3a9da6d01cf 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -52,7 +52,7 @@ addToRunTimeSelectionTable
mappedConvectiveHeatTransfer::mappedConvectiveHeatTransfer
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
index f94ea58c213..6de4b004efe 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -89,7 +89,7 @@ public:
//- Construct from surface film model and dictionary
mappedConvectiveHeatTransfer
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
index 9b596cf6510..bf585579f6b 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ addToRunTimeSelectionTable(phaseChangeModel, noPhaseChange, dictionary);
noPhaseChange::noPhaseChange
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary&
)
:
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
index 2d5af305052..8403ca9d7ff 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -74,7 +74,7 @@ public:
// Constructors
//- Construct from surface film model
- noPhaseChange(const surfaceFilmModel& owner, const dictionary& dict);
+ noPhaseChange(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
index 21930171a62..da6c0236345 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -43,10 +43,10 @@ defineRunTimeSelectionTable(phaseChangeModel, dictionary);
phaseChangeModel::phaseChangeModel
(
- const surfaceFilmModel& owner
+ surfaceFilmModel& owner
)
:
- subModelBase(owner),
+ filmSubModelBase(owner),
latestMassPC_(0.0),
totalMassPC_(0.0)
{}
@@ -54,12 +54,12 @@ phaseChangeModel::phaseChangeModel
phaseChangeModel::phaseChangeModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
- subModelBase(type, owner, dict),
+ filmSubModelBase(owner, dict, typeName, modelType),
latestMassPC_(0.0),
totalMassPC_(0.0)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
index 8be95fa56d1..5ab77edcf53 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ SourceFiles
#ifndef phaseChangeModel_H
#define phaseChangeModel_H
-#include "subModelBase.H"
+#include "filmSubModelBase.H"
#include "runTimeSelectionTables.H"
#include "scalarField.H"
@@ -55,7 +55,7 @@ namespace surfaceFilmModels
class phaseChangeModel
:
- public subModelBase
+ public filmSubModelBase
{
private:
@@ -93,7 +93,7 @@ public:
phaseChangeModel,
dictionary,
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
),
(owner, dict)
@@ -102,13 +102,13 @@ public:
// Constructors
//- Construct null
- phaseChangeModel(const surfaceFilmModel& owner);
+ phaseChangeModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model
phaseChangeModel
(
- const word& type,
- const surfaceFilmModel& owner,
+ const word& modelType,
+ surfaceFilmModel& owner,
const dictionary& dict
);
@@ -118,7 +118,7 @@ public:
//- Return a reference to the selected phase change model
static autoPtr<phaseChangeModel> New
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
index 7e089711935..03a35f88114 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<phaseChangeModel> phaseChangeModel::New
(
- const surfaceFilmModel& model,
+ surfaceFilmModel& model,
const dictionary& dict
)
{
@@ -53,7 +53,7 @@ autoPtr<phaseChangeModel> phaseChangeModel::New
{
FatalErrorIn
(
- "phaseChangeModel::New(const surfaceFilmModel&, const dictionary&)"
+ "phaseChangeModel::New(surfaceFilmModel&, const dictionary&)"
) << "Unknown phaseChangeModel type " << modelType
<< nl << nl << "Valid phaseChangeModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc()
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
index 31eac285225..f7cfae75625 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
@@ -51,14 +51,14 @@ addToRunTimeSelectionTable
solidification::solidification
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
phaseChangeModel(typeName, owner, dict),
- T0_(readScalar(coeffs_.lookup("T0"))),
- L_(readScalar(coeffs_.lookup("L"))),
- alpha_(readScalar(coeffs_.lookup("alpha"))),
+ T0_(readScalar(coeffDict_.lookup("T0"))),
+ L_(readScalar(coeffDict_.lookup("L"))),
+ alpha_(readScalar(coeffDict_.lookup("alpha"))),
mass_
(
IOobject
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
index 334e2ca0ae1..87f0c1206e9 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
@@ -95,7 +95,7 @@ public:
// Constructors
//- Construct from surface film model
- solidification(const surfaceFilmModel& owner, const dictionary& dict);
+ solidification(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index 5f1d521c9ff..6443c3ad808 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -70,14 +70,14 @@ scalar standardPhaseChange::Sh
standardPhaseChange::standardPhaseChange
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
)
:
phaseChangeModel(typeName, owner, dict),
- deltaMin_(readScalar(coeffs_.lookup("deltaMin"))),
- L_(readScalar(coeffs_.lookup("L"))),
- TbFactor_(coeffs_.lookupOrDefault<scalar>("TbFactor", 1.1))
+ deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))),
+ L_(readScalar(coeffDict_.lookup("L"))),
+ TbFactor_(coeffDict_.lookupOrDefault<scalar>("TbFactor", 1.1))
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
index ee1b21d6d0a..82a8120bdef 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -97,7 +97,7 @@ public:
//- Construct from surface film model
standardPhaseChange
(
- const surfaceFilmModel& owner,
+ surfaceFilmModel& owner,
const dictionary& dict
);
--
GitLab