From 09620ce0edfa29c4311cd132d83a4981ca5afa8a Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 28 Mar 2017 08:30:46 +0100 Subject: [PATCH] regionModels: Renamed owner->region in regionModel and owner->film in surfaceFilmModel This update does not change the operation or controls of the regionModels, it is to aid understanding of the code. --- .../regionModelFunctionObject.C | 12 ++--- .../regionModelFunctionObject.H | 16 +++---- .../regionModelFunctionObjectList.C | 14 +++--- .../regionModelFunctionObjectList.H | 18 ++++---- .../regionModelFunctionObjectListI.H | 10 ++--- .../regionModelFunctionObjectNew.C | 6 +-- .../submodels/filmSubModelBase.C | 22 +++++----- .../submodels/filmSubModelBase.H | 24 +++++----- .../submodels/filmSubModelBaseI.H | 10 ++--- .../submodels/filmSubModelBaseTemplates.C | 8 ++-- .../constantFilmThermo/constantFilmThermo.C | 36 +++++++-------- .../constantFilmThermo/constantFilmThermo.H | 4 +- .../filmThermoModel/filmThermoModel.C | 10 ++--- .../filmThermoModel/filmThermoModel.H | 12 ++--- .../liquidFilmThermo/liquidFilmThermo.C | 44 +++++++++---------- .../liquidFilmThermo/liquidFilmThermo.H | 4 +- .../filmTurbulenceModel/filmTurbulenceModel.C | 10 ++--- .../filmTurbulenceModel/filmTurbulenceModel.H | 12 ++--- .../filmTurbulenceModel/laminar/laminar.C | 20 ++++----- .../filmTurbulenceModel/laminar/laminar.H | 4 +- .../contactAngleForce/contactAngleForce.C | 42 +++++++++--------- .../contactAngleForce/contactAngleForce.H | 2 +- .../distributionContactAngleForce.C | 12 ++--- .../distributionContactAngleForce.H | 2 +- .../temperatureDependentContactAngleForce.C | 14 +++--- .../temperatureDependentContactAngleForce.H | 2 +- .../submodels/kinematic/force/force/force.C | 10 ++--- .../submodels/kinematic/force/force/force.H | 12 ++--- .../kinematic/force/forceList/forceList.C | 8 ++-- .../kinematic/force/forceList/forceList.H | 6 +-- .../thermocapillaryForce.C | 8 ++-- .../thermocapillaryForce.H | 4 +- .../BrunDrippingInjection.C | 10 ++--- .../BrunDrippingInjection.H | 4 +- .../curvatureSeparation/curvatureSeparation.C | 22 +++++----- .../curvatureSeparation/curvatureSeparation.H | 4 +- .../drippingInjection/drippingInjection.C | 10 ++--- .../drippingInjection/drippingInjection.H | 4 +- .../injectionModel/injectionModel.C | 10 ++--- .../injectionModel/injectionModel.H | 12 ++--- .../injectionModelList/injectionModelList.C | 22 +++++----- .../injectionModelList/injectionModelList.H | 6 +-- .../patchInjection/patchInjection.C | 16 +++---- .../patchInjection/patchInjection.H | 4 +- .../constantRadiation/constantRadiation.C | 28 ++++++------ .../constantRadiation/constantRadiation.H | 4 +- .../filmRadiationModel/filmRadiationModel.C | 10 ++--- .../filmRadiationModel/filmRadiationModel.H | 12 ++--- .../noRadiation/noRadiation.C | 10 ++--- .../noRadiation/noRadiation.H | 4 +- .../primaryRadiation/primaryRadiation.C | 22 +++++----- .../primaryRadiation/primaryRadiation.H | 4 +- .../standardRadiation/standardRadiation.C | 30 ++++++------- .../standardRadiation/standardRadiation.H | 4 +- .../ArrheniusViscosity/ArrheniusViscosity.C | 8 ++-- .../ArrheniusViscosity/ArrheniusViscosity.H | 4 +- .../constantViscosity/constantViscosity.C | 6 +-- .../constantViscosity/constantViscosity.H | 4 +- .../filmViscosityModel/filmViscosityModel.C | 6 +-- .../filmViscosityModel/filmViscosityModel.H | 10 ++--- .../liquidViscosity/liquidViscosity.C | 6 +-- .../liquidViscosity/liquidViscosity.H | 4 +- .../thixotropicViscosity.C | 14 +++--- .../thixotropicViscosity.H | 4 +- .../constantHeatTransfer.C | 10 ++--- .../constantHeatTransfer.H | 4 +- .../heatTransferModel/heatTransferModel.C | 10 ++--- .../heatTransferModel/heatTransferModel.H | 12 ++--- .../mappedConvectiveHeatTransfer.C | 20 ++++----- .../mappedConvectiveHeatTransfer.H | 4 +- .../noPhaseChange/noPhaseChange.C | 4 +- .../noPhaseChange/noPhaseChange.H | 4 +- .../phaseChangeModel/phaseChangeModel.C | 12 ++--- .../phaseChangeModel/phaseChangeModel.H | 12 ++--- .../solidification/solidification.C | 20 ++++----- .../solidification/solidification.H | 4 +- .../standardPhaseChange/standardPhaseChange.C | 6 +-- .../standardPhaseChange/standardPhaseChange.H | 4 +- 78 files changed, 431 insertions(+), 431 deletions(-) diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C index 9aa69fc37b..474ef1f9ea 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C @@ -41,11 +41,11 @@ namespace regionModels Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject ( - regionModel& owner + regionModel& region ) : dict_(dictionary::null), - owner_(owner), + regionModel_(region), modelType_("modelType") {} @@ -53,12 +53,12 @@ Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject ( const dictionary& dict, - regionModel& owner, + regionModel& region, const word& type ) : dict_(dict), - owner_(owner), + regionModel_(region), modelType_(type) {} @@ -69,7 +69,7 @@ Foam::regionModels::regionModelFunctionObject::regionModelFunctionObject ) : dict_(rmfo.dict_), - owner_(rmfo.owner_), + regionModel_(rmfo.regionModel_), modelType_(rmfo.modelType_) {} @@ -88,7 +88,7 @@ void Foam::regionModels::regionModelFunctionObject::preEvolveRegion() void Foam::regionModels::regionModelFunctionObject::postEvolveRegion() { - if (owner_.regionMesh().time().writeTime()) + if (regionModel_.regionMesh().time().writeTime()) { write(); } diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H index 77e56b14d1..2f96d310ca 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ protected: dictionary dict_; //- Reference to the region model - regionModel& owner_; + regionModel& regionModel_; //- Model type name word modelType_; @@ -83,22 +83,22 @@ public: dictionary, ( const dictionary& dict, - regionModel& owner + regionModel& region ), - (dict, owner) + (dict, region) ); // Constructors - //- Construct null from owner - regionModelFunctionObject(regionModel& owner); + //- Construct null from region + regionModelFunctionObject(regionModel& region); //- Construct from dictionary regionModelFunctionObject ( const dictionary& dict, - regionModel& owner, + regionModel& region, const word& modelType ); @@ -123,7 +123,7 @@ public: static autoPtr New ( const dictionary& dict, - regionModel& owner, + regionModel& region, const word& modelType ); diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C index 366ec496ba..d3b6bf0c4c 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,24 +29,24 @@ License Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList ( - regionModel& owner + regionModel& region ) : PtrList(), - owner_(owner), + regionModel_(region), dict_(dictionary::null) {} Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList ( - regionModel& owner, + regionModel& region, const dictionary& dict, const bool readFields ) : PtrList(), - owner_(owner), + regionModel_(region), dict_(dict) { if (readFields) @@ -69,7 +69,7 @@ Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList regionModelFunctionObject::New ( dict, - owner, + region, modelName ) ); @@ -89,7 +89,7 @@ Foam::regionModels::regionModelFunctionObjectList::regionModelFunctionObjectList ) : PtrList(cfol), - owner_(cfol.owner_), + regionModel_(cfol.regionModel_), dict_(cfol.dict_) {} diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H index 22488f18c8..159ee4714d 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,8 +60,8 @@ protected: // Protected Data - //- Reference to the owner region model - regionModel& owner_; + //- Reference to the region region model + regionModel& regionModel_; //- Dictionary const dictionary dict_; @@ -72,12 +72,12 @@ public: // Constructors //- Null constructor - regionModelFunctionObjectList(regionModel& owner); + regionModelFunctionObjectList(regionModel& region); //- Construct from mesh regionModelFunctionObjectList ( - regionModel& owner, + regionModel& region, const dictionary& dict, const bool readFields = true ); @@ -97,11 +97,11 @@ public: // Access - //- Return const access to the cloud owner - inline const regionModel& owner() const; + //- Return const access to the cloud region + inline const regionModel& region() const; - //- Return refernce to the cloud owner - inline regionModel& owner(); + //- Return refernce to the cloud region + inline regionModel& region(); //- Return the forces dictionary inline const dictionary& dict() const; diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H index a0a90d0f67..d65d19cc25 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectListI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,16 +24,16 @@ License \*---------------------------------------------------------------------------*/ inline const Foam::regionModels::regionModel& -Foam::regionModels::regionModelFunctionObjectList::owner() const +Foam::regionModels::regionModelFunctionObjectList::region() const { - return owner_; + return regionModel_; } inline Foam::regionModels::regionModel& -Foam::regionModels::regionModelFunctionObjectList::owner() +Foam::regionModels::regionModelFunctionObjectList::region() { - return owner_; + return regionModel_; } diff --git a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C index 3b41bc8d3b..a1122125c3 100644 --- a/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C +++ b/src/regionModels/regionModel/regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Foam::autoPtr Foam::regionModels::regionModelFunctionObject::New ( const dictionary& dict, - regionModel& owner, + regionModel& region, const word& modelName ) { @@ -58,7 +58,7 @@ Foam::regionModels::regionModelFunctionObject::New cstrIter() ( dict.subDict(modelName), - owner + region ) ); } diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C index 88bef475a6..479836a93a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,16 +36,16 @@ namespace surfaceFilmModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -filmSubModelBase::filmSubModelBase(surfaceFilmModel& owner) +filmSubModelBase::filmSubModelBase(surfaceFilmModel& film) : - subModelBase(owner.outputProperties()), - owner_(owner) + subModelBase(film.outputProperties()), + filmModel_(film) {} filmSubModelBase::filmSubModelBase ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, const word& baseName, const word& modelType, @@ -54,20 +54,20 @@ filmSubModelBase::filmSubModelBase : subModelBase ( - owner.outputProperties(), + film.outputProperties(), dict, baseName, modelType, dictExt ), - owner_(owner) + filmModel_(film) {} filmSubModelBase::filmSubModelBase ( const word& modelName, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, const word& baseName, const word& modelType @@ -76,12 +76,12 @@ filmSubModelBase::filmSubModelBase subModelBase ( modelName, - owner.outputProperties(), + film.outputProperties(), dict, baseName, modelType ), - owner_(owner) + filmModel_(film) {} @@ -95,7 +95,7 @@ filmSubModelBase::~filmSubModelBase() bool filmSubModelBase::writeTime() const { - return active() && owner_.time().writeTime(); + return active() && filmModel_.time().writeTime(); } diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H index cc4e3c090b..9160fa2469 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,8 +60,8 @@ protected: // Protected data - //- Reference to the owner surface film model - surfaceFilmModel& owner_; + //- Reference to the film surface film model + surfaceFilmModel& filmModel_; public: @@ -69,23 +69,23 @@ public: // Constructors //- Construct null - filmSubModelBase(surfaceFilmModel& owner); + filmSubModelBase(surfaceFilmModel& film); - //- Construct from owner film wihout name + //- Construct from film film wihout name filmSubModelBase ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, const word& baseName, const word& modelType, const word& dictExt = "Coeffs" ); - //- Construct from owner film with name + //- Construct from film film with name filmSubModelBase ( const word& modelName, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, const word& baseName, const word& modelType @@ -103,11 +103,11 @@ public: //- Flag to indicate when to write a property virtual bool writeTime() const; - //- Return const access to the owner surface film model - inline const surfaceFilmModel& owner() const; + //- Return const access to the film surface film model + inline const surfaceFilmModel& film() const; - //- Return the reference to the owner surface film model - inline surfaceFilmModel& owner(); + //- Return the reference to the film surface film model + inline surfaceFilmModel& film(); template inline const FilmType& filmType() const; diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H index c9149735cd..2dced7e4f5 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- 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_; } diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C index c9e8aa719b..28011a63e3 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,15 +35,15 @@ namespace surfaceFilmModels template const FilmType& filmSubModelBase::filmType() const { - if (!isA(owner_)) + if (!isA(filmModel_)) { FatalErrorInFunction << "Model " << this->modelType() << " requested film type " - << FilmType::typeName << " but film is type " << owner_.type() + << FilmType::typeName << " but film is type " << filmModel_.type() << abort(FatalError); } - return refCast(owner_); + return refCast(filmModel_); } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C index 9c3845102f..bae1439ce3 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,11 +61,11 @@ void constantFilmThermo::init(thermoData& td) constantFilmThermo::constantFilmThermo ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmThermoModel(typeName, owner, dict), + filmThermoModel(typeName, film, dict), name_(coeffDict_.lookup("specie")), rho0_("rho0"), mu0_("mu0"), @@ -264,12 +264,12 @@ tmp constantFilmThermo::rho() const IOobject ( type() + ':' + rho0_.name_, - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimDensity, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -291,12 +291,12 @@ tmp constantFilmThermo::mu() const IOobject ( type() + ':' + mu0_.name_, - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimPressure*dimTime, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -318,12 +318,12 @@ tmp constantFilmThermo::sigma() const IOobject ( type() + ':' + sigma0_.name_, - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimMass/sqr(dimTime), 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -345,12 +345,12 @@ tmp constantFilmThermo::Cp() const IOobject ( type() + ':' + Cp0_.name_, - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -372,12 +372,12 @@ tmp constantFilmThermo::kappa() const IOobject ( type() + ':' + kappa0_.name_, - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H index 10822db6e9..e5ef5baf90 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,7 +140,7 @@ public: //- Construct from surface film model and dictionary constantFilmThermo ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C index 173e512bfa..f11b3399aa 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,21 +43,21 @@ defineRunTimeSelectionTable(filmThermoModel, dictionary); filmThermoModel::filmThermoModel ( - surfaceFilmModel& owner + surfaceFilmModel& film ) : - filmSubModelBase(owner) + filmSubModelBase(film) {} filmThermoModel::filmThermoModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmSubModelBase(owner, dict, typeName, modelType) + filmSubModelBase(film, dict, typeName, modelType) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H index 86ce265ee3..d6a4c296a1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/filmThermoModel/filmThermoModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,22 +81,22 @@ public: filmThermoModel, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ), - (owner, dict) + (film, dict) ); // Constructors //- Construct null - filmThermoModel(surfaceFilmModel& owner); + filmThermoModel(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model filmThermoModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); @@ -106,7 +106,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C index d70b14bbf5..702a9336e0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C @@ -55,17 +55,17 @@ addToRunTimeSelectionTable const thermoSingleLayer& liquidFilmThermo::thermoFilm() const { - if (!isA(owner_)) + if (!isA(filmModel_)) { FatalErrorInFunction << "Thermo model requires a " << thermoSingleLayer::typeName << " 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 " << "pressure and temperature" << exit(FatalError); } - return refCast(owner_); + return refCast(filmModel_); } @@ -78,13 +78,13 @@ void liquidFilmThermo::initLiquid(const dictionary& dict) dict.lookup("liquid") >> name_; - if (owner_.primaryMesh().foundObject("SLGThermo")) + if (filmModel_.primaryMesh().foundObject("SLGThermo")) { // retrieve from film thermo ownLiquid_ = false; const SLGThermo& thermo = - owner_.primaryMesh().lookupObject("SLGThermo"); + filmModel_.primaryMesh().lookupObject("SLGThermo"); label id = thermo.liquidId(name_); liquidPtr_ = &thermo.liquids().properties()[id]; } @@ -103,11 +103,11 @@ void liquidFilmThermo::initLiquid(const dictionary& dict) liquidFilmThermo::liquidFilmThermo ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmThermoModel(typeName, owner, dict), + filmThermoModel(typeName, film, dict), name_("unknown_liquid"), liquidPtr_(nullptr), ownLiquid_(false), @@ -245,12 +245,12 @@ tmp liquidFilmThermo::rho() const IOobject ( type() + ":rho", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimDensity, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -293,12 +293,12 @@ tmp liquidFilmThermo::mu() const IOobject ( type() + ":mu", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimPressure*dimTime, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -341,12 +341,12 @@ tmp liquidFilmThermo::sigma() const IOobject ( type() + ":sigma", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimMass/sqr(dimTime), 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -389,12 +389,12 @@ tmp liquidFilmThermo::Cp() const IOobject ( type() + ":Cp", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimEnergy/dimMass/dimTemperature, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) @@ -437,12 +437,12 @@ tmp liquidFilmThermo::kappa() const IOobject ( type() + ":kappa", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("0", dimPower/dimLength/dimTemperature, 0.0), extrapolatedCalculatedFvPatchScalarField::typeName ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H index 6c952e4359..20863e6fda 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,7 @@ public: //- Construct from surface film model and dictionary liquidFilmThermo ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C index 1d17112954..90e1df5780 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,20 +41,20 @@ defineRunTimeSelectionTable(filmTurbulenceModel, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -filmTurbulenceModel::filmTurbulenceModel(surfaceFilmModel& owner) +filmTurbulenceModel::filmTurbulenceModel(surfaceFilmModel& film) : - filmSubModelBase(owner) + filmSubModelBase(film) {} filmTurbulenceModel::filmTurbulenceModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmSubModelBase(owner, dict, typeName, modelType) + filmSubModelBase(film, dict, typeName, modelType) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H index 31928cd85f..cb35b71f90 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,22 +83,22 @@ public: filmTurbulenceModel, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ), - (owner, dict) + (film, dict) ); // Constructors //- Construct null - filmTurbulenceModel(surfaceFilmModel& owner); + filmTurbulenceModel(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model filmTurbulenceModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); @@ -108,7 +108,7 @@ public: //- Return a reference to the selected injection model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C index 188c12d06b..44046a183a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C @@ -51,11 +51,11 @@ addToRunTimeSelectionTable(filmTurbulenceModel, laminar, dictionary); laminar::laminar ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmTurbulenceModel(type(), owner, dict), + filmTurbulenceModel(type(), film, dict), Cf_(readScalar(coeffDict_.lookup("Cf"))) {} @@ -77,19 +77,19 @@ tmp laminar::Us() const IOobject ( typeName + ":Us", - owner_.regionMesh().time().timeName(), - owner_.regionMesh(), + filmModel_.regionMesh().time().timeName(), + filmModel_.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedVector("zero", dimVelocity, Zero), extrapolatedCalculatedFvPatchVectorField::typeName ) ); // apply quadratic profile - tUs.ref() = Foam::sqrt(2.0)*owner_.U(); + tUs.ref() = Foam::sqrt(2.0)*filmModel_.U(); tUs.ref().correctBoundaryConditions(); return tUs; @@ -105,12 +105,12 @@ tmp laminar::mut() const IOobject ( typeName + ":mut", - owner_.regionMesh().time().timeName(), - owner_.regionMesh(), + filmModel_.regionMesh().time().timeName(), + filmModel_.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedScalar("zero", dimMass/dimLength/dimTime, 0.0) ) ); @@ -125,7 +125,7 @@ tmp laminar::Su(volVectorField& U) const { // local reference to film model const kinematicSingleLayer& film = - static_cast(owner_); + static_cast(filmModel_); // local references to film fields const volScalarField& mu = film.mu(); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H index ceaecabb25..183e5fd2cb 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,7 +80,7 @@ public: // Constructors //- Construct from surface film model - laminar(surfaceFilmModel& owner, const dictionary& dict); + laminar(surfaceFilmModel& film, const dictionary& dict); //- Destructor diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C index 2271fde826..c91d299eb4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C @@ -51,7 +51,7 @@ void contactAngleForce::initialise() if (zeroForcePatches.size()) { - const polyBoundaryMesh& pbm = owner_.regionMesh().boundaryMesh(); + const polyBoundaryMesh& pbm = filmModel_.regionMesh().boundaryMesh(); scalar dLim = readScalar(coeffDict_.lookup("zeroForceDistance")); Info<< " Assigning zero contact force within " << dLim @@ -66,19 +66,19 @@ void contactAngleForce::initialise() } // Temporary implementation until run-time selection covers this case - patchDistMethods::meshWave dist(owner_.regionMesh(), patchIDs); + patchDistMethods::meshWave dist(filmModel_.regionMesh(), patchIDs); volScalarField y ( IOobject ( "y", - owner_.regionMesh().time().timeName(), - owner_.regionMesh(), + filmModel_.regionMesh().time().timeName(), + filmModel_.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE, false ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedScalar("y", dimLength, GREAT) ); dist.correct(y); @@ -93,23 +93,23 @@ void contactAngleForce::initialise() contactAngleForce::contactAngleForce ( const word& typeName, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - force(typeName, owner, dict), + force(typeName, film, dict), Ccf_(readScalar(coeffDict_.lookup("Ccf"))), mask_ ( IOobject ( typeName + ":contactForceMask", - owner_.time().timeName(), - owner_.regionMesh(), + filmModel_.time().timeName(), + filmModel_.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedScalar("mask", dimless, 1.0) ) { @@ -134,25 +134,25 @@ tmp contactAngleForce::correct(volVectorField& U) IOobject ( typeName + ":contactForce", - owner_.time().timeName(), - owner_.regionMesh(), + filmModel_.time().timeName(), + filmModel_.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedVector("zero", dimForce/dimArea, Zero) ) ); vectorField& force = tForce.ref().primitiveFieldRef(); - const labelUList& own = owner_.regionMesh().owner(); - const labelUList& nbr = owner_.regionMesh().neighbour(); + const labelUList& own = filmModel_.regionMesh().owner(); + const labelUList& nbr = filmModel_.regionMesh().neighbour(); - const scalarField& magSf = owner_.magSf(); + const scalarField& magSf = filmModel_.magSf(); - const volScalarField& alpha = owner_.alpha(); - const volScalarField& sigma = owner_.sigma(); + const volScalarField& alpha = filmModel_.alpha(); + const volScalarField& sigma = filmModel_.sigma(); const tmp ttheta = theta(); const volScalarField& theta = ttheta(); @@ -176,7 +176,7 @@ tmp contactAngleForce::correct(volVectorField& U) if (celli != -1 && mask_[celli] > 0.5) { - const scalar invDx = owner_.regionMesh().deltaCoeffs()[facei]; + const scalar invDx = filmModel_.regionMesh().deltaCoeffs()[facei]; const vector n = gradAlpha[celli]/(mag(gradAlpha[celli]) + ROOTVSMALL); const scalar cosTheta = cos(degToRad(theta[celli])); @@ -186,7 +186,7 @@ tmp contactAngleForce::correct(volVectorField& U) forAll(alpha.boundaryField(), patchi) { - if (!owner_.isCoupledPatch(patchi)) + if (!filmModel_.isCoupledPatch(patchi)) { const fvPatchField& alphaf = alpha.boundaryField()[patchi]; const fvPatchField& maskf = mask_.boundaryField()[patchi]; @@ -215,7 +215,7 @@ tmp contactAngleForce::correct(volVectorField& U) force /= magSf; - if (owner_.regionMesh().time().writeTime()) + if (filmModel_.regionMesh().time().writeTime()) { tForce().write(); } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H index 4d46cb6b01..4d2e86e174 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H @@ -96,7 +96,7 @@ public: contactAngleForce ( const word& typeName, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C index c245bb2384..c4195ad2b5 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C @@ -45,11 +45,11 @@ addToRunTimeSelectionTable(force, distributionContactAngleForce, dictionary); distributionContactAngleForce::distributionContactAngleForce ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - contactAngleForce(typeName, owner, dict), + contactAngleForce(typeName, film, dict), rndGen_(label(0), -1), distribution_ ( @@ -79,10 +79,10 @@ tmp distributionContactAngleForce::theta() const IOobject ( typeName + ":theta", - owner_.time().timeName(), - owner_.regionMesh() + filmModel_.time().timeName(), + filmModel_.regionMesh() ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedScalar("0", dimless, 0) ) ); @@ -97,7 +97,7 @@ tmp distributionContactAngleForce::theta() const forAll(theta.boundaryField(), patchi) { - if (!owner_.isCoupledPatch(patchi)) + if (!filmModel_.isCoupledPatch(patchi)) { fvPatchField& thetaf = theta.boundaryFieldRef()[patchi]; diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H index 7ad68e5b38..508b66ad6c 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H @@ -95,7 +95,7 @@ public: //- Construct from surface film model distributionContactAngleForce ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C index 9164fd64d5..1c7a51ad08 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C @@ -50,11 +50,11 @@ addToRunTimeSelectionTable temperatureDependentContactAngleForce::temperatureDependentContactAngleForce ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - contactAngleForce(typeName, owner, dict), + contactAngleForce(typeName, film, dict), thetaPtr_(Function1::New("theta", coeffDict_)) {} @@ -76,23 +76,23 @@ tmp temperatureDependentContactAngleForce::theta() const IOobject ( typeName + ":theta", - owner_.time().timeName(), - owner_.regionMesh() + filmModel_.time().timeName(), + filmModel_.regionMesh() ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedScalar("0", dimless, 0) ) ); volScalarField& theta = ttheta.ref(); - const volScalarField& T = owner_.T(); + const volScalarField& T = filmModel_.T(); theta.ref().field() = thetaPtr_->value(T()); forAll(theta.boundaryField(), patchi) { - if (!owner_.isCoupledPatch(patchi)) + if (!filmModel_.isCoupledPatch(patchi)) { theta.boundaryFieldRef()[patchi] = thetaPtr_->value(T.boundaryField()[patchi]); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H index 2c79e1b79b..780b2b3288 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H @@ -97,7 +97,7 @@ public: //- Construct from surface film model temperatureDependentContactAngleForce ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C index 976a04913a..472c8b21c0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,20 +41,20 @@ defineRunTimeSelectionTable(force, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -force::force(surfaceFilmModel& owner) +force::force(surfaceFilmModel& film) : - filmSubModelBase(owner) + filmSubModelBase(film) {} force::force ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmSubModelBase(owner, dict, typeName, modelType) + filmSubModelBase(film, dict, typeName, modelType) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H index 9ca13614ac..000b7d9c41 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,22 +82,22 @@ public: force, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ), - (owner, dict) + (film, dict) ); // Constructors //- Construct null - force(surfaceFilmModel& owner); + force(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model force ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); @@ -107,7 +107,7 @@ public: //- Return a reference to the selected force model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, const word& modelType ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C index 56a1454c46..ea63cc2334 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ namespace surfaceFilmModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -forceList::forceList(surfaceFilmModel& owner) +forceList::forceList(surfaceFilmModel& film) : PtrList() {} @@ -44,7 +44,7 @@ forceList::forceList(surfaceFilmModel& owner) forceList::forceList ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : @@ -59,7 +59,7 @@ forceList::forceList forAll(models, i) { - set(i, force::New(owner, dict, models[i])); + set(i, force::New(film, dict, models[i])); } } else diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H index e09dc14d71..bc6c28c1e2 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,12 +60,12 @@ public: // Constructors //- Construct null - forceList(surfaceFilmModel& owner); + forceList(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model forceList ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C index 19614cbcf9..799e68536b 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,11 +45,11 @@ addToRunTimeSelectionTable(force, thermocapillaryForce, dictionary); thermocapillaryForce::thermocapillaryForce ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - force(owner) + force(film) {} @@ -63,7 +63,7 @@ thermocapillaryForce::~thermocapillaryForce() tmp thermocapillaryForce::correct(volVectorField& U) { - const volScalarField& sigma = owner_.sigma(); + const volScalarField& sigma = filmModel_.sigma(); tmp tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume)); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H index 85e404f4b2..ee2f1a0b54 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ public: //- Construct from surface film model thermocapillaryForce ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.C index 611849316e..fd7fd0cc81 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,15 +45,15 @@ addToRunTimeSelectionTable(injectionModel, BrunDrippingInjection, dictionary); BrunDrippingInjection::BrunDrippingInjection ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - injectionModel(type(), owner, dict), + injectionModel(type(), film, dict), ubarStar_(coeffDict_.lookupOrDefault("ubarStar", 1.62208)), dCoeff_(coeffDict_.lookupOrDefault("dCoeff", 3.3)), 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 = - refCast(this->owner()); + refCast(this->film()); // Calculate available dripping mass tmp tsinAlpha(film.gNorm()/mag(film.g())); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H index 00f2344412..91ba6a84ec 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/BrunDrippingInjection/BrunDrippingInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,7 +118,7 @@ public: //- Construct from surface film model BrunDrippingInjection ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C index 72d49c774c..fb7ced6e9c 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,7 @@ tmp curvatureSeparation::calcInvR1 /* tmp tinvR1 ( - new volScalarField("invR1", fvc::div(owner().nHat())) + new volScalarField("invR1", fvc::div(film().nHat())) ); */ @@ -82,7 +82,7 @@ tmp curvatureSeparation::calcInvR1 // apply defined patch radii const scalar rMin = 1e-6; - const fvMesh& mesh = owner().regionMesh(); + const fvMesh& mesh = film().regionMesh(); const polyBoundaryMesh& pbm = mesh.boundaryMesh(); forAll(definedPatchRadii_, i) { @@ -115,7 +115,7 @@ tmp curvatureSeparation::calcCosAngle const surfaceScalarField& phi ) const { - const fvMesh& mesh = owner().regionMesh(); + const fvMesh& mesh = film().regionMesh(); const vectorField nf(mesh.Sf()/mesh.magSf()); const unallocLabelList& own = mesh.owner(); const unallocLabelList& nbr = mesh.neighbour(); @@ -220,15 +220,15 @@ tmp curvatureSeparation::calcCosAngle curvatureSeparation::curvatureSeparation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - injectionModel(type(), owner, dict), - gradNHat_(fvc::grad(owner.nHat())), + injectionModel(type(), film, dict), + gradNHat_(fvc::grad(film.nHat())), deltaByR1Min_(coeffDict_.lookupOrDefault("deltaByR1Min", 0.0)), definedPatchRadii_(), - magG_(mag(owner.g().value())), + magG_(mag(film.g().value())), gHat_(Zero) { if (magG_ < ROOTVSMALL) @@ -238,10 +238,10 @@ curvatureSeparation::curvatureSeparation << exit(FatalError); } - gHat_ = owner.g().value()/magG_; + gHat_ = film.g().value()/magG_; List> prIn(coeffDict_.lookup("definedPatchRadii")); - const wordList& allPatchNames = owner.regionMesh().boundaryMesh().names(); + const wordList& allPatchNames = film.regionMesh().boundaryMesh().names(); DynamicList> prData(allPatchNames.size()); @@ -284,7 +284,7 @@ void curvatureSeparation::correct ) { const kinematicSingleLayer& film = - refCast(this->owner()); + refCast(this->film()); const fvMesh& mesh = film.regionMesh(); const volScalarField& delta = film.delta(); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H index 26d8fa57a0..8d788ede24 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -121,7 +121,7 @@ public: //- Construct from surface film model curvatureSeparation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C index a429af6bec..47559956da 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,11 +50,11 @@ addToRunTimeSelectionTable(injectionModel, drippingInjection, dictionary); drippingInjection::drippingInjection ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - injectionModel(type(), owner, dict), + injectionModel(type(), film, dict), deltaStable_(readScalar(coeffDict_.lookup("deltaStable"))), particlesPerParcel_(readScalar(coeffDict_.lookup("particlesPerParcel"))), rndGen_(label(0), -1), @@ -66,7 +66,7 @@ drippingInjection::drippingInjection rndGen_ ) ), - diameter_(owner.regionMesh().nCells(), -1.0) + diameter_(film.regionMesh().nCells(), -1.0) {} @@ -86,7 +86,7 @@ void drippingInjection::correct ) { const kinematicSingleLayer& film = - refCast(this->owner()); + refCast(this->film()); const scalar pi = constant::mathematical::pi; diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H index e2e2d607e7..c6bc895c3a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,7 +105,7 @@ public: //- Construct from surface film model drippingInjection ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C index 12656a7300..585ed54ddc 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,9 +49,9 @@ void injectionModel::addToInjectedMass(const scalar dMass) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -injectionModel::injectionModel(surfaceFilmModel& owner) +injectionModel::injectionModel(surfaceFilmModel& film) : - filmSubModelBase(owner), + filmSubModelBase(film), injectedMass_(0.0) {} @@ -59,11 +59,11 @@ injectionModel::injectionModel(surfaceFilmModel& owner) injectionModel::injectionModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmSubModelBase(owner, dict, typeName, modelType), + filmSubModelBase(film, dict, typeName, modelType), injectedMass_(0.0) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H index b365ff737c..36d7a8bfd3 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModel/injectionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,23 +98,23 @@ public: injectionModel, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ), - (owner, dict) + (film, dict) ); // Constructors //- Construct null - injectionModel(surfaceFilmModel& owner); + injectionModel(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model injectionModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); @@ -124,7 +124,7 @@ public: //- Return a reference to the selected injection model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, const word& mdoelType ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C index f860276b7a..e33a5262a6 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,16 +36,16 @@ namespace surfaceFilmModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -injectionModelList::injectionModelList(surfaceFilmModel& owner) +injectionModelList::injectionModelList(surfaceFilmModel& film) : PtrList(), - filmSubModelBase(owner) + filmSubModelBase(film) {} injectionModelList::injectionModelList ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : @@ -53,12 +53,12 @@ injectionModelList::injectionModelList filmSubModelBase ( "injectionModelList", - owner, + film, dict, "injectionModelList", "injectionModelList" ), - massInjected_(owner.intCoupledPatchIDs().size(), 0.0) + massInjected_(film.intCoupledPatchIDs().size(), 0.0) { const wordList activeModels(dict.lookup("injectionModels")); @@ -77,7 +77,7 @@ injectionModelList::injectionModelList forAllConstIter(wordHashSet, models, iter) { const word& model = iter.key(); - set(i, injectionModel::New(owner, dict, model)); + set(i, injectionModel::New(film, dict, model)); i++; } } @@ -114,7 +114,7 @@ void injectionModelList::correct massToInject.correctBoundaryConditions(); diameterToInject.correctBoundaryConditions(); - const labelList& patchIDs = owner().intCoupledPatchIDs(); + const labelList& patchIDs = film().intCoupledPatchIDs(); forAll(patchIDs, i) { @@ -127,7 +127,7 @@ void injectionModelList::correct void injectionModelList::info(Ostream& os) { - const polyBoundaryMesh& pbm = owner().regionMesh().boundaryMesh(); + const polyBoundaryMesh& pbm = film().regionMesh().boundaryMesh(); scalar injectedMass = 0; scalarField patchInjectedMasses(pbm.size(), 0); @@ -157,7 +157,7 @@ void injectionModelList::info(Ostream& os) Pstream::listCombineGather(mass, plusEqOp()); mass += mass0; - const labelList& patchIDs = owner().intCoupledPatchIDs(); + const labelList& patchIDs = film().intCoupledPatchIDs(); forAll(patchIDs, i) { @@ -166,7 +166,7 @@ void injectionModelList::info(Ostream& os) << mass[i] << endl; } - if (owner().time().writeTime()) + if (film().time().writeTime()) { setBaseProperty("massInjected", mass); massInjected_ = 0.0; diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H index 0feb88aeef..ce98fac5c2 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/injectionModelList/injectionModelList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,12 +79,12 @@ public: // Constructors //- Construct null - injectionModelList(surfaceFilmModel& owner); + injectionModelList(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model injectionModelList ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C index cd0e6a2fb8..edd58b4004 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,14 +44,14 @@ addToRunTimeSelectionTable(injectionModel, patchInjection, dictionary); patchInjection::patchInjection ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - injectionModel(type(), owner, dict), + injectionModel(type(), film, dict), deltaStable_(coeffDict_.lookupOrDefault("deltaStable", 0.0)) { - const polyBoundaryMesh& pbm = owner.regionMesh().boundaryMesh(); + const polyBoundaryMesh& pbm = film.regionMesh().boundaryMesh(); patchIDs_.setSize(pbm.size()); if (coeffDict_.found("patches")) @@ -110,11 +110,11 @@ void patchInjection::correct // Do not correct if no patches selected if (!patchIDs_.size()) return; - const scalarField& delta = owner().delta(); - const scalarField& rho = owner().rho(); - const scalarField& magSf = owner().magSf(); + const scalarField& delta = film().delta(); + const scalarField& rho = film().rho(); + const scalarField& magSf = film().magSf(); - const polyBoundaryMesh& pbm = owner().regionMesh().boundaryMesh(); + const polyBoundaryMesh& pbm = film().regionMesh().boundaryMesh(); forAll(patchIDs_, pidi) { diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H index 1e1bc813f8..d0880c0711 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/patchInjection/patchInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,7 @@ public: // Constructors //- Construct from surface film model - patchInjection(surfaceFilmModel& owner, const dictionary& dict); + patchInjection(surfaceFilmModel& film, const dictionary& dict); //- Destructor diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C index 807ca3ad91..0dcb6ebe9c 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,34 +51,34 @@ addToRunTimeSelectionTable constantRadiation::constantRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmRadiationModel(typeName, owner, dict), + filmRadiationModel(typeName, film, dict), QrConst_ ( IOobject ( typeName + ":QrConst", - owner.time().timeName(), - owner.regionMesh(), + film.time().timeName(), + film.regionMesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE ), - owner.regionMesh() + film.regionMesh() ), mask_ ( IOobject ( typeName + ":mask", - owner.time().timeName(), - owner.regionMesh(), + film.time().timeName(), + film.regionMesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), - owner.regionMesh(), + film.regionMesh(), dimensionedScalar("one", dimless, 1.0) ), absorptivity_(readScalar(coeffDict_.lookup("absorptivity"))), @@ -110,23 +110,23 @@ tmp constantRadiation::Shs() IOobject ( typeName + ":Shs", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), 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_)) { scalarField& Shs = tShs.ref(); const scalarField& Qr = QrConst_; - const scalarField& alpha = owner_.alpha(); + const scalarField& alpha = filmModel_.alpha(); Shs = mask_*Qr*alpha*absorptivity_; } diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H index b1e3b536eb..76a2d9a771 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ public: //- Construct from surface film model and dictionary constantRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C index 34c8ffff1d..3b0dabe7d1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,20 +41,20 @@ defineRunTimeSelectionTable(filmRadiationModel, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -filmRadiationModel::filmRadiationModel(surfaceFilmModel& owner) +filmRadiationModel::filmRadiationModel(surfaceFilmModel& film) : - filmSubModelBase(owner) + filmSubModelBase(film) {} filmRadiationModel::filmRadiationModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmSubModelBase(owner, dict, typeName, modelType) + filmSubModelBase(film, dict, typeName, modelType) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H index b53dc65921..b73e91cf23 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,22 +81,22 @@ public: filmRadiationModel, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ), - (owner, dict) + (film, dict) ); // Constructors //- Construct null - filmRadiationModel(surfaceFilmModel& owner); + filmRadiationModel(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model filmRadiationModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); @@ -106,7 +106,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C index 1adcf93ae0..5dd84d7f6e 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C @@ -51,11 +51,11 @@ addToRunTimeSelectionTable noRadiation::noRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmRadiationModel(owner) + filmRadiationModel(film) {} @@ -80,12 +80,12 @@ tmp noRadiation::Shs() IOobject ( typeName + ":Shs", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0) ) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H index 5e6b373f0f..fa24e18c25 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,7 +77,7 @@ public: //- Construct from surface film model and dictionary noRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C index 55ea60d322..ec9236d802 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,24 +51,24 @@ addToRunTimeSelectionTable primaryRadiation::primaryRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmRadiationModel(typeName, owner, dict), + filmRadiationModel(typeName, film, dict), QinPrimary_ ( IOobject ( "Qin", // same name as Qin on primary region to enable mapping - owner.time().timeName(), - owner.regionMesh(), + film.time().timeName(), + film.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner.regionMesh(), + film.regionMesh(), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0), - owner.mappedPushedFieldPatchTypes() + film.mappedPushedFieldPatchTypes() ) {} @@ -97,19 +97,19 @@ tmp primaryRadiation::Shs() IOobject ( typeName + ":Shs", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0) ) ); scalarField& Shs = tShs.ref(); const scalarField& QinP = QinPrimary_; - const scalarField& alpha = owner_.alpha(); + const scalarField& alpha = filmModel_.alpha(); Shs = QinP*alpha; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H index b6568c5c21..55f9d1a828 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ public: //- Construct from surface film model and dictionary primaryRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C index d8525ce4a0..0c82cf5e33 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,36 +52,36 @@ addToRunTimeSelectionTable standardRadiation::standardRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmRadiationModel(typeName, owner, dict), + filmRadiationModel(typeName, film, dict), QinPrimary_ ( IOobject ( "Qin", // same name as Qin on primary region to enable mapping - owner.time().timeName(), - owner.regionMesh(), + film.time().timeName(), + film.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner.regionMesh(), + film.regionMesh(), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0), - owner.mappedPushedFieldPatchTypes() + film.mappedPushedFieldPatchTypes() ), QrNet_ ( IOobject ( "QrNet", - owner.time().timeName(), - owner.regionMesh(), + film.time().timeName(), + film.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner.regionMesh(), + film.regionMesh(), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0), zeroGradientFvPatchScalarField::typeName ), @@ -114,20 +114,20 @@ tmp standardRadiation::Shs() IOobject ( typeName + ":Shs", - owner().time().timeName(), - owner().regionMesh(), + film().time().timeName(), + film().regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner().regionMesh(), + film().regionMesh(), dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0) ) ); scalarField& Shs = tShs.ref(); const scalarField& QinP = QinPrimary_; - const scalarField& delta = owner_.delta(); - const scalarField& alpha = owner_.alpha(); + const scalarField& delta = filmModel_.delta(); + const scalarField& alpha = filmModel_.alpha(); Shs = beta_*QinP*alpha*(1.0 - exp(-kappaBar_*delta)); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H index b5b60facc9..8a4912bd52 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ public: //- Construct from surface film model and dictionary standardRadiation ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C index 22598e0140..76abe99b23 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,13 +51,13 @@ addToRunTimeSelectionTable ArrheniusViscosity::ArrheniusViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ) : - filmViscosityModel(typeName, owner, dict, mu), - viscosity_(filmViscosityModel::New(owner, coeffDict_, mu)), + filmViscosityModel(typeName, film, dict, mu), + viscosity_(filmViscosityModel::New(film, coeffDict_, mu)), k1_("k1", dimTemperature, coeffDict_), k2_("k2", dimTemperature, coeffDict_), Tref_("Tref", dimTemperature, coeffDict_) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H index ddeed31c45..94d726c314 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,7 +100,7 @@ public: //- Construct from surface film model ArrheniusViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C index d1f47f17c5..b3b489c42a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,12 +50,12 @@ addToRunTimeSelectionTable constantViscosity::constantViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ) : - filmViscosityModel(typeName, owner, dict, mu), + filmViscosityModel(typeName, film, dict, mu), mu0_("mu0", dimDynamicViscosity, coeffDict_) { mu_ == mu0_; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H index bca2c195d6..4b9f1aad40 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ public: //- Construct from surface film model constantViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C index d2f861ab96..6167655809 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,12 +44,12 @@ defineRunTimeSelectionTable(filmViscosityModel, dictionary); filmViscosityModel::filmViscosityModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ) : - filmSubModelBase(owner, dict, typeName, modelType), + filmSubModelBase(film, dict, typeName, modelType), mu_(mu) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H index 38a7272e07..e7bf66ea0a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/filmViscosityModel/filmViscosityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,11 +90,11 @@ public: filmViscosityModel, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ), - (owner, dict, mu) + (film, dict, mu) ); // Constructors @@ -103,7 +103,7 @@ public: filmViscosityModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ); @@ -114,7 +114,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C index 2aaad94c48..de00fbee45 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,12 +51,12 @@ addToRunTimeSelectionTable liquidViscosity::liquidViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ) : - filmViscosityModel(typeName, owner, dict, mu) + filmViscosityModel(typeName, film, dict, mu) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H index 8004c541fb..5b9e5d3ab0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/liquidViscosity/liquidViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ public: //- Construct from surface film model liquidViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C index 33a124b0f1..7a09b686ab 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,12 +57,12 @@ addToRunTimeSelectionTable thixotropicViscosity::thixotropicViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ) : - filmViscosityModel(typeName, owner, dict, mu), + filmViscosityModel(typeName, film, dict, mu), a_("a", dimless/dimTime, coeffDict_), b_("b", dimless, coeffDict_), d_("d", dimless, coeffDict_), @@ -75,12 +75,12 @@ thixotropicViscosity::thixotropicViscosity IOobject ( typeName + ":lambda", - owner.regionMesh().time().timeName(), - owner.regionMesh(), + film.regionMesh().time().timeName(), + film.regionMesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE ), - owner.regionMesh() + film.regionMesh() ) { lambda_.min(1.0); @@ -115,7 +115,7 @@ void thixotropicViscosity::correct const volScalarField& deltaRho = film.deltaRho(); const surfaceScalarField& phi = film.phi(); const volScalarField& alpha = film.alpha(); - const Time& runTime = this->owner().regionMesh().time(); + const Time& runTime = this->film().regionMesh().time(); // Shear rate volScalarField gDot("gDot", alpha*mag(U - Uw)/(delta + film.deltaSmall())); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H index 78661661a6..a25f75f8b5 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,7 +140,7 @@ public: //- Construct from surface film model thixotropicViscosity ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict, volScalarField& mu ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C index fb569694d8..605d126b00 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C @@ -51,11 +51,11 @@ addToRunTimeSelectionTable constantHeatTransfer::constantHeatTransfer ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - heatTransferModel(typeName, owner, dict), + heatTransferModel(typeName, film, dict), c0_(readScalar(coeffDict_.lookup("c0"))) {} @@ -81,13 +81,13 @@ tmp constantHeatTransfer::h() const IOobject ( "htc", - owner_.time().timeName(), - owner_.regionMesh(), + filmModel_.time().timeName(), + filmModel_.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE, false ), - owner_.regionMesh(), + filmModel_.regionMesh(), dimensionedScalar ( "c0", diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H index f8b1c60a26..b36eeb9a67 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ public: //- Construct from surface film model and dictionary constantHeatTransfer ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C index 6ec53f76cd..8fcff6baee 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,21 +43,21 @@ defineRunTimeSelectionTable(heatTransferModel, dictionary); heatTransferModel::heatTransferModel ( - surfaceFilmModel& owner + surfaceFilmModel& film ) : - filmSubModelBase(owner) + filmSubModelBase(film) {} heatTransferModel::heatTransferModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmSubModelBase(owner, dict, typeName, modelType) + filmSubModelBase(film, dict, typeName, modelType) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H index 646c2d734f..31bf1207db 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,22 +81,22 @@ public: heatTransferModel, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ), - (owner, dict) + (film, dict) ); // Constructors //- Construct null - heatTransferModel(surfaceFilmModel& owner); + heatTransferModel(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model heatTransferModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); @@ -106,7 +106,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C index 3a9da6d01c..47795db101 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,36 +52,36 @@ addToRunTimeSelectionTable mappedConvectiveHeatTransfer::mappedConvectiveHeatTransfer ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - heatTransferModel(owner), + heatTransferModel(film), htcConvPrimary_ ( IOobject ( "htcConv", - owner.time().timeName(), - owner.primaryMesh(), + film.time().timeName(), + film.primaryMesh(), IOobject::MUST_READ, IOobject::AUTO_WRITE ), - owner.primaryMesh() + film.primaryMesh() ), htcConvFilm_ ( IOobject ( htcConvPrimary_.name(), // must have same name as above for mapping - owner.time().timeName(), - owner.regionMesh(), + film.time().timeName(), + film.regionMesh(), IOobject::NO_READ, IOobject::NO_WRITE ), - owner.regionMesh(), + film.regionMesh(), dimensionedScalar("zero", dimMass/pow3(dimTime)/dimTemperature, 0.0), - owner.mappedPushedFieldPatchTypes() + film.mappedPushedFieldPatchTypes() ) { // Update the primary-side convective heat transfer coefficient diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H index 6de4b004ef..caf980bdf2 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ public: //- Construct from surface film model and dictionary mappedConvectiveHeatTransfer ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C index 28122810d4..e21ce35c31 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C @@ -44,11 +44,11 @@ addToRunTimeSelectionTable(phaseChangeModel, noPhaseChange, dictionary); noPhaseChange::noPhaseChange ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& ) : - phaseChangeModel(owner) + phaseChangeModel(film) {} diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H index 65a3a56636..cbcd3d65e1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,7 @@ public: // Constructors //- Construct from surface film model - noPhaseChange(surfaceFilmModel& owner, const dictionary& dict); + noPhaseChange(surfaceFilmModel& film, const dictionary& dict); //- Destructor diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C index 44325cc0b2..f7ddc884df 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,10 +43,10 @@ defineRunTimeSelectionTable(phaseChangeModel, dictionary); phaseChangeModel::phaseChangeModel ( - surfaceFilmModel& owner + surfaceFilmModel& film ) : - filmSubModelBase(owner), + filmSubModelBase(film), latestMassPC_(0.0), totalMassPC_(0.0) {} @@ -55,11 +55,11 @@ phaseChangeModel::phaseChangeModel phaseChangeModel::phaseChangeModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - filmSubModelBase(owner, dict, typeName, modelType), + filmSubModelBase(film, dict, typeName, modelType), latestMassPC_(0.0), totalMassPC_(0.0) {} @@ -114,7 +114,7 @@ void phaseChangeModel::info(Ostream& os) const { const scalar massPCRate = returnReduce(latestMassPC_, sumOp()) - /owner_.time().deltaTValue(); + /filmModel_.time().deltaTValue(); scalar phaseChangeMass = getModelProperty("phaseChangeMass"); phaseChangeMass += returnReduce(totalMassPC_, sumOp()); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H index 5ab77edcf5..bf87c33281 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,22 +93,22 @@ public: phaseChangeModel, dictionary, ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ), - (owner, dict) + (film, dict) ); // Constructors //- Construct null - phaseChangeModel(surfaceFilmModel& owner); + phaseChangeModel(surfaceFilmModel& film); //- Construct from type name, dictionary and surface film model phaseChangeModel ( const word& modelType, - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); @@ -118,7 +118,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C index f5b5b36f59..93239be248 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,11 +51,11 @@ addToRunTimeSelectionTable solidification::solidification ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - phaseChangeModel(typeName, owner, dict), + phaseChangeModel(typeName, film, dict), T0_(readScalar(coeffDict_.lookup("T0"))), maxSolidificationFrac_ ( @@ -76,12 +76,12 @@ solidification::solidification IOobject ( typeName + ":mass", - owner.regionMesh().time().timeName(), - owner.regionMesh(), + film.regionMesh().time().timeName(), + film.regionMesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE ), - owner.regionMesh(), + film.regionMesh(), dimensionedScalar("zero", dimMass, 0.0), zeroGradientFvPatchScalarField::typeName ), @@ -90,12 +90,12 @@ solidification::solidification IOobject ( typeName + ":thickness", - owner.regionMesh().time().timeName(), - owner.regionMesh(), + film.regionMesh().time().timeName(), + film.regionMesh(), IOobject::NO_READ, IOobject::AUTO_WRITE ), - owner.regionMesh(), + film.regionMesh(), dimensionedScalar("zero", dimLength, 0.0), zeroGradientFvPatchScalarField::typeName ) @@ -128,7 +128,7 @@ void solidification::correctModel maxSolidificationFrac_, ( maxSolidificationRate_ - *owner_.regionMesh().time().deltaTValue() + *filmModel_.regionMesh().time().deltaTValue() ).value() ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H index 1854feac28..6ceeba82f4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,7 +96,7 @@ public: // Constructors //- Construct from surface film model - solidification(surfaceFilmModel& owner, const dictionary& dict); + solidification(surfaceFilmModel& film, const dictionary& dict); //- Destructor diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C index 125cf104b2..110333fd56 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,11 +70,11 @@ scalar standardPhaseChange::Sh standardPhaseChange::standardPhaseChange ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict ) : - phaseChangeModel(typeName, owner, dict), + phaseChangeModel(typeName, film, dict), deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))), L_(readScalar(coeffDict_.lookup("L"))), TbFactor_(coeffDict_.lookupOrDefault("TbFactor", 1.1)) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H index 82a8120bde..ae28ae4b50 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ public: //- Construct from surface film model standardPhaseChange ( - surfaceFilmModel& owner, + surfaceFilmModel& film, const dictionary& dict );