zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Updated film sub-models to use new base class

Browse Source
This commit is contained in:
andy
2013-12-09 09:44:12 +00:00
parent 0901b9f36f
commit a5f6e005e8
68 changed files with 242 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
View File

@ -49,7 +49,7 @@ addToRunTimeSelectionTable
void constantFilmThermo::init(thermoData& td) void constantFilmThermo::init(thermoData& td)
{ {
if (coeffs_.readIfPresent(td.name_, td.value_)) if (coeffDict_.readIfPresent(td.name_, td.value_))
{ {
td.set_ = true; td.set_ = true;
} }
@ -60,12 +60,12 @@ void constantFilmThermo::init(thermoData& td)
constantFilmThermo::constantFilmThermo constantFilmThermo::constantFilmThermo
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
filmThermoModel(typeName, owner, dict), filmThermoModel(typeName, owner, dict),
name_(coeffs_.lookup("specieName")), name_(coeffDict_.lookup("specieName")),
rho0_("rho0"), rho0_("rho0"),
mu0_("mu0"), mu0_("mu0"),
sigma0_("sigma0"), sigma0_("sigma0"),
@ -110,7 +110,7 @@ scalar constantFilmThermo::rho
{ {
if (!rho0_.set_) if (!rho0_.set_)
{ {
coeffs_.lookup(rho0_.name_) >> rho0_.value_; coeffDict_.lookup(rho0_.name_) >> rho0_.value_;
rho0_.set_ = true; rho0_.set_ = true;
} }
@ -126,7 +126,7 @@ scalar constantFilmThermo::mu
{ {
if (!mu0_.set_) if (!mu0_.set_)
{ {
coeffs_.lookup(mu0_.name_) >> mu0_.value_; coeffDict_.lookup(mu0_.name_) >> mu0_.value_;
mu0_.set_ = true; mu0_.set_ = true;
} }
@ -142,7 +142,7 @@ scalar constantFilmThermo::sigma
{ {
if (!sigma0_.set_) if (!sigma0_.set_)
{ {
coeffs_.lookup(sigma0_.name_) >> sigma0_.value_; coeffDict_.lookup(sigma0_.name_) >> sigma0_.value_;
sigma0_.set_ = true; sigma0_.set_ = true;
} }
@ -158,7 +158,7 @@ scalar constantFilmThermo::Cp
{ {
if (!Cp0_.set_) if (!Cp0_.set_)
{ {
coeffs_.lookup(Cp0_.name_) >> Cp0_.value_; coeffDict_.lookup(Cp0_.name_) >> Cp0_.value_;
Cp0_.set_ = true; Cp0_.set_ = true;
} }
@ -174,7 +174,7 @@ scalar constantFilmThermo::kappa
{ {
if (!kappa0_.set_) if (!kappa0_.set_)
{ {
coeffs_.lookup(kappa0_.name_) >> kappa0_.value_; coeffDict_.lookup(kappa0_.name_) >> kappa0_.value_;
kappa0_.set_ = true; kappa0_.set_ = true;
} }
@ -190,7 +190,7 @@ scalar constantFilmThermo::D
{ {
if (!D0_.set_) if (!D0_.set_)
{ {
coeffs_.lookup(D0_.name_) >> D0_.value_; coeffDict_.lookup(D0_.name_) >> D0_.value_;
D0_.set_ = true; D0_.set_ = true;
} }
@ -206,7 +206,7 @@ scalar constantFilmThermo::hl
{ {
if (!hl0_.set_) if (!hl0_.set_)
{ {
coeffs_.lookup(hl0_.name_) >> hl0_.value_; coeffDict_.lookup(hl0_.name_) >> hl0_.value_;
hl0_.set_ = true; hl0_.set_ = true;
} }
@ -222,7 +222,7 @@ scalar constantFilmThermo::pv
{ {
if (!pv0_.set_) if (!pv0_.set_)
{ {
coeffs_.lookup(pv0_.name_) >> pv0_.value_; coeffDict_.lookup(pv0_.name_) >> pv0_.value_;
pv0_.set_ = true; pv0_.set_ = true;
} }
@ -234,7 +234,7 @@ scalar constantFilmThermo::W() const
{ {
if (!W0_.set_) if (!W0_.set_)
{ {
coeffs_.lookup(W0_.name_) >> W0_.value_; coeffDict_.lookup(W0_.name_) >> W0_.value_;
W0_.set_ = true; W0_.set_ = true;
} }
@ -246,7 +246,7 @@ scalar constantFilmThermo::Tb(const scalar p) const
{ {
if (!Tb0_.set_) if (!Tb0_.set_)
{ {
coeffs_.lookup(Tb0_.name_) >> Tb0_.value_; coeffDict_.lookup(Tb0_.name_) >> Tb0_.value_;
Tb0_.set_ = true; Tb0_.set_ = true;
} }

2
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
View File

@ -144,7 +144,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
constantFilmThermo constantFilmThermo
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

10
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C
View File

@ -43,21 +43,21 @@ defineRunTimeSelectionTable(filmThermoModel, dictionary);
filmThermoModel::filmThermoModel filmThermoModel::filmThermoModel
( (
const surfaceFilmModel& owner surfaceFilmModel& owner
) )
: :
subModelBase(owner) filmSubModelBase(owner)
{} {}
filmThermoModel::filmThermoModel filmThermoModel::filmThermoModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
subModelBase(type, owner, dict) filmSubModelBase(owner, dict, typeName, modelType)
{} {}

14
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef filmThermoModel_H #ifndef filmThermoModel_H
#define filmThermoModel_H #define filmThermoModel_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace surfaceFilmModels
class filmThermoModel class filmThermoModel
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -81,7 +81,7 @@ public:
filmThermoModel, filmThermoModel,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (owner, dict)
@ -90,13 +90,13 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
filmThermoModel(const surfaceFilmModel& owner); filmThermoModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
filmThermoModel filmThermoModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );
@ -106,7 +106,7 @@ public:
//- Return a reference to the selected phase change model //- Return a reference to the selected phase change model
static autoPtr<filmThermoModel> New static autoPtr<filmThermoModel> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

4
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModelNew.C
View File

@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmThermoModel> filmThermoModel::New autoPtr<filmThermoModel> filmThermoModel::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict const dictionary& dict
) )
{ {
@ -53,7 +53,7 @@ autoPtr<filmThermoModel> filmThermoModel::New
{ {
FatalErrorIn FatalErrorIn
( (
"filmThermoModel::New(const surfaceFilmModel&, const dictionary&)" "filmThermoModel::New(surfaceFilmModel&, const dictionary&)"
) << "Unknown filmThermoModel type " << modelType << nl << nl ) << "Unknown filmThermoModel type " << modelType << nl << nl
<< "Valid filmThermoModel types are:" << nl << "Valid filmThermoModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc() << dictionaryConstructorTablePtr_->toc()

10
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
View File

@ -104,7 +104,7 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
liquidFilmThermo::liquidFilmThermo liquidFilmThermo::liquidFilmThermo
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
@ -112,16 +112,16 @@ liquidFilmThermo::liquidFilmThermo
name_("unknown_liquid"), name_("unknown_liquid"),
liquidPtr_(NULL), liquidPtr_(NULL),
ownLiquid_(false), ownLiquid_(false),
useReferenceValues_(readBool(coeffs_.lookup("useReferenceValues"))), useReferenceValues_(readBool(coeffDict_.lookup("useReferenceValues"))),
pRef_(0.0), pRef_(0.0),
TRef_(0.0) TRef_(0.0)
{ {
initLiquid(coeffs_); initLiquid(coeffDict_);
if (useReferenceValues_) if (useReferenceValues_)
{ {
coeffs_.lookup("pRef") >> pRef_; coeffDict_.lookup("pRef") >> pRef_;
coeffs_.lookup("TRef") >> TRef_; coeffDict_.lookup("TRef") >> TRef_;
} }
} }

2
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H
View File

@ -107,7 +107,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
liquidFilmThermo liquidFilmThermo
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

10
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C
View File

@ -41,20 +41,20 @@ defineRunTimeSelectionTable(filmTurbulenceModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
filmTurbulenceModel::filmTurbulenceModel(const surfaceFilmModel& owner) filmTurbulenceModel::filmTurbulenceModel(surfaceFilmModel& owner)
: :
subModelBase(owner) filmSubModelBase(owner)
{} {}
filmTurbulenceModel::filmTurbulenceModel filmTurbulenceModel::filmTurbulenceModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
subModelBase(type, owner, dict) filmSubModelBase(owner, dict, typeName, modelType)
{} {}

14
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef filmTurbulenceModel_H #ifndef filmTurbulenceModel_H
#define filmTurbulenceModel_H #define filmTurbulenceModel_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "fvMatricesFwd.H" #include "fvMatricesFwd.H"
#include "volFieldsFwd.H" #include "volFieldsFwd.H"
@ -56,7 +56,7 @@ namespace surfaceFilmModels
class filmTurbulenceModel class filmTurbulenceModel
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -83,7 +83,7 @@ public:
filmTurbulenceModel, filmTurbulenceModel,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (owner, dict)
@ -92,13 +92,13 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
filmTurbulenceModel(const surfaceFilmModel& owner); filmTurbulenceModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
filmTurbulenceModel filmTurbulenceModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );
@ -108,7 +108,7 @@ public:
//- Return a reference to the selected injection model //- Return a reference to the selected injection model
static autoPtr<filmTurbulenceModel> New static autoPtr<filmTurbulenceModel> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

4
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C
View File

@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmTurbulenceModel> filmTurbulenceModel::New autoPtr<filmTurbulenceModel> filmTurbulenceModel::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict const dictionary& dict
) )
{ {
@ -55,7 +55,7 @@ autoPtr<filmTurbulenceModel> filmTurbulenceModel::New
( (
"filmTurbulenceModel::New" "filmTurbulenceModel::New"
"(" "("
"const surfaceFilmModel&, " "surfaceFilmModel&, "
"const dictionary&" "const dictionary&"
")" ")"
) << "Unknown filmTurbulenceModel type " << modelType ) << "Unknown filmTurbulenceModel type " << modelType

4
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
View File

@ -51,12 +51,12 @@ addToRunTimeSelectionTable(filmTurbulenceModel, laminar, dictionary);
laminar::laminar laminar::laminar
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
filmTurbulenceModel(type(), owner, dict), filmTurbulenceModel(type(), owner, dict),
Cf_(readScalar(coeffs_.lookup("Cf"))) Cf_(readScalar(coeffDict_.lookup("Cf")))
{} {}

2
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H
View File

@ -80,7 +80,7 @@ public:
// Constructors // Constructors
//- Construct from surface film model //- Construct from surface film model
laminar(const surfaceFilmModel& owner, const dictionary& dict); laminar(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor //- Destructor

10
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C
View File

@ -48,12 +48,12 @@ addToRunTimeSelectionTable(force, contactAngleForce, dictionary);
void contactAngleForce::initialise() void contactAngleForce::initialise()
{ {
const wordReList zeroForcePatches(coeffs_.lookup("zeroForcePatches")); const wordReList zeroForcePatches(coeffDict_.lookup("zeroForcePatches"));
if (zeroForcePatches.size()) if (zeroForcePatches.size())
{ {
const polyBoundaryMesh& pbm = owner_.regionMesh().boundaryMesh(); 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 Info<< " Assigning zero contact force within " << dLim
<< " of patches:" << endl; << " of patches:" << endl;
@ -77,18 +77,18 @@ void contactAngleForce::initialise()
contactAngleForce::contactAngleForce contactAngleForce::contactAngleForce
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
force(typeName, owner, dict), force(typeName, owner, dict),
Ccf_(readScalar(coeffs_.lookup("Ccf"))), Ccf_(readScalar(coeffDict_.lookup("Ccf"))),
rndGen_(label(0), -1), rndGen_(label(0), -1),
distribution_ distribution_
( (
distributionModels::distributionModel::New distributionModels::distributionModel::New
( (
coeffs_.subDict("contactAngleDistribution"), coeffDict_.subDict("contactAngleDistribution"),
rndGen_ rndGen_
) )
), ),

2
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.H
View File

@ -99,7 +99,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
contactAngleForce contactAngleForce
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

12
src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,20 +41,20 @@ defineRunTimeSelectionTable(force, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
force::force(const surfaceFilmModel& owner) force::force(surfaceFilmModel& owner)
: :
subModelBase(owner) filmSubModelBase(owner)
{} {}
force::force force::force
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
subModelBase(type, owner, dict) filmSubModelBase(owner, dict, typeName, modelType)
{} {}

14
src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H
View File

@ -35,7 +35,7 @@ SourceFiles
#ifndef force_H #ifndef force_H
#define force_H #define force_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "fvMatrices.H" #include "fvMatrices.H"
@ -54,7 +54,7 @@ namespace surfaceFilmModels
class force class force
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -81,7 +81,7 @@ public:
force, force,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (owner, dict)
@ -90,13 +90,13 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
force(const surfaceFilmModel& owner); force(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
force force
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );
@ -106,7 +106,7 @@ public:
//- Return a reference to the selected force model //- Return a reference to the selected force model
static autoPtr<force> New static autoPtr<force> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
const word& modelType const word& modelType
); );

4
src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<force> force::New autoPtr<force> force::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict, const dictionary& dict,
const word& modelType const word& modelType
) )

6
src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
forceList::forceList(const surfaceFilmModel& owner) forceList::forceList(surfaceFilmModel& owner)
: :
PtrList<force>() PtrList<force>()
{} {}
@ -44,7 +44,7 @@ forceList::forceList(const surfaceFilmModel& owner)
forceList::forceList forceList::forceList
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :

6
src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,12 +60,12 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
forceList(const surfaceFilmModel& owner); forceList(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
forceList forceList
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

4
src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -45,7 +45,7 @@ addToRunTimeSelectionTable(force, thermocapillaryForce, dictionary);
thermocapillaryForce::thermocapillaryForce thermocapillaryForce::thermocapillaryForce
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :

4
src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -76,7 +76,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
thermocapillaryForce thermocapillaryForce
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

6
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
View File

@ -220,13 +220,13 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
curvatureSeparation::curvatureSeparation curvatureSeparation::curvatureSeparation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
injectionModel(type(), owner, dict), injectionModel(type(), owner, dict),
gradNHat_(fvc::grad(owner.nHat())), gradNHat_(fvc::grad(owner.nHat())),
deltaByR1Min_(coeffs().lookupOrDefault<scalar>("deltaByR1Min", 0.0)), deltaByR1Min_(coeffDict_.lookupOrDefault<scalar>("deltaByR1Min", 0.0)),
definedPatchRadii_(), definedPatchRadii_(),
magG_(mag(owner.g().value())), magG_(mag(owner.g().value())),
gHat_(vector::zero) gHat_(vector::zero)
@ -247,7 +247,7 @@ curvatureSeparation::curvatureSeparation
gHat_ = owner.g().value()/magG_; 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(); const wordList& allPatchNames = owner.regionMesh().boundaryMesh().names();
DynamicList<Tuple2<label, scalar> > prData(allPatchNames.size()); DynamicList<Tuple2<label, scalar> > prData(allPatchNames.size());

4
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -121,7 +121,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
curvatureSeparation curvatureSeparation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

8
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
View File

@ -50,19 +50,19 @@ addToRunTimeSelectionTable(injectionModel, drippingInjection, dictionary);
drippingInjection::drippingInjection drippingInjection::drippingInjection
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
injectionModel(type(), owner, dict), injectionModel(type(), owner, dict),
deltaStable_(readScalar(coeffs_.lookup("deltaStable"))), deltaStable_(readScalar(coeffDict_.lookup("deltaStable"))),
particlesPerParcel_(readScalar(coeffs_.lookup("particlesPerParcel"))), particlesPerParcel_(readScalar(coeffDict_.lookup("particlesPerParcel"))),
rndGen_(label(0), -1), rndGen_(label(0), -1),
parcelDistribution_ parcelDistribution_
( (
distributionModels::distributionModel::New distributionModels::distributionModel::New
( (
coeffs_.subDict("parcelDistribution"), coeffDict_.subDict("parcelDistribution"),
rndGen_ rndGen_
) )
), ),

4
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -105,7 +105,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
drippingInjection drippingInjection
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

12
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,20 +41,20 @@ defineRunTimeSelectionTable(injectionModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
injectionModel::injectionModel(const surfaceFilmModel& owner) injectionModel::injectionModel(surfaceFilmModel& owner)
: :
subModelBase(owner) filmSubModelBase(owner)
{} {}
injectionModel::injectionModel injectionModel::injectionModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
subModelBase(type, owner, dict) filmSubModelBase(owner, dict, typeName, modelType)
{} {}

16
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ SourceFiles
#ifndef injectionModel_H #ifndef injectionModel_H
#define injectionModel_H #define injectionModel_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "scalarField.H" #include "scalarField.H"
@ -55,7 +55,7 @@ namespace surfaceFilmModels
class injectionModel class injectionModel
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -82,7 +82,7 @@ public:
injectionModel, injectionModel,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (owner, dict)
@ -91,13 +91,13 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
injectionModel(const surfaceFilmModel& owner); injectionModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
injectionModel injectionModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );
@ -107,7 +107,7 @@ public:
//- Return a reference to the selected injection model //- Return a reference to the selected injection model
static autoPtr<injectionModel> New static autoPtr<injectionModel> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
const word& mdoelType const word& mdoelType
); );

11
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModelNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<injectionModel> injectionModel::New autoPtr<injectionModel> injectionModel::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict, const dictionary& dict,
const word& modelType const word& modelType
) )
@ -52,7 +52,12 @@ autoPtr<injectionModel> injectionModel::New
{ {
FatalErrorIn FatalErrorIn
( (
"injectionModel::New(const surfaceFilmModel&, const dictionary&)" "injectionModel::New"
"("
"surfaceFilmModel&, "
"const dictionary&, "
"const word&"
")"
) << "Unknown injectionModel type " << modelType ) << "Unknown injectionModel type " << modelType
<< nl << nl << "Valid injectionModel types are:" << nl << nl << nl << "Valid injectionModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc() << dictionaryConstructorTablePtr_->toc()

6
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
injectionModelList::injectionModelList(const surfaceFilmModel& owner) injectionModelList::injectionModelList(surfaceFilmModel& owner)
: :
PtrList<injectionModel>(), PtrList<injectionModel>(),
owner_(owner), owner_(owner),
@ -47,7 +47,7 @@ injectionModelList::injectionModelList(const surfaceFilmModel& owner)
injectionModelList::injectionModelList injectionModelList::injectionModelList
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :

8
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,7 +60,7 @@ private:
// Private data // Private data
//- Reference to the owner surface film model //- Reference to the owner surface film model
const surfaceFilmModel& owner_; surfaceFilmModel& owner_;
//- Dictionary //- Dictionary
dictionary dict_; dictionary dict_;
@ -83,12 +83,12 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
injectionModelList(const surfaceFilmModel& owner); injectionModelList(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
injectionModelList injectionModelList
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

6
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.C
View File

@ -44,16 +44,16 @@ addToRunTimeSelectionTable(injectionModel, removeInjection, dictionary);
removeInjection::removeInjection removeInjection::removeInjection
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
injectionModel(type(), owner, dict), injectionModel(type(), owner, dict),
deltaStable_(coeffs_.lookupOrDefault<scalar>("deltaStable", 0.0)), deltaStable_(coeffDict_.lookupOrDefault<scalar>("deltaStable", 0.0)),
mask_(owner.regionMesh().nCells(), -1) mask_(owner.regionMesh().nCells(), -1)
{ {
wordReList patches; wordReList patches;
if (coeffs_.readIfPresent("patches", patches)) if (coeffDict_.readIfPresent("patches", patches))
{ {
Info<< " applying to patches:" << nl; Info<< " applying to patches:" << nl;
const polyBoundaryMesh& pbm = owner.regionMesh().boundaryMesh(); const polyBoundaryMesh& pbm = owner.regionMesh().boundaryMesh();

2
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/removeInjection/removeInjection.H
View File

@ -84,7 +84,7 @@ public:
// Constructors // Constructors
//- Construct from surface film model //- Construct from surface film model
removeInjection(const surfaceFilmModel& owner, const dictionary& dict); removeInjection(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor //- Destructor

8
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
View File

@ -52,7 +52,7 @@ addToRunTimeSelectionTable
constantRadiation::constantRadiation constantRadiation::constantRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
@ -82,9 +82,9 @@ constantRadiation::constantRadiation
owner.regionMesh(), owner.regionMesh(),
dimensionedScalar("one", dimless, 1.0) dimensionedScalar("one", dimless, 1.0)
), ),
absorptivity_(readScalar(coeffs_.lookup("absorptivity"))), absorptivity_(readScalar(coeffDict_.lookup("absorptivity"))),
timeStart_(readScalar(coeffs_.lookup("timeStart"))), timeStart_(readScalar(coeffDict_.lookup("timeStart"))),
duration_(readScalar(coeffs_.lookup("duration"))) duration_(readScalar(coeffDict_.lookup("duration")))
{ {
mask_ = pos(mask_); mask_ = pos(mask_);
} }

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -98,7 +98,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
constantRadiation constantRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

15
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,23 +41,20 @@ defineRunTimeSelectionTable(filmRadiationModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
filmRadiationModel::filmRadiationModel filmRadiationModel::filmRadiationModel(surfaceFilmModel& owner)
(
const surfaceFilmModel& owner
)
: :
subModelBase(owner) filmSubModelBase(owner)
{} {}
filmRadiationModel::filmRadiationModel filmRadiationModel::filmRadiationModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
subModelBase(type, owner, dict) filmSubModelBase(owner, dict, typeName, modelType)
{} {}

16
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ SourceFiles
#ifndef filmRadiationModel_H #ifndef filmRadiationModel_H
#define filmRadiationModel_H #define filmRadiationModel_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace surfaceFilmModels
class filmRadiationModel class filmRadiationModel
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -81,7 +81,7 @@ public:
filmRadiationModel, filmRadiationModel,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (owner, dict)
@ -90,13 +90,13 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
filmRadiationModel(const surfaceFilmModel& owner); filmRadiationModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
filmRadiationModel filmRadiationModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );
@ -106,7 +106,7 @@ public:
//- Return a reference to the selected phase change model //- Return a reference to the selected phase change model
static autoPtr<filmRadiationModel> New static autoPtr<filmRadiationModel> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmRadiationModel> filmRadiationModel::New autoPtr<filmRadiationModel> filmRadiationModel::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict const dictionary& dict
) )
{ {
@ -55,7 +55,7 @@ autoPtr<filmRadiationModel> filmRadiationModel::New
( (
"filmRadiationModel::New" "filmRadiationModel::New"
"(" "("
"const surfaceFilmModel&, " "surfaceFilmModel&, "
"const dictionary&" "const dictionary&"
")" ")"
) << "Unknown radiationModel type " << modelType << nl << nl ) << "Unknown radiationModel type " << modelType << nl << nl

2
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
View File

@ -52,7 +52,7 @@ addToRunTimeSelectionTable
noRadiation::noRadiation noRadiation::noRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -77,7 +77,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
noRadiation noRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

2
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
View File

@ -52,7 +52,7 @@ addToRunTimeSelectionTable
primaryRadiation::primaryRadiation primaryRadiation::primaryRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -84,7 +84,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
primaryRadiation primaryRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
View File

@ -52,7 +52,7 @@ addToRunTimeSelectionTable
standardRadiation::standardRadiation standardRadiation::standardRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
@ -85,8 +85,8 @@ standardRadiation::standardRadiation
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
), ),
beta_(readScalar(coeffs_.lookup("beta"))), beta_(readScalar(coeffDict_.lookup("beta"))),
kappaBar_(readScalar(coeffs_.lookup("kappaBar"))) kappaBar_(readScalar(coeffDict_.lookup("kappaBar")))
{} {}

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -95,7 +95,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
standardRadiation standardRadiation
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C
View File

@ -50,13 +50,13 @@ addToRunTimeSelectionTable
constantViscosity::constantViscosity constantViscosity::constantViscosity
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
filmViscosityModel(typeName, owner, dict, mu), filmViscosityModel(typeName, owner, dict, mu),
mu0_(readScalar(coeffs().lookup("mu0"))) mu0_(readScalar(coeffDict_.lookup("mu0")))
{ {
mu_.internalField() = mu0_; mu_.internalField() = mu0_;
mu_.correctBoundaryConditions(); mu_.correctBoundaryConditions();

2
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H
View File

@ -85,7 +85,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
constantViscosity constantViscosity
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C
View File

@ -43,13 +43,13 @@ defineRunTimeSelectionTable(filmViscosityModel, dictionary);
filmViscosityModel::filmViscosityModel filmViscosityModel::filmViscosityModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
subModelBase(type, owner, dict), filmSubModelBase(owner, dict, typeName, modelType),
mu_(mu) mu_(mu)
{} {}

12
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H
View File

@ -36,7 +36,7 @@ SourceFiles
#ifndef filmViscosityModel_H #ifndef filmViscosityModel_H
#define filmViscosityModel_H #define filmViscosityModel_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "scalarField.H" #include "scalarField.H"
@ -55,7 +55,7 @@ namespace surfaceFilmModels
class filmViscosityModel class filmViscosityModel
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -90,7 +90,7 @@ public:
filmViscosityModel, filmViscosityModel,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
), ),
@ -102,8 +102,8 @@ public:
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
filmViscosityModel filmViscosityModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );
@ -114,7 +114,7 @@ public:
//- Return a reference to the selected phase change model //- Return a reference to the selected phase change model
static autoPtr<filmViscosityModel> New static autoPtr<filmViscosityModel> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C
View File

@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<filmViscosityModel> filmViscosityModel::New autoPtr<filmViscosityModel> filmViscosityModel::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
@ -56,7 +56,7 @@ autoPtr<filmViscosityModel> filmViscosityModel::New
( (
"filmViscosityModel::New" "filmViscosityModel::New"
"(" "("
"const surfaceFilmModel&, " "surfaceFilmModel&, "
"const dictionary&, " "const dictionary&, "
"volScalarField&" "volScalarField&"
")" ")"

2
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C
View File

@ -51,7 +51,7 @@ addToRunTimeSelectionTable
liquidViscosity::liquidViscosity liquidViscosity::liquidViscosity
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )

2
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H
View File

@ -82,7 +82,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
liquidViscosity liquidViscosity
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

14
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
View File

@ -85,18 +85,18 @@ void thixotropicViscosity::updateMu()
thixotropicViscosity::thixotropicViscosity thixotropicViscosity::thixotropicViscosity
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
filmViscosityModel(typeName, owner, dict, mu), filmViscosityModel(typeName, owner, dict, mu),
a_(coeffs().lookup("a")), a_(coeffDict_.lookup("a")),
b_(coeffs().lookup("b")), b_(coeffDict_.lookup("b")),
c_(coeffs().lookup("c")), c_(coeffDict_.lookup("c")),
d_(coeffs().lookup("d")), d_(coeffDict_.lookup("d")),
mu0_(coeffs().lookup("mu0")), mu0_(coeffDict_.lookup("mu0")),
muInf_(coeffs().lookup("muInf")), muInf_(coeffDict_.lookup("muInf")),
K_(1.0 - Foam::sqrt(muInf_/mu0_)), K_(1.0 - Foam::sqrt(muInf_/mu0_)),
lambda_ lambda_
( (

2
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H
View File

@ -169,7 +169,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
thixotropicViscosity thixotropicViscosity
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -52,12 +52,12 @@ addToRunTimeSelectionTable
constantHeatTransfer::constantHeatTransfer constantHeatTransfer::constantHeatTransfer
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
heatTransferModel(typeName, owner, dict), heatTransferModel(typeName, owner, dict),
c0_(readScalar(coeffs_.lookup("c0"))) c0_(readScalar(coeffDict_.lookup("c0")))
{} {}

4
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,7 +83,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
constantHeatTransfer constantHeatTransfer
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

12
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,21 +43,21 @@ defineRunTimeSelectionTable(heatTransferModel, dictionary);
heatTransferModel::heatTransferModel heatTransferModel::heatTransferModel
( (
const surfaceFilmModel& owner surfaceFilmModel& owner
) )
: :
subModelBase(owner) filmSubModelBase(owner)
{} {}
heatTransferModel::heatTransferModel heatTransferModel::heatTransferModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
subModelBase(type, owner, dict) filmSubModelBase(owner, dict, typeName, modelType)
{} {}

16
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ SourceFiles
#ifndef heatTransferModel_H #ifndef heatTransferModel_H
#define heatTransferModel_H #define heatTransferModel_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace surfaceFilmModels
class heatTransferModel class heatTransferModel
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -81,7 +81,7 @@ public:
heatTransferModel, heatTransferModel,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (owner, dict)
@ -90,13 +90,13 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
heatTransferModel(const surfaceFilmModel& owner); heatTransferModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
heatTransferModel heatTransferModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );
@ -106,7 +106,7 @@ public:
//- Return a reference to the selected phase change model //- Return a reference to the selected phase change model
static autoPtr<heatTransferModel> New static autoPtr<heatTransferModel> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<heatTransferModel> heatTransferModel::New autoPtr<heatTransferModel> heatTransferModel::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict const dictionary& dict
) )
{ {
@ -53,7 +53,7 @@ autoPtr<heatTransferModel> heatTransferModel::New
{ {
FatalErrorIn FatalErrorIn
( (
"heatTransferModel::New(const surfaceFilmModel&, const dictionary&)" "heatTransferModel::New(surfaceFilmModel&, const dictionary&)"
) << "Unknown heatTransferModel type " << modelType << nl << nl ) << "Unknown heatTransferModel type " << modelType << nl << nl
<< "Valid heatTransferModel types are:" << nl << "Valid heatTransferModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc() << dictionaryConstructorTablePtr_->toc()

4
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -52,7 +52,7 @@ addToRunTimeSelectionTable
mappedConvectiveHeatTransfer::mappedConvectiveHeatTransfer mappedConvectiveHeatTransfer::mappedConvectiveHeatTransfer
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :

4
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -89,7 +89,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
mappedConvectiveHeatTransfer mappedConvectiveHeatTransfer
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

4
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,7 +44,7 @@ addToRunTimeSelectionTable(phaseChangeModel, noPhaseChange, dictionary);
noPhaseChange::noPhaseChange noPhaseChange::noPhaseChange
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& const dictionary&
) )
: :

4
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -74,7 +74,7 @@ public:
// Constructors // Constructors
//- Construct from surface film model //- Construct from surface film model
noPhaseChange(const surfaceFilmModel& owner, const dictionary& dict); noPhaseChange(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor //- Destructor

12
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,10 +43,10 @@ defineRunTimeSelectionTable(phaseChangeModel, dictionary);
phaseChangeModel::phaseChangeModel phaseChangeModel::phaseChangeModel
( (
const surfaceFilmModel& owner surfaceFilmModel& owner
) )
: :
subModelBase(owner), filmSubModelBase(owner),
latestMassPC_(0.0), latestMassPC_(0.0),
totalMassPC_(0.0) totalMassPC_(0.0)
{} {}
@ -54,12 +54,12 @@ phaseChangeModel::phaseChangeModel
phaseChangeModel::phaseChangeModel phaseChangeModel::phaseChangeModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
subModelBase(type, owner, dict), filmSubModelBase(owner, dict, typeName, modelType),
latestMassPC_(0.0), latestMassPC_(0.0),
totalMassPC_(0.0) totalMassPC_(0.0)
{} {}

16
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ SourceFiles
#ifndef phaseChangeModel_H #ifndef phaseChangeModel_H
#define phaseChangeModel_H #define phaseChangeModel_H
#include "subModelBase.H" #include "filmSubModelBase.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "scalarField.H" #include "scalarField.H"
@ -55,7 +55,7 @@ namespace surfaceFilmModels
class phaseChangeModel class phaseChangeModel
: :
public subModelBase public filmSubModelBase
{ {
private: private:
@ -93,7 +93,7 @@ public:
phaseChangeModel, phaseChangeModel,
dictionary, dictionary,
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (owner, dict)
@ -102,13 +102,13 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
phaseChangeModel(const surfaceFilmModel& owner); phaseChangeModel(surfaceFilmModel& owner);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
phaseChangeModel phaseChangeModel
( (
const word& type, const word& modelType,
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );
@ -118,7 +118,7 @@ public:
//- Return a reference to the selected phase change model //- Return a reference to the selected phase change model
static autoPtr<phaseChangeModel> New static autoPtr<phaseChangeModel> New
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,7 @@ namespace surfaceFilmModels
autoPtr<phaseChangeModel> phaseChangeModel::New autoPtr<phaseChangeModel> phaseChangeModel::New
( (
const surfaceFilmModel& model, surfaceFilmModel& model,
const dictionary& dict const dictionary& dict
) )
{ {
@ -53,7 +53,7 @@ autoPtr<phaseChangeModel> phaseChangeModel::New
{ {
FatalErrorIn FatalErrorIn
( (
"phaseChangeModel::New(const surfaceFilmModel&, const dictionary&)" "phaseChangeModel::New(surfaceFilmModel&, const dictionary&)"
) << "Unknown phaseChangeModel type " << modelType ) << "Unknown phaseChangeModel type " << modelType
<< nl << nl << "Valid phaseChangeModel types are:" << nl << nl << nl << "Valid phaseChangeModel types are:" << nl
<< dictionaryConstructorTablePtr_->toc() << dictionaryConstructorTablePtr_->toc()

8
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
View File

@ -51,14 +51,14 @@ addToRunTimeSelectionTable
solidification::solidification solidification::solidification
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
phaseChangeModel(typeName, owner, dict), phaseChangeModel(typeName, owner, dict),
T0_(readScalar(coeffs_.lookup("T0"))), T0_(readScalar(coeffDict_.lookup("T0"))),
L_(readScalar(coeffs_.lookup("L"))), L_(readScalar(coeffDict_.lookup("L"))),
alpha_(readScalar(coeffs_.lookup("alpha"))), alpha_(readScalar(coeffDict_.lookup("alpha"))),
mass_ mass_
( (
IOobject IOobject

2
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H
View File

@ -95,7 +95,7 @@ public:
// Constructors // Constructors
//- Construct from surface film model //- Construct from surface film model
solidification(const surfaceFilmModel& owner, const dictionary& dict); solidification(surfaceFilmModel& owner, const dictionary& dict);
//- Destructor //- Destructor

8
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
View File

@ -70,14 +70,14 @@ scalar standardPhaseChange::Sh
standardPhaseChange::standardPhaseChange standardPhaseChange::standardPhaseChange
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
) )
: :
phaseChangeModel(typeName, owner, dict), phaseChangeModel(typeName, owner, dict),
deltaMin_(readScalar(coeffs_.lookup("deltaMin"))), deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))),
L_(readScalar(coeffs_.lookup("L"))), L_(readScalar(coeffDict_.lookup("L"))),
TbFactor_(coeffs_.lookupOrDefault<scalar>("TbFactor", 1.1)) TbFactor_(coeffDict_.lookupOrDefault<scalar>("TbFactor", 1.1))
{} {}

4
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -97,7 +97,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
standardPhaseChange standardPhaseChange
( (
const surfaceFilmModel& owner, surfaceFilmModel& owner,
const dictionary& dict const dictionary& dict
); );