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

regionModels: Renamed owner->region in regionModel and owner->film in surfaceFilmModel

Browse Source 
This update does not change the operation or controls of the regionModels, it is
to aid understanding of the code.
This commit is contained in:
Henry Weller
2017-03-28 08:30:46 +01:00
parent 1dd74551da
commit 09620ce0ed
78 changed files with 431 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C
View File

@ -41,11 +41,11 @@ namespace regionModels
Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject
( (
regionModel& owner regionModel& region
) )
: :
dict_(dictionary::null), dict_(dictionary::null),
owner_(owner), regionModel_(region),
modelType_("modelType") modelType_("modelType")
{} {}
@ -53,12 +53,12 @@ Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject
Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject
( (
const dictionary& dict, const dictionary& dict,
regionModel& owner, regionModel& region,
const word& type const word& type
) )
: :
dict_(dict), dict_(dict),
owner_(owner), regionModel_(region),
modelType_(type) modelType_(type)
{} {}
@ -69,7 +69,7 @@ Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject
) )
: :
dict_(rmfo.dict_), dict_(rmfo.dict_),
owner_(rmfo.owner_), regionModel_(rmfo.regionModel_),
modelType_(rmfo.modelType_) modelType_(rmfo.modelType_)
{} {}
@ -88,7 +88,7 @@ void Foam::regionModels::regionModelFunctionObject::preEvolveRegion()
void Foam::regionModels::regionModelFunctionObject::postEvolveRegion() void Foam::regionModels::regionModelFunctionObject::postEvolveRegion()
{ {
if (owner_.regionMesh().time().writeTime()) if (regionModel_.regionMesh().time().writeTime())
{ {
write(); write();
} }

16
src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.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-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ protected:
dictionary dict_; dictionary dict_;
//- Reference to the region model //- Reference to the region model
regionModel& owner_; regionModel& regionModel_;
//- Model type name //- Model type name
word modelType_; word modelType_;
@ -83,22 +83,22 @@ public:
dictionary, dictionary,
( (
const dictionary& dict, const dictionary& dict,
regionModel& owner regionModel& region
), ),
(dict, owner) (dict, region)
); );
// Constructors // Constructors
//- Construct null from owner //- Construct null from region
regionModelFunctionObject(regionModel& owner); regionModelFunctionObject(regionModel& region);
//- Construct from dictionary //- Construct from dictionary
regionModelFunctionObject regionModelFunctionObject
( (
const dictionary& dict, const dictionary& dict,
regionModel& owner, regionModel& region,
const word& modelType const word& modelType
); );
@ -123,7 +123,7 @@ public:
static autoPtr<regionModelFunctionObject> New static autoPtr<regionModelFunctionObject> New
( (
const dictionary& dict, const dictionary& dict,
regionModel& owner, regionModel& region,
const word& modelType const word& modelType
); );

14
src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.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) 2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,24 +29,24 @@ License
Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList
( (
regionModel& owner regionModel& region
) )
: :
PtrList<regionModelFunctionObject>(), PtrList<regionModelFunctionObject>(),
owner_(owner), regionModel_(region),
dict_(dictionary::null) dict_(dictionary::null)
{} {}
Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList
( (
regionModel& owner, regionModel& region,
const dictionary& dict, const dictionary& dict,
const bool readFields const bool readFields
) )
: :
PtrList<regionModelFunctionObject>(), PtrList<regionModelFunctionObject>(),
owner_(owner), regionModel_(region),
dict_(dict) dict_(dict)
{ {
if (readFields) if (readFields)
@ -69,7 +69,7 @@ Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList
regionModelFunctionObject::New regionModelFunctionObject::New
( (
dict, dict,
owner, region,
modelName modelName
) )
); );
@ -89,7 +89,7 @@ Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList
) )
: :
PtrList<regionModelFunctionObject>(cfol), PtrList<regionModelFunctionObject>(cfol),
owner_(cfol.owner_), regionModel_(cfol.regionModel_),
dict_(cfol.dict_) dict_(cfol.dict_)
{} {}

18
src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.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-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,8 +60,8 @@ protected:
// Protected Data // Protected Data
//- Reference to the owner region model //- Reference to the region region model
regionModel& owner_; regionModel& regionModel_;
//- Dictionary //- Dictionary
const dictionary dict_; const dictionary dict_;
@ -72,12 +72,12 @@ public:
// Constructors // Constructors
//- Null constructor //- Null constructor
regionModelFunctionObjectList(regionModel& owner); regionModelFunctionObjectList(regionModel& region);
//- Construct from mesh //- Construct from mesh
regionModelFunctionObjectList regionModelFunctionObjectList
( (
regionModel& owner, regionModel& region,
const dictionary& dict, const dictionary& dict,
const bool readFields = true const bool readFields = true
); );
@ -97,11 +97,11 @@ public:
// Access // Access
//- Return const access to the cloud owner //- Return const access to the cloud region
inline const regionModel& owner() const; inline const regionModel& region() const;
//- Return refernce to the cloud owner //- Return refernce to the cloud region
inline regionModel& owner(); inline regionModel& region();
//- Return the forces dictionary //- Return the forces dictionary
inline const dictionary& dict() const; inline const dictionary& dict() const;

10
src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.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-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -24,16 +24,16 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
inline const Foam::regionModels::regionModel& inline const Foam::regionModels::regionModel&
Foam::regionModels::regionModelFunctionObjectList::owner() const Foam::regionModels::regionModelFunctionObjectList::region() const
{ {
return owner_; return regionModel_;
} }
inline Foam::regionModels::regionModel& inline Foam::regionModels::regionModel&
Foam::regionModels::regionModelFunctionObjectList::owner() Foam::regionModels::regionModelFunctionObjectList::region()
{ {
return owner_; return regionModel_;
} }

6
src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.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) 2012-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -31,7 +31,7 @@ Foam::autoPtr<Foam::regionModels::regionModelFunctionObject>
Foam::regionModels::regionModelFunctionObject::New Foam::regionModels::regionModelFunctionObject::New
( (
const dictionary& dict, const dictionary& dict,
regionModel& owner, regionModel& region,
const word& modelName const word& modelName
) )
{ {
@ -58,7 +58,7 @@ Foam::regionModels::regionModelFunctionObject::New
cstrIter() cstrIter()
( (
dict.subDict(modelName), dict.subDict(modelName),
owner region
) )
); );
} }

22
src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,16 +36,16 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
filmSubModelBase::filmSubModelBase(surfaceFilmModel& owner) filmSubModelBase::filmSubModelBase(surfaceFilmModel& film)
: :
subModelBase(owner.outputProperties()), subModelBase(film.outputProperties()),
owner_(owner) filmModel_(film)
{} {}
filmSubModelBase::filmSubModelBase filmSubModelBase::filmSubModelBase
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
const word& baseName, const word& baseName,
const word& modelType, const word& modelType,
@ -54,20 +54,20 @@ filmSubModelBase::filmSubModelBase
: :
subModelBase subModelBase
( (
owner.outputProperties(), film.outputProperties(),
dict, dict,
baseName, baseName,
modelType, modelType,
dictExt dictExt
), ),
owner_(owner) filmModel_(film)
{} {}
filmSubModelBase::filmSubModelBase filmSubModelBase::filmSubModelBase
( (
const word& modelName, const word& modelName,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
const word& baseName, const word& baseName,
const word& modelType const word& modelType
@ -76,12 +76,12 @@ filmSubModelBase::filmSubModelBase
subModelBase subModelBase
( (
modelName, modelName,
owner.outputProperties(), film.outputProperties(),
dict, dict,
baseName, baseName,
modelType modelType
), ),
owner_(owner) filmModel_(film)
{} {}
@ -95,7 +95,7 @@ filmSubModelBase::~filmSubModelBase()
bool filmSubModelBase::writeTime() const bool filmSubModelBase::writeTime() const
{ {
return active() && owner_.time().writeTime(); return active() && filmModel_.time().writeTime();
} }

24
src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,8 +60,8 @@ protected:
// Protected data // Protected data
//- Reference to the owner surface film model //- Reference to the film surface film model
surfaceFilmModel& owner_; surfaceFilmModel& filmModel_;
public: public:
@ -69,23 +69,23 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
filmSubModelBase(surfaceFilmModel& owner); filmSubModelBase(surfaceFilmModel& film);
//- Construct from owner film wihout name //- Construct from film film wihout name
filmSubModelBase filmSubModelBase
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
const word& baseName, const word& baseName,
const word& modelType, const word& modelType,
const word& dictExt = "Coeffs" const word& dictExt = "Coeffs"
); );
//- Construct from owner film with name //- Construct from film film with name
filmSubModelBase filmSubModelBase
( (
const word& modelName, const word& modelName,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
const word& baseName, const word& baseName,
const word& modelType const word& modelType
@ -103,11 +103,11 @@ public:
//- Flag to indicate when to write a property //- Flag to indicate when to write a property
virtual bool writeTime() const; virtual bool writeTime() const;
//- Return const access to the owner surface film model //- Return const access to the film surface film model
inline const surfaceFilmModel& owner() const; inline const surfaceFilmModel& film() const;
//- Return the reference to the owner surface film model //- Return the reference to the film surface film model
inline surfaceFilmModel& owner(); inline surfaceFilmModel& film();
template<class FilmType> template<class FilmType>
inline const FilmType& filmType() const; inline const FilmType& filmType() const;

10
src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.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-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -34,15 +34,15 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
inline const surfaceFilmModel& filmSubModelBase::owner() const inline const surfaceFilmModel& filmSubModelBase::film() const
{ {
return owner_; return filmModel_;
} }
inline surfaceFilmModel& filmSubModelBase::owner() inline surfaceFilmModel& filmSubModelBase::film()
{ {
return owner_; return filmModel_;
} }

8
src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.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) 2013-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -35,15 +35,15 @@ namespace surfaceFilmModels
template<class FilmType> template<class FilmType>
const FilmType& filmSubModelBase::filmType() const const FilmType& filmSubModelBase::filmType() const
{ {
if (!isA<FilmType>(owner_)) if (!isA<FilmType>(filmModel_))
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Model " << this->modelType() << " requested film type " << "Model " << this->modelType() << " requested film type "
<< FilmType::typeName << " but film is type " << owner_.type() << FilmType::typeName << " but film is type " << filmModel_.type()
<< abort(FatalError); << abort(FatalError);
} }
return refCast<const FilmType>(owner_); return refCast<const FilmType>(filmModel_);
} }

36
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.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) 2013-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -61,11 +61,11 @@ void constantFilmThermo::init(thermoData& td)
constantFilmThermo::constantFilmThermo constantFilmThermo::constantFilmThermo
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmThermoModel(typeName, owner, dict), filmThermoModel(typeName, film, dict),
name_(coeffDict_.lookup("specie")), name_(coeffDict_.lookup("specie")),
rho0_("rho0"), rho0_("rho0"),
mu0_("mu0"), mu0_("mu0"),
@ -264,12 +264,12 @@ tmp<volScalarField> constantFilmThermo::rho() const
IOobject IOobject
( (
type() + ':' + rho0_.name_, type() + ':' + rho0_.name_,
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimDensity, 0.0), dimensionedScalar("0", dimDensity, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -291,12 +291,12 @@ tmp<volScalarField> constantFilmThermo::mu() const
IOobject IOobject
( (
type() + ':' + mu0_.name_, type() + ':' + mu0_.name_,
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimPressure*dimTime, 0.0), dimensionedScalar("0", dimPressure*dimTime, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -318,12 +318,12 @@ tmp<volScalarField> constantFilmThermo::sigma() const
IOobject IOobject
( (
type() + ':' + sigma0_.name_, type() + ':' + sigma0_.name_,
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimMass/sqr(dimTime), 0.0), dimensionedScalar("0", dimMass/sqr(dimTime), 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -345,12 +345,12 @@ tmp<volScalarField> constantFilmThermo::Cp() const
IOobject IOobject
( (
type() + ':' + Cp0_.name_, type() + ':' + Cp0_.name_,
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0), dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -372,12 +372,12 @@ tmp<volScalarField> constantFilmThermo::kappa() const
IOobject IOobject
( (
type() + ':' + kappa0_.name_, type() + ':' + kappa0_.name_,
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0), dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )

4
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.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) 2013-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -140,7 +140,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
constantFilmThermo constantFilmThermo
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

10
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,21 +43,21 @@ defineRunTimeSelectionTable(filmThermoModel, dictionary);
filmThermoModel::filmThermoModel filmThermoModel::filmThermoModel
( (
surfaceFilmModel& owner surfaceFilmModel& film
) )
: :
filmSubModelBase(owner) filmSubModelBase(film)
{} {}
filmThermoModel::filmThermoModel filmThermoModel::filmThermoModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmSubModelBase(owner, dict, typeName, modelType) filmSubModelBase(film, dict, typeName, modelType)
{} {}

12
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,22 +81,22 @@ public:
filmThermoModel, filmThermoModel,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (film, dict)
); );
// Constructors // Constructors
//- Construct null //- Construct null
filmThermoModel(surfaceFilmModel& owner); filmThermoModel(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
filmThermoModel filmThermoModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

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

@ -55,17 +55,17 @@ addToRunTimeSelectionTable
const thermoSingleLayer& liquidFilmThermo::thermoFilm() const const thermoSingleLayer& liquidFilmThermo::thermoFilm() const
{ {
if (!isA<thermoSingleLayer>(owner_)) if (!isA<thermoSingleLayer>(filmModel_))
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Thermo model requires a " << thermoSingleLayer::typeName << "Thermo model requires a " << thermoSingleLayer::typeName
<< " film to supply the pressure and temperature, but " << " film to supply the pressure and temperature, but "
<< owner_.type() << " film model selected. " << filmModel_.type() << " film model selected. "
<< "Use the 'useReferenceValues' flag to employ reference " << "Use the 'useReferenceValues' flag to employ reference "
<< "pressure and temperature" << exit(FatalError); << "pressure and temperature" << exit(FatalError);
} }
return refCast<const thermoSingleLayer>(owner_); return refCast<const thermoSingleLayer>(filmModel_);
} }
@ -78,13 +78,13 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
dict.lookup("liquid") >> name_; dict.lookup("liquid") >> name_;
if (owner_.primaryMesh().foundObject<SLGThermo>("SLGThermo")) if (filmModel_.primaryMesh().foundObject<SLGThermo>("SLGThermo"))
{ {
// retrieve from film thermo // retrieve from film thermo
ownLiquid_ = false; ownLiquid_ = false;
const SLGThermo& thermo = const SLGThermo& thermo =
owner_.primaryMesh().lookupObject<SLGThermo>("SLGThermo"); filmModel_.primaryMesh().lookupObject<SLGThermo>("SLGThermo");
label id = thermo.liquidId(name_); label id = thermo.liquidId(name_);
liquidPtr_ = &thermo.liquids().properties()[id]; liquidPtr_ = &thermo.liquids().properties()[id];
} }
@ -103,11 +103,11 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
liquidFilmThermo::liquidFilmThermo liquidFilmThermo::liquidFilmThermo
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmThermoModel(typeName, owner, dict), filmThermoModel(typeName, film, dict),
name_("unknown_liquid"), name_("unknown_liquid"),
liquidPtr_(nullptr), liquidPtr_(nullptr),
ownLiquid_(false), ownLiquid_(false),
@ -245,12 +245,12 @@ tmp<volScalarField> liquidFilmThermo::rho() const
IOobject IOobject
( (
type() + ":rho", type() + ":rho",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimDensity, 0.0), dimensionedScalar("0", dimDensity, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -293,12 +293,12 @@ tmp<volScalarField> liquidFilmThermo::mu() const
IOobject IOobject
( (
type() + ":mu", type() + ":mu",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimPressure*dimTime, 0.0), dimensionedScalar("0", dimPressure*dimTime, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -341,12 +341,12 @@ tmp<volScalarField> liquidFilmThermo::sigma() const
IOobject IOobject
( (
type() + ":sigma", type() + ":sigma",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimMass/sqr(dimTime), 0.0), dimensionedScalar("0", dimMass/sqr(dimTime), 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -389,12 +389,12 @@ tmp<volScalarField> liquidFilmThermo::Cp() const
IOobject IOobject
( (
type() + ":Cp", type() + ":Cp",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0), dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )
@ -437,12 +437,12 @@ tmp<volScalarField> liquidFilmThermo::kappa() const
IOobject IOobject
( (
type() + ":kappa", type() + ":kappa",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0), dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0),
extrapolatedCalculatedFvPatchScalarField::typeName extrapolatedCalculatedFvPatchScalarField::typeName
) )

4
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -107,7 +107,7 @@ public:
//- Construct from surface film model and dictionary //- Construct from surface film model and dictionary
liquidFilmThermo liquidFilmThermo
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

10
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,20 +41,20 @@ defineRunTimeSelectionTable(filmTurbulenceModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
filmTurbulenceModel::filmTurbulenceModel(surfaceFilmModel& owner) filmTurbulenceModel::filmTurbulenceModel(surfaceFilmModel& film)
: :
filmSubModelBase(owner) filmSubModelBase(film)
{} {}
filmTurbulenceModel::filmTurbulenceModel filmTurbulenceModel::filmTurbulenceModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmSubModelBase(owner, dict, typeName, modelType) filmSubModelBase(film, dict, typeName, modelType)
{} {}

12
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,22 +83,22 @@ public:
filmTurbulenceModel, filmTurbulenceModel,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (film, dict)
); );
// Constructors // Constructors
//- Construct null //- Construct null
filmTurbulenceModel(surfaceFilmModel& owner); filmTurbulenceModel(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
filmTurbulenceModel filmTurbulenceModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

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

@ -51,11 +51,11 @@ addToRunTimeSelectionTable(filmTurbulenceModel, laminar, dictionary);
laminar::laminar laminar::laminar
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmTurbulenceModel(type(), owner, dict), filmTurbulenceModel(type(), film, dict),
Cf_(readScalar(coeffDict_.lookup("Cf"))) Cf_(readScalar(coeffDict_.lookup("Cf")))
{} {}
@ -77,19 +77,19 @@ tmp<volVectorField> laminar::Us() const
IOobject IOobject
( (
typeName + ":Us", typeName + ":Us",
owner_.regionMesh().time().timeName(), filmModel_.regionMesh().time().timeName(),
owner_.regionMesh(), filmModel_.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedVector("zero", dimVelocity, Zero), dimensionedVector("zero", dimVelocity, Zero),
extrapolatedCalculatedFvPatchVectorField::typeName extrapolatedCalculatedFvPatchVectorField::typeName
) )
); );
// apply quadratic profile // apply quadratic profile
tUs.ref() = Foam::sqrt(2.0)*owner_.U(); tUs.ref() = Foam::sqrt(2.0)*filmModel_.U();
tUs.ref().correctBoundaryConditions(); tUs.ref().correctBoundaryConditions();
return tUs; return tUs;
@ -105,12 +105,12 @@ tmp<volScalarField> laminar::mut() const
IOobject IOobject
( (
typeName + ":mut", typeName + ":mut",
owner_.regionMesh().time().timeName(), filmModel_.regionMesh().time().timeName(),
owner_.regionMesh(), filmModel_.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedScalar("zero", dimMass/dimLength/dimTime, 0.0) dimensionedScalar("zero", dimMass/dimLength/dimTime, 0.0)
) )
); );
@ -125,7 +125,7 @@ tmp<fvVectorMatrix> laminar::Su(volVectorField& U) const
{ {
// local reference to film model // local reference to film model
const kinematicSingleLayer& film = const kinematicSingleLayer& film =
static_cast<const kinematicSingleLayer&>(owner_); static_cast<const kinematicSingleLayer&>(filmModel_);
// local references to film fields // local references to film fields
const volScalarField& mu = film.mu(); const volScalarField& mu = film.mu();

4
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -80,7 +80,7 @@ public:
// Constructors // Constructors
//- Construct from surface film model //- Construct from surface film model
laminar(surfaceFilmModel& owner, const dictionary& dict); laminar(surfaceFilmModel& film, const dictionary& dict);
//- Destructor //- Destructor

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

@ -51,7 +51,7 @@ void contactAngleForce::initialise()
if (zeroForcePatches.size()) if (zeroForcePatches.size())
{ {
const polyBoundaryMesh& pbm = owner_.regionMesh().boundaryMesh(); const polyBoundaryMesh& pbm = filmModel_.regionMesh().boundaryMesh();
scalar dLim = readScalar(coeffDict_.lookup("zeroForceDistance")); scalar dLim = readScalar(coeffDict_.lookup("zeroForceDistance"));
Info<< " Assigning zero contact force within " << dLim Info<< " Assigning zero contact force within " << dLim
@ -66,19 +66,19 @@ void contactAngleForce::initialise()
} }
// Temporary implementation until run-time selection covers this case // Temporary implementation until run-time selection covers this case
patchDistMethods::meshWave dist(owner_.regionMesh(), patchIDs); patchDistMethods::meshWave dist(filmModel_.regionMesh(), patchIDs);
volScalarField y volScalarField y
( (
IOobject IOobject
( (
"y", "y",
owner_.regionMesh().time().timeName(), filmModel_.regionMesh().time().timeName(),
owner_.regionMesh(), filmModel_.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE, IOobject::NO_WRITE,
false false
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedScalar("y", dimLength, GREAT) dimensionedScalar("y", dimLength, GREAT)
); );
dist.correct(y); dist.correct(y);
@ -93,23 +93,23 @@ void contactAngleForce::initialise()
contactAngleForce::contactAngleForce contactAngleForce::contactAngleForce
( (
const word& typeName, const word& typeName,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
force(typeName, owner, dict), force(typeName, film, dict),
Ccf_(readScalar(coeffDict_.lookup("Ccf"))), Ccf_(readScalar(coeffDict_.lookup("Ccf"))),
mask_ mask_
( (
IOobject IOobject
( (
typeName + ":contactForceMask", typeName + ":contactForceMask",
owner_.time().timeName(), filmModel_.time().timeName(),
owner_.regionMesh(), filmModel_.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedScalar("mask", dimless, 1.0) dimensionedScalar("mask", dimless, 1.0)
) )
{ {
@ -134,25 +134,25 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
IOobject IOobject
( (
typeName + ":contactForce", typeName + ":contactForce",
owner_.time().timeName(), filmModel_.time().timeName(),
owner_.regionMesh(), filmModel_.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedVector("zero", dimForce/dimArea, Zero) dimensionedVector("zero", dimForce/dimArea, Zero)
) )
); );
vectorField& force = tForce.ref().primitiveFieldRef(); vectorField& force = tForce.ref().primitiveFieldRef();
const labelUList& own = owner_.regionMesh().owner(); const labelUList& own = filmModel_.regionMesh().owner();
const labelUList& nbr = owner_.regionMesh().neighbour(); const labelUList& nbr = filmModel_.regionMesh().neighbour();
const scalarField& magSf = owner_.magSf(); const scalarField& magSf = filmModel_.magSf();
const volScalarField& alpha = owner_.alpha(); const volScalarField& alpha = filmModel_.alpha();
const volScalarField& sigma = owner_.sigma(); const volScalarField& sigma = filmModel_.sigma();
const tmp<volScalarField> ttheta = theta(); const tmp<volScalarField> ttheta = theta();
const volScalarField& theta = ttheta(); const volScalarField& theta = ttheta();
@ -176,7 +176,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
if (celli != -1 && mask_[celli] > 0.5) if (celli != -1 && mask_[celli] > 0.5)
{ {
const scalar invDx = owner_.regionMesh().deltaCoeffs()[facei]; const scalar invDx = filmModel_.regionMesh().deltaCoeffs()[facei];
const vector n = const vector n =
gradAlpha[celli]/(mag(gradAlpha[celli]) + ROOTVSMALL); gradAlpha[celli]/(mag(gradAlpha[celli]) + ROOTVSMALL);
const scalar cosTheta = cos(degToRad(theta[celli])); const scalar cosTheta = cos(degToRad(theta[celli]));
@ -186,7 +186,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
forAll(alpha.boundaryField(), patchi) forAll(alpha.boundaryField(), patchi)
{ {
if (!owner_.isCoupledPatch(patchi)) if (!filmModel_.isCoupledPatch(patchi))
{ {
const fvPatchField<scalar>& alphaf = alpha.boundaryField()[patchi]; const fvPatchField<scalar>& alphaf = alpha.boundaryField()[patchi];
const fvPatchField<scalar>& maskf = mask_.boundaryField()[patchi]; const fvPatchField<scalar>& maskf = mask_.boundaryField()[patchi];
@ -215,7 +215,7 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
force /= magSf; force /= magSf;
if (owner_.regionMesh().time().writeTime()) if (filmModel_.regionMesh().time().writeTime())
{ {
tForce().write(); tForce().write();
} }

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

@ -96,7 +96,7 @@ public:
contactAngleForce contactAngleForce
( (
const word& typeName, const word& typeName,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

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

@ -45,11 +45,11 @@ addToRunTimeSelectionTable(force, distributionContactAngleForce, dictionary);
distributionContactAngleForce::distributionContactAngleForce distributionContactAngleForce::distributionContactAngleForce
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
contactAngleForce(typeName, owner, dict), contactAngleForce(typeName, film, dict),
rndGen_(label(0), -1), rndGen_(label(0), -1),
distribution_ distribution_
( (
@ -79,10 +79,10 @@ tmp<volScalarField> distributionContactAngleForce::theta() const
IOobject IOobject
( (
typeName + ":theta", typeName + ":theta",
owner_.time().timeName(), filmModel_.time().timeName(),
owner_.regionMesh() filmModel_.regionMesh()
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedScalar("0", dimless, 0) dimensionedScalar("0", dimless, 0)
) )
); );
@ -97,7 +97,7 @@ tmp<volScalarField> distributionContactAngleForce::theta() const
forAll(theta.boundaryField(), patchi) forAll(theta.boundaryField(), patchi)
{ {
if (!owner_.isCoupledPatch(patchi)) if (!filmModel_.isCoupledPatch(patchi))
{ {
fvPatchField<scalar>& thetaf = theta.boundaryFieldRef()[patchi]; fvPatchField<scalar>& thetaf = theta.boundaryFieldRef()[patchi];

2
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H
View File

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

14
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
View File

@ -50,11 +50,11 @@ addToRunTimeSelectionTable
temperatureDependentContactAngleForce::temperatureDependentContactAngleForce temperatureDependentContactAngleForce::temperatureDependentContactAngleForce
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
contactAngleForce(typeName, owner, dict), contactAngleForce(typeName, film, dict),
thetaPtr_(Function1<scalar>::New("theta", coeffDict_)) thetaPtr_(Function1<scalar>::New("theta", coeffDict_))
{} {}
@ -76,23 +76,23 @@ tmp<volScalarField> temperatureDependentContactAngleForce::theta() const
IOobject IOobject
( (
typeName + ":theta", typeName + ":theta",
owner_.time().timeName(), filmModel_.time().timeName(),
owner_.regionMesh() filmModel_.regionMesh()
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedScalar("0", dimless, 0) dimensionedScalar("0", dimless, 0)
) )
); );
volScalarField& theta = ttheta.ref(); volScalarField& theta = ttheta.ref();
const volScalarField& T = owner_.T(); const volScalarField& T = filmModel_.T();
theta.ref().field() = thetaPtr_->value(T()); theta.ref().field() = thetaPtr_->value(T());
forAll(theta.boundaryField(), patchi) forAll(theta.boundaryField(), patchi)
{ {
if (!owner_.isCoupledPatch(patchi)) if (!filmModel_.isCoupledPatch(patchi))
{ {
theta.boundaryFieldRef()[patchi] = theta.boundaryFieldRef()[patchi] =
thetaPtr_->value(T.boundaryField()[patchi]); thetaPtr_->value(T.boundaryField()[patchi]);

2
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H
View File

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

10
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,20 +41,20 @@ defineRunTimeSelectionTable(force, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
force::force(surfaceFilmModel& owner) force::force(surfaceFilmModel& film)
: :
filmSubModelBase(owner) filmSubModelBase(film)
{} {}
force::force force::force
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmSubModelBase(owner, dict, typeName, modelType) filmSubModelBase(film, dict, typeName, modelType)
{} {}

12
src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.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-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -82,22 +82,22 @@ public:
force, force,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (film, dict)
); );
// Constructors // Constructors
//- Construct null //- Construct null
force(surfaceFilmModel& owner); force(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
force force
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );
@ -107,7 +107,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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
const word& modelType const word& modelType
); );

8
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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
forceList::forceList(surfaceFilmModel& owner) forceList::forceList(surfaceFilmModel& film)
: :
PtrList<force>() PtrList<force>()
{} {}
@ -44,7 +44,7 @@ forceList::forceList(surfaceFilmModel& owner)
forceList::forceList forceList::forceList
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
@ -59,7 +59,7 @@ forceList::forceList
forAll(models, i) forAll(models, i)
{ {
set(i, force::New(owner, dict, models[i])); set(i, force::New(film, dict, models[i]));
} }
} }
else else

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -60,12 +60,12 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
forceList(surfaceFilmModel& owner); forceList(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
forceList forceList
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

8
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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -45,11 +45,11 @@ addToRunTimeSelectionTable(force, thermocapillaryForce, dictionary);
thermocapillaryForce::thermocapillaryForce thermocapillaryForce::thermocapillaryForce
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
force(owner) force(film)
{} {}
@ -63,7 +63,7 @@ thermocapillaryForce::~thermocapillaryForce()
tmp<fvVectorMatrix> thermocapillaryForce::correct(volVectorField& U) tmp<fvVectorMatrix> thermocapillaryForce::correct(volVectorField& U)
{ {
const volScalarField& sigma = owner_.sigma(); const volScalarField& sigma = filmModel_.sigma();
tmp<fvVectorMatrix> tmp<fvVectorMatrix>
tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume)); tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume));

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

10
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.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) 2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -45,15 +45,15 @@ addToRunTimeSelectionTable(injectionModel, BrunDrippingInjection, dictionary);
BrunDrippingInjection::BrunDrippingInjection BrunDrippingInjection::BrunDrippingInjection
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
injectionModel(type(), owner, dict), injectionModel(type(), film, dict),
ubarStar_(coeffDict_.lookupOrDefault("ubarStar", 1.62208)), ubarStar_(coeffDict_.lookupOrDefault("ubarStar", 1.62208)),
dCoeff_(coeffDict_.lookupOrDefault("dCoeff", 3.3)), dCoeff_(coeffDict_.lookupOrDefault("dCoeff", 3.3)),
deltaStable_(coeffDict_.lookupOrDefault("deltaStable", scalar(0))), deltaStable_(coeffDict_.lookupOrDefault("deltaStable", scalar(0))),
diameter_(owner.regionMesh().nCells(), -1.0) diameter_(film.regionMesh().nCells(), -1.0)
{} {}
@ -73,7 +73,7 @@ void BrunDrippingInjection::correct
) )
{ {
const kinematicSingleLayer& film = const kinematicSingleLayer& film =
refCast<const kinematicSingleLayer>(this->owner()); refCast<const kinematicSingleLayer>(this->film());
// Calculate available dripping mass // Calculate available dripping mass
tmp<volScalarField> tsinAlpha(film.gNorm()/mag(film.g())); tmp<volScalarField> tsinAlpha(film.gNorm()/mag(film.g()));

4
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.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) 2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -118,7 +118,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
BrunDrippingInjection BrunDrippingInjection
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

22
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -65,7 +65,7 @@ tmp<volScalarField> curvatureSeparation::calcInvR1
/* /*
tmp<volScalarField> tinvR1 tmp<volScalarField> tinvR1
( (
new volScalarField("invR1", fvc::div(owner().nHat())) new volScalarField("invR1", fvc::div(film().nHat()))
); );
*/ */
@ -82,7 +82,7 @@ tmp<volScalarField> curvatureSeparation::calcInvR1
// apply defined patch radii // apply defined patch radii
const scalar rMin = 1e-6; const scalar rMin = 1e-6;
const fvMesh& mesh = owner().regionMesh(); const fvMesh& mesh = film().regionMesh();
const polyBoundaryMesh& pbm = mesh.boundaryMesh(); const polyBoundaryMesh& pbm = mesh.boundaryMesh();
forAll(definedPatchRadii_, i) forAll(definedPatchRadii_, i)
{ {
@ -115,7 +115,7 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
const surfaceScalarField& phi const surfaceScalarField& phi
) const ) const
{ {
const fvMesh& mesh = owner().regionMesh(); const fvMesh& mesh = film().regionMesh();
const vectorField nf(mesh.Sf()/mesh.magSf()); const vectorField nf(mesh.Sf()/mesh.magSf());
const unallocLabelList& own = mesh.owner(); const unallocLabelList& own = mesh.owner();
const unallocLabelList& nbr = mesh.neighbour(); const unallocLabelList& nbr = mesh.neighbour();
@ -220,15 +220,15 @@ tmp<scalarField> curvatureSeparation::calcCosAngle
curvatureSeparation::curvatureSeparation curvatureSeparation::curvatureSeparation
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
injectionModel(type(), owner, dict), injectionModel(type(), film, dict),
gradNHat_(fvc::grad(owner.nHat())), gradNHat_(fvc::grad(film.nHat())),
deltaByR1Min_(coeffDict_.lookupOrDefault<scalar>("deltaByR1Min", 0.0)), deltaByR1Min_(coeffDict_.lookupOrDefault<scalar>("deltaByR1Min", 0.0)),
definedPatchRadii_(), definedPatchRadii_(),
magG_(mag(owner.g().value())), magG_(mag(film.g().value())),
gHat_(Zero) gHat_(Zero)
{ {
if (magG_ < ROOTVSMALL) if (magG_ < ROOTVSMALL)
@ -238,10 +238,10 @@ curvatureSeparation::curvatureSeparation
<< exit(FatalError); << exit(FatalError);
} }
gHat_ = owner.g().value()/magG_; gHat_ = film.g().value()/magG_;
List<Tuple2<word, scalar>> prIn(coeffDict_.lookup("definedPatchRadii")); List<Tuple2<word, scalar>> prIn(coeffDict_.lookup("definedPatchRadii"));
const wordList& allPatchNames = owner.regionMesh().boundaryMesh().names(); const wordList& allPatchNames = film.regionMesh().boundaryMesh().names();
DynamicList<Tuple2<label, scalar>> prData(allPatchNames.size()); DynamicList<Tuple2<label, scalar>> prData(allPatchNames.size());
@ -284,7 +284,7 @@ void curvatureSeparation::correct
) )
{ {
const kinematicSingleLayer& film = const kinematicSingleLayer& film =
refCast<const kinematicSingleLayer>(this->owner()); refCast<const kinematicSingleLayer>(this->film());
const fvMesh& mesh = film.regionMesh(); const fvMesh& mesh = film.regionMesh();
const volScalarField& delta = film.delta(); const volScalarField& delta = film.delta();

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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

10
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -50,11 +50,11 @@ addToRunTimeSelectionTable(injectionModel, drippingInjection, dictionary);
drippingInjection::drippingInjection drippingInjection::drippingInjection
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
injectionModel(type(), owner, dict), injectionModel(type(), film, dict),
deltaStable_(readScalar(coeffDict_.lookup("deltaStable"))), deltaStable_(readScalar(coeffDict_.lookup("deltaStable"))),
particlesPerParcel_(readScalar(coeffDict_.lookup("particlesPerParcel"))), particlesPerParcel_(readScalar(coeffDict_.lookup("particlesPerParcel"))),
rndGen_(label(0), -1), rndGen_(label(0), -1),
@ -66,7 +66,7 @@ drippingInjection::drippingInjection
rndGen_ rndGen_
) )
), ),
diameter_(owner.regionMesh().nCells(), -1.0) diameter_(film.regionMesh().nCells(), -1.0)
{} {}
@ -86,7 +86,7 @@ void drippingInjection::correct
) )
{ {
const kinematicSingleLayer& film = const kinematicSingleLayer& film =
refCast<const kinematicSingleLayer>(this->owner()); refCast<const kinematicSingleLayer>(this->film());
const scalar pi = constant::mathematical::pi; const scalar pi = constant::mathematical::pi;

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

10
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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -49,9 +49,9 @@ void injectionModel::addToInjectedMass(const scalar dMass)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
injectionModel::injectionModel(surfaceFilmModel& owner) injectionModel::injectionModel(surfaceFilmModel& film)
: :
filmSubModelBase(owner), filmSubModelBase(film),
injectedMass_(0.0) injectedMass_(0.0)
{} {}
@ -59,11 +59,11 @@ injectionModel::injectionModel(surfaceFilmModel& owner)
injectionModel::injectionModel injectionModel::injectionModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmSubModelBase(owner, dict, typeName, modelType), filmSubModelBase(film, dict, typeName, modelType),
injectedMass_(0.0) injectedMass_(0.0)
{} {}

12
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-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -98,23 +98,23 @@ public:
injectionModel, injectionModel,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (film, dict)
); );
// Constructors // Constructors
//- Construct null //- Construct null
injectionModel(surfaceFilmModel& owner); injectionModel(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
injectionModel injectionModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );
@ -124,7 +124,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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
const word& mdoelType const word& mdoelType
); );

22
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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,16 +36,16 @@ namespace surfaceFilmModels
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
injectionModelList::injectionModelList(surfaceFilmModel& owner) injectionModelList::injectionModelList(surfaceFilmModel& film)
: :
PtrList<injectionModel>(), PtrList<injectionModel>(),
filmSubModelBase(owner) filmSubModelBase(film)
{} {}
injectionModelList::injectionModelList injectionModelList::injectionModelList
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
@ -53,12 +53,12 @@ injectionModelList::injectionModelList
filmSubModelBase filmSubModelBase
( (
"injectionModelList", "injectionModelList",
owner, film,
dict, dict,
"injectionModelList", "injectionModelList",
"injectionModelList" "injectionModelList"
), ),
massInjected_(owner.intCoupledPatchIDs().size(), 0.0) massInjected_(film.intCoupledPatchIDs().size(), 0.0)
{ {
const wordList activeModels(dict.lookup("injectionModels")); const wordList activeModels(dict.lookup("injectionModels"));
@ -77,7 +77,7 @@ injectionModelList::injectionModelList
forAllConstIter(wordHashSet, models, iter) forAllConstIter(wordHashSet, models, iter)
{ {
const word& model = iter.key(); const word& model = iter.key();
set(i, injectionModel::New(owner, dict, model)); set(i, injectionModel::New(film, dict, model));
i++; i++;
} }
} }
@ -114,7 +114,7 @@ void injectionModelList::correct
massToInject.correctBoundaryConditions(); massToInject.correctBoundaryConditions();
diameterToInject.correctBoundaryConditions(); diameterToInject.correctBoundaryConditions();
const labelList& patchIDs = owner().intCoupledPatchIDs(); const labelList& patchIDs = film().intCoupledPatchIDs();
forAll(patchIDs, i) forAll(patchIDs, i)
{ {
@ -127,7 +127,7 @@ void injectionModelList::correct
void injectionModelList::info(Ostream& os) void injectionModelList::info(Ostream& os)
{ {
const polyBoundaryMesh& pbm = owner().regionMesh().boundaryMesh(); const polyBoundaryMesh& pbm = film().regionMesh().boundaryMesh();
scalar injectedMass = 0; scalar injectedMass = 0;
scalarField patchInjectedMasses(pbm.size(), 0); scalarField patchInjectedMasses(pbm.size(), 0);
@ -157,7 +157,7 @@ void injectionModelList::info(Ostream& os)
Pstream::listCombineGather(mass, plusEqOp<scalar>()); Pstream::listCombineGather(mass, plusEqOp<scalar>());
mass += mass0; mass += mass0;
const labelList& patchIDs = owner().intCoupledPatchIDs(); const labelList& patchIDs = film().intCoupledPatchIDs();
forAll(patchIDs, i) forAll(patchIDs, i)
{ {
@ -166,7 +166,7 @@ void injectionModelList::info(Ostream& os)
<< mass[i] << endl; << mass[i] << endl;
} }
if (owner().time().writeTime()) if (film().time().writeTime())
{ {
setBaseProperty("massInjected", mass); setBaseProperty("massInjected", mass);
massInjected_ = 0.0; massInjected_ = 0.0;

6
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-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -79,12 +79,12 @@ public:
// Constructors // Constructors
//- Construct null //- Construct null
injectionModelList(surfaceFilmModel& owner); injectionModelList(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
injectionModelList injectionModelList
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

16
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.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) 2015-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,14 +44,14 @@ addToRunTimeSelectionTable(injectionModel, patchInjection, dictionary);
patchInjection::patchInjection patchInjection::patchInjection
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
injectionModel(type(), owner, dict), injectionModel(type(), film, dict),
deltaStable_(coeffDict_.lookupOrDefault<scalar>("deltaStable", 0.0)) deltaStable_(coeffDict_.lookupOrDefault<scalar>("deltaStable", 0.0))
{ {
const polyBoundaryMesh& pbm = owner.regionMesh().boundaryMesh(); const polyBoundaryMesh& pbm = film.regionMesh().boundaryMesh();
patchIDs_.setSize(pbm.size()); patchIDs_.setSize(pbm.size());
if (coeffDict_.found("patches")) if (coeffDict_.found("patches"))
@ -110,11 +110,11 @@ void patchInjection::correct
// Do not correct if no patches selected // Do not correct if no patches selected
if (!patchIDs_.size()) return; if (!patchIDs_.size()) return;
const scalarField& delta = owner().delta(); const scalarField& delta = film().delta();
const scalarField& rho = owner().rho(); const scalarField& rho = film().rho();
const scalarField& magSf = owner().magSf(); const scalarField& magSf = film().magSf();
const polyBoundaryMesh& pbm = owner().regionMesh().boundaryMesh(); const polyBoundaryMesh& pbm = film().regionMesh().boundaryMesh();
forAll(patchIDs_, pidi) forAll(patchIDs_, pidi)
{ {

4
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.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) 2015-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -86,7 +86,7 @@ public:
// Constructors // Constructors
//- Construct from surface film model //- Construct from surface film model
patchInjection(surfaceFilmModel& owner, const dictionary& dict); patchInjection(surfaceFilmModel& film, const dictionary& dict);
//- Destructor //- Destructor

28
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.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) 2012-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,34 +51,34 @@ addToRunTimeSelectionTable
constantRadiation::constantRadiation constantRadiation::constantRadiation
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmRadiationModel(typeName, owner, dict), filmRadiationModel(typeName, film, dict),
QrConst_ QrConst_
( (
IOobject IOobject
( (
typeName + ":QrConst", typeName + ":QrConst",
owner.time().timeName(), film.time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
owner.regionMesh() film.regionMesh()
), ),
mask_ mask_
( (
IOobject IOobject
( (
typeName + ":mask", typeName + ":mask",
owner.time().timeName(), film.time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
owner.regionMesh(), film.regionMesh(),
dimensionedScalar("one", dimless, 1.0) dimensionedScalar("one", dimless, 1.0)
), ),
absorptivity_(readScalar(coeffDict_.lookup("absorptivity"))), absorptivity_(readScalar(coeffDict_.lookup("absorptivity"))),
@ -110,23 +110,23 @@ tmp<volScalarField> constantRadiation::Shs()
IOobject IOobject
( (
typeName + ":Shs", typeName + ":Shs",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0) dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
) )
); );
const scalar time = owner().time().value(); const scalar time = film().time().value();
if ((time >= timeStart_) && (time <= timeStart_ + duration_)) if ((time >= timeStart_) && (time <= timeStart_ + duration_))
{ {
scalarField& Shs = tShs.ref(); scalarField& Shs = tShs.ref();
const scalarField& Qr = QrConst_; const scalarField& Qr = QrConst_;
const scalarField& alpha = owner_.alpha(); const scalarField& alpha = filmModel_.alpha();
Shs = mask_*Qr*alpha*absorptivity_; Shs = mask_*Qr*alpha*absorptivity_;
} }

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

10
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -41,20 +41,20 @@ defineRunTimeSelectionTable(filmRadiationModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
filmRadiationModel::filmRadiationModel(surfaceFilmModel& owner) filmRadiationModel::filmRadiationModel(surfaceFilmModel& film)
: :
filmSubModelBase(owner) filmSubModelBase(film)
{} {}
filmRadiationModel::filmRadiationModel filmRadiationModel::filmRadiationModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmSubModelBase(owner, dict, typeName, modelType) filmSubModelBase(film, dict, typeName, modelType)
{} {}

12
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,22 +81,22 @@ public:
filmRadiationModel, filmRadiationModel,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (film, dict)
); );
// Constructors // Constructors
//- Construct null //- Construct null
filmRadiationModel(surfaceFilmModel& owner); filmRadiationModel(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
filmRadiationModel filmRadiationModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

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

@ -51,11 +51,11 @@ addToRunTimeSelectionTable
noRadiation::noRadiation noRadiation::noRadiation
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmRadiationModel(owner) filmRadiationModel(film)
{} {}
@ -80,12 +80,12 @@ tmp<volScalarField> noRadiation::Shs()
IOobject IOobject
( (
typeName + ":Shs", typeName + ":Shs",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0) dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
) )
); );

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

22
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.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) 2012-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,24 +51,24 @@ addToRunTimeSelectionTable
primaryRadiation::primaryRadiation primaryRadiation::primaryRadiation
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmRadiationModel(typeName, owner, dict), filmRadiationModel(typeName, film, dict),
QinPrimary_ QinPrimary_
( (
IOobject IOobject
( (
"Qin", // same name as Qin on primary region to enable mapping "Qin", // same name as Qin on primary region to enable mapping
owner.time().timeName(), film.time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner.regionMesh(), film.regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
owner.mappedPushedFieldPatchTypes<scalar>() film.mappedPushedFieldPatchTypes<scalar>()
) )
{} {}
@ -97,19 +97,19 @@ tmp<volScalarField> primaryRadiation::Shs()
IOobject IOobject
( (
typeName + ":Shs", typeName + ":Shs",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0) dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
) )
); );
scalarField& Shs = tShs.ref(); scalarField& Shs = tShs.ref();
const scalarField& QinP = QinPrimary_; const scalarField& QinP = QinPrimary_;
const scalarField& alpha = owner_.alpha(); const scalarField& alpha = filmModel_.alpha();
Shs = QinP*alpha; Shs = QinP*alpha;

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

30
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -52,36 +52,36 @@ addToRunTimeSelectionTable
standardRadiation::standardRadiation standardRadiation::standardRadiation
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmRadiationModel(typeName, owner, dict), filmRadiationModel(typeName, film, dict),
QinPrimary_ QinPrimary_
( (
IOobject IOobject
( (
"Qin", // same name as Qin on primary region to enable mapping "Qin", // same name as Qin on primary region to enable mapping
owner.time().timeName(), film.time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner.regionMesh(), film.regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
owner.mappedPushedFieldPatchTypes<scalar>() film.mappedPushedFieldPatchTypes<scalar>()
), ),
QrNet_ QrNet_
( (
IOobject IOobject
( (
"QrNet", "QrNet",
owner.time().timeName(), film.time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner.regionMesh(), film.regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
), ),
@ -114,20 +114,20 @@ tmp<volScalarField> standardRadiation::Shs()
IOobject IOobject
( (
typeName + ":Shs", typeName + ":Shs",
owner().time().timeName(), film().time().timeName(),
owner().regionMesh(), film().regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner().regionMesh(), film().regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0) dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0)
) )
); );
scalarField& Shs = tShs.ref(); scalarField& Shs = tShs.ref();
const scalarField& QinP = QinPrimary_; const scalarField& QinP = QinPrimary_;
const scalarField& delta = owner_.delta(); const scalarField& delta = filmModel_.delta();
const scalarField& alpha = owner_.alpha(); const scalarField& alpha = filmModel_.alpha();
Shs = beta_*QinP*alpha*(1.0 - exp(-kappaBar_*delta)); Shs = beta_*QinP*alpha*(1.0 - exp(-kappaBar_*delta));

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

8
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.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) 2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,13 +51,13 @@ addToRunTimeSelectionTable
ArrheniusViscosity::ArrheniusViscosity ArrheniusViscosity::ArrheniusViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
filmViscosityModel(typeName, owner, dict, mu), filmViscosityModel(typeName, film, dict, mu),
viscosity_(filmViscosityModel::New(owner, coeffDict_, mu)), viscosity_(filmViscosityModel::New(film, coeffDict_, mu)),
k1_("k1", dimTemperature, coeffDict_), k1_("k1", dimTemperature, coeffDict_),
k2_("k2", dimTemperature, coeffDict_), k2_("k2", dimTemperature, coeffDict_),
Tref_("Tref", dimTemperature, coeffDict_) Tref_("Tref", dimTemperature, coeffDict_)

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.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) 2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -100,7 +100,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
ArrheniusViscosity ArrheniusViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.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) 2013-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -50,12 +50,12 @@ addToRunTimeSelectionTable
constantViscosity::constantViscosity constantViscosity::constantViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
filmViscosityModel(typeName, owner, dict, mu), filmViscosityModel(typeName, film, dict, mu),
mu0_("mu0", dimDynamicViscosity, coeffDict_) mu0_("mu0", dimDynamicViscosity, coeffDict_)
{ {
mu_ == mu0_; mu_ == mu0_;

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.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) 2013-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,7 +83,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
constantViscosity constantViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,12 +44,12 @@ defineRunTimeSelectionTable(filmViscosityModel, dictionary);
filmViscosityModel::filmViscosityModel filmViscosityModel::filmViscosityModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
filmSubModelBase(owner, dict, typeName, modelType), filmSubModelBase(film, dict, typeName, modelType),
mu_(mu) mu_(mu)
{} {}

10
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -90,11 +90,11 @@ public:
filmViscosityModel, filmViscosityModel,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
), ),
(owner, dict, mu) (film, dict, mu)
); );
// Constructors // Constructors
@ -103,7 +103,7 @@ public:
filmViscosityModel filmViscosityModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

6
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,12 +51,12 @@ addToRunTimeSelectionTable
liquidViscosity::liquidViscosity liquidViscosity::liquidViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
filmViscosityModel(typeName, owner, dict, mu) filmViscosityModel(typeName, film, dict, mu)
{} {}

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.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) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -82,7 +82,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
liquidViscosity liquidViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

14
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.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) 2013-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -57,12 +57,12 @@ addToRunTimeSelectionTable
thixotropicViscosity::thixotropicViscosity thixotropicViscosity::thixotropicViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
) )
: :
filmViscosityModel(typeName, owner, dict, mu), filmViscosityModel(typeName, film, dict, mu),
a_("a", dimless/dimTime, coeffDict_), a_("a", dimless/dimTime, coeffDict_),
b_("b", dimless, coeffDict_), b_("b", dimless, coeffDict_),
d_("d", dimless, coeffDict_), d_("d", dimless, coeffDict_),
@ -75,12 +75,12 @@ thixotropicViscosity::thixotropicViscosity
IOobject IOobject
( (
typeName + ":lambda", typeName + ":lambda",
owner.regionMesh().time().timeName(), film.regionMesh().time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
owner.regionMesh() film.regionMesh()
) )
{ {
lambda_.min(1.0); lambda_.min(1.0);
@ -115,7 +115,7 @@ void thixotropicViscosity::correct
const volScalarField& deltaRho = film.deltaRho(); const volScalarField& deltaRho = film.deltaRho();
const surfaceScalarField& phi = film.phi(); const surfaceScalarField& phi = film.phi();
const volScalarField& alpha = film.alpha(); const volScalarField& alpha = film.alpha();
const Time& runTime = this->owner().regionMesh().time(); const Time& runTime = this->film().regionMesh().time();
// Shear rate // Shear rate
volScalarField gDot("gDot", alpha*mag(U - Uw)/(delta + film.deltaSmall())); volScalarField gDot("gDot", alpha*mag(U - Uw)/(delta + film.deltaSmall()));

4
src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.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) 2013-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -140,7 +140,7 @@ public:
//- Construct from surface film model //- Construct from surface film model
thixotropicViscosity thixotropicViscosity
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict, const dictionary& dict,
volScalarField& mu volScalarField& mu
); );

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

@ -51,11 +51,11 @@ addToRunTimeSelectionTable
constantHeatTransfer::constantHeatTransfer constantHeatTransfer::constantHeatTransfer
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
heatTransferModel(typeName, owner, dict), heatTransferModel(typeName, film, dict),
c0_(readScalar(coeffDict_.lookup("c0"))) c0_(readScalar(coeffDict_.lookup("c0")))
{} {}
@ -81,13 +81,13 @@ tmp<volScalarField> constantHeatTransfer::h() const
IOobject IOobject
( (
"htc", "htc",
owner_.time().timeName(), filmModel_.time().timeName(),
owner_.regionMesh(), filmModel_.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE, IOobject::NO_WRITE,
false false
), ),
owner_.regionMesh(), filmModel_.regionMesh(),
dimensionedScalar dimensionedScalar
( (
"c0", "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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

10
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,21 +43,21 @@ defineRunTimeSelectionTable(heatTransferModel, dictionary);
heatTransferModel::heatTransferModel heatTransferModel::heatTransferModel
( (
surfaceFilmModel& owner surfaceFilmModel& film
) )
: :
filmSubModelBase(owner) filmSubModelBase(film)
{} {}
heatTransferModel::heatTransferModel heatTransferModel::heatTransferModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmSubModelBase(owner, dict, typeName, modelType) filmSubModelBase(film, dict, typeName, modelType)
{} {}

12
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,22 +81,22 @@ public:
heatTransferModel, heatTransferModel,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (film, dict)
); );
// Constructors // Constructors
//- Construct null //- Construct null
heatTransferModel(surfaceFilmModel& owner); heatTransferModel(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
heatTransferModel heatTransferModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

20
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -52,36 +52,36 @@ addToRunTimeSelectionTable
mappedConvectiveHeatTransfer::mappedConvectiveHeatTransfer mappedConvectiveHeatTransfer::mappedConvectiveHeatTransfer
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
heatTransferModel(owner), heatTransferModel(film),
htcConvPrimary_ htcConvPrimary_
( (
IOobject IOobject
( (
"htcConv", "htcConv",
owner.time().timeName(), film.time().timeName(),
owner.primaryMesh(), film.primaryMesh(),
IOobject::MUST_READ, IOobject::MUST_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
owner.primaryMesh() film.primaryMesh()
), ),
htcConvFilm_ htcConvFilm_
( (
IOobject IOobject
( (
htcConvPrimary_.name(), // must have same name as above for mapping htcConvPrimary_.name(), // must have same name as above for mapping
owner.time().timeName(), film.time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
owner.regionMesh(), film.regionMesh(),
dimensionedScalar("zero", dimMass/pow3(dimTime)/dimTemperature, 0.0), dimensionedScalar("zero", dimMass/pow3(dimTime)/dimTemperature, 0.0),
owner.mappedPushedFieldPatchTypes<scalar>() film.mappedPushedFieldPatchTypes<scalar>()
) )
{ {
// Update the primary-side convective heat transfer coefficient // Update the primary-side convective heat transfer coefficient

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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

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

@ -44,11 +44,11 @@ addToRunTimeSelectionTable(phaseChangeModel, noPhaseChange, dictionary);
noPhaseChange::noPhaseChange noPhaseChange::noPhaseChange
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& const dictionary&
) )
: :
phaseChangeModel(owner) phaseChangeModel(film)
{} {}

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-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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(surfaceFilmModel& owner, const dictionary& dict); noPhaseChange(surfaceFilmModel& film, 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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,10 +43,10 @@ defineRunTimeSelectionTable(phaseChangeModel, dictionary);
phaseChangeModel::phaseChangeModel phaseChangeModel::phaseChangeModel
( (
surfaceFilmModel& owner surfaceFilmModel& film
) )
: :
filmSubModelBase(owner), filmSubModelBase(film),
latestMassPC_(0.0), latestMassPC_(0.0),
totalMassPC_(0.0) totalMassPC_(0.0)
{} {}
@ -55,11 +55,11 @@ phaseChangeModel::phaseChangeModel
phaseChangeModel::phaseChangeModel phaseChangeModel::phaseChangeModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
filmSubModelBase(owner, dict, typeName, modelType), filmSubModelBase(film, dict, typeName, modelType),
latestMassPC_(0.0), latestMassPC_(0.0),
totalMassPC_(0.0) totalMassPC_(0.0)
{} {}
@ -114,7 +114,7 @@ void phaseChangeModel::info(Ostream& os) const
{ {
const scalar massPCRate = const scalar massPCRate =
returnReduce(latestMassPC_, sumOp<scalar>()) returnReduce(latestMassPC_, sumOp<scalar>())
/owner_.time().deltaTValue(); /filmModel_.time().deltaTValue();
scalar phaseChangeMass = getModelProperty<scalar>("phaseChangeMass"); scalar phaseChangeMass = getModelProperty<scalar>("phaseChangeMass");
phaseChangeMass += returnReduce(totalMassPC_, sumOp<scalar>()); phaseChangeMass += returnReduce(totalMassPC_, sumOp<scalar>());

12
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -93,22 +93,22 @@ public:
phaseChangeModel, phaseChangeModel,
dictionary, dictionary,
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
), ),
(owner, dict) (film, dict)
); );
// Constructors // Constructors
//- Construct null //- Construct null
phaseChangeModel(surfaceFilmModel& owner); phaseChangeModel(surfaceFilmModel& film);
//- Construct from type name, dictionary and surface film model //- Construct from type name, dictionary and surface film model
phaseChangeModel phaseChangeModel
( (
const word& modelType, const word& modelType,
surfaceFilmModel& owner, surfaceFilmModel& film,
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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );

20
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.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) 2013-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,11 +51,11 @@ addToRunTimeSelectionTable
solidification::solidification solidification::solidification
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
phaseChangeModel(typeName, owner, dict), phaseChangeModel(typeName, film, dict),
T0_(readScalar(coeffDict_.lookup("T0"))), T0_(readScalar(coeffDict_.lookup("T0"))),
maxSolidificationFrac_ maxSolidificationFrac_
( (
@ -76,12 +76,12 @@ solidification::solidification
IOobject IOobject
( (
typeName + ":mass", typeName + ":mass",
owner.regionMesh().time().timeName(), film.regionMesh().time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
owner.regionMesh(), film.regionMesh(),
dimensionedScalar("zero", dimMass, 0.0), dimensionedScalar("zero", dimMass, 0.0),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
), ),
@ -90,12 +90,12 @@ solidification::solidification
IOobject IOobject
( (
typeName + ":thickness", typeName + ":thickness",
owner.regionMesh().time().timeName(), film.regionMesh().time().timeName(),
owner.regionMesh(), film.regionMesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
owner.regionMesh(), film.regionMesh(),
dimensionedScalar("zero", dimLength, 0.0), dimensionedScalar("zero", dimLength, 0.0),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
) )
@ -128,7 +128,7 @@ void solidification::correctModel
maxSolidificationFrac_, maxSolidificationFrac_,
( (
maxSolidificationRate_ maxSolidificationRate_
*owner_.regionMesh().time().deltaTValue() *filmModel_.regionMesh().time().deltaTValue()
).value() ).value()
); );

4
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.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) 2013-2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -96,7 +96,7 @@ public:
// Constructors // Constructors
//- Construct from surface film model //- Construct from surface film model
solidification(surfaceFilmModel& owner, const dictionary& dict); solidification(surfaceFilmModel& film, const dictionary& dict);
//- Destructor //- Destructor

6
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -70,11 +70,11 @@ scalar standardPhaseChange::Sh
standardPhaseChange::standardPhaseChange standardPhaseChange::standardPhaseChange
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
) )
: :
phaseChangeModel(typeName, owner, dict), phaseChangeModel(typeName, film, dict),
deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))), deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))),
L_(readScalar(coeffDict_.lookup("L"))), L_(readScalar(coeffDict_.lookup("L"))),
TbFactor_(coeffDict_.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 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
( (
surfaceFilmModel& owner, surfaceFilmModel& film,
const dictionary& dict const dictionary& dict
); );