functionObjects: Added regionFunctionObject and fvMeshFunctionObject intermediate base-classes

to simplify writing common functionObjects and avoid unnecessary code duplication
This commit is contained in:
Henry Weller
2016-05-16 12:20:44 +01:00
parent ee0aff67ce
commit fd38002d57
19 changed files with 439 additions and 150 deletions

View File

@ -223,6 +223,7 @@ db/functionObjects/writeFile/writeFile.C
db/functionObjects/writeFiles/writeFiles.C db/functionObjects/writeFiles/writeFiles.C
db/functionObjects/timeControl/timeControl.C db/functionObjects/timeControl/timeControl.C
db/functionObjects/timeControl/timeControlFunctionObject.C db/functionObjects/timeControl/timeControlFunctionObject.C
db/functionObjects/regionFunctionObject/regionFunctionObject.C
Time = db/Time Time = db/Time
$(Time)/TimePaths.C $(Time)/TimePaths.C

View File

@ -0,0 +1,81 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "regionFunctionObject.H"
#include "Time.H"
#include "polyMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace functionObjects
{
defineTypeNameAndDebug(regionFunctionObject, 0);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::functionObjects::regionFunctionObject::regionFunctionObject
(
const word& name,
const Time& runTime,
const dictionary& dict
)
:
functionObject(name),
time_(runTime),
obr_
(
runTime.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
)
)
{}
Foam::functionObjects::regionFunctionObject::regionFunctionObject
(
const word& name,
const objectRegistry& obr,
const dictionary& dict
)
:
functionObject(name),
time_(obr.time()),
obr_(obr)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::regionFunctionObject::~regionFunctionObject()
{}
// ************************************************************************* //

View File

@ -0,0 +1,127 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::functionObjects::regionFunctionObject
Description
Specialization of Foam::functionObject for a region and providing a
reference to the region Foam::objectRegistry.
SeeAlso
Foam::functionObject
SourceFiles
regionFunctionObject.C
\*---------------------------------------------------------------------------*/
#ifndef functionObjects_regionFunctionObject_H
#define functionObjects_regionFunctionObject_H
#include "functionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// Forward declaration of classes
class objectRegistry;
namespace functionObjects
{
/*---------------------------------------------------------------------------*\
Class regionFunctionObject Declaration
\*---------------------------------------------------------------------------*/
class regionFunctionObject
:
public functionObject
{
protected:
// Protected member data
//- Reference to the Time
const Time& time_;
//- Reference to the region objectRegistry
const objectRegistry& obr_;
private:
// Private Member Functions
//- Disallow default bitwise copy construct
regionFunctionObject(const regionFunctionObject&);
//- Disallow default bitwise assignment
void operator=(const regionFunctionObject&);
public:
//- Runtime type information
TypeName("regionFunctionObject");
// Constructors
//- Construct from Time and dictionary.
// The region objectRegistry is looked-up runTime with the name
// looked-up from the dictionary (defaults to polyMesh::defaultRegion)
regionFunctionObject
(
const word& name,
const Time& runTime,
const dictionary& dict
);
//- Construct from the region objectRegistry and dictionary
regionFunctionObject
(
const word& name,
const objectRegistry& obr,
const dictionary& dict
);
//- Destructor
virtual ~regionFunctionObject();
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace functionObjects
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

View File

@ -100,20 +100,12 @@ Foam::Omanip<int> Foam::functionObjects::writeFile::valueWidth
Foam::functionObjects::writeFile::writeFile Foam::functionObjects::writeFile::writeFile
( (
const word& name, const word& name,
const Time& t, const Time& runTime,
const dictionary& dict, const dictionary& dict,
const word& prefix const word& prefix
) )
: :
functionObject(name), regionFunctionObject(name, runTime, dict),
time_(t),
obr_
(
time_.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
)
),
prefix_(prefix), prefix_(prefix),
log_(true) log_(true)
{} {}
@ -127,9 +119,7 @@ Foam::functionObjects::writeFile::writeFile
const word& prefix const word& prefix
) )
: :
functionObject(name), regionFunctionObject(name, obr, dict),
time_(obr.time()),
obr_(obr),
prefix_(prefix), prefix_(prefix),
log_(true) log_(true)
{} {}

View File

@ -28,8 +28,8 @@ Description
functionObject base class for writing single files functionObject base class for writing single files
See Also See Also
Foam::regionFunctionObject
Foam::functionObject Foam::functionObject
Foam::OutputFilterFunctionObject
SourceFiles SourceFiles
functionObjectFile.C functionObjectFile.C
@ -39,7 +39,7 @@ SourceFiles
#ifndef functionObjects_writeFile_H #ifndef functionObjects_writeFile_H
#define functionObjects_writeFile_H #define functionObjects_writeFile_H
#include "functionObject.H" #include "regionFunctionObject.H"
#include "Time.H" #include "Time.H"
#include "IOmanip.H" #include "IOmanip.H"
@ -56,19 +56,13 @@ namespace functionObjects
class writeFile class writeFile
: :
public functionObject public regionFunctionObject
{ {
protected: protected:
// Protected data // Protected data
//- Reference to the Time
const Time& time_;
//- Reference to the objectRegistry
const objectRegistry& obr_;
//- Prefix //- Prefix
const word prefix_; const word prefix_;

View File

@ -91,6 +91,7 @@ $(faceToCell)/extendedFaceToCellStencil.C
$(faceToCell)/extendedCentredFaceToCellStencil.C $(faceToCell)/extendedCentredFaceToCellStencil.C
$(faceToCell)/MeshObjects/centredCFCFaceToCellStencilObject.C $(faceToCell)/MeshObjects/centredCFCFaceToCellStencilObject.C
fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C
fvPatchFields = fields/fvPatchFields fvPatchFields = fields/fvPatchFields
$(fvPatchFields)/fvPatchField/fvPatchFields.C $(fvPatchFields)/fvPatchField/fvPatchFields.C

View File

@ -0,0 +1,61 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "fvMeshFunctionObject.H"
#include "Time.H"
#include "fvMesh.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
namespace functionObjects
{
defineTypeNameAndDebug(fvMeshFunctionObject, 0);
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::functionObjects::fvMeshFunctionObject::fvMeshFunctionObject
(
const word& name,
const Time& runTime,
const dictionary& dict
)
:
regionFunctionObject(name, runTime, dict),
mesh_(refCast<const fvMesh>(obr_))
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::fvMeshFunctionObject::~fvMeshFunctionObject()
{}
// ************************************************************************* //

View File

@ -0,0 +1,118 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::functionObjects::fvMeshFunctionObject
Description
Specialization of Foam::functionObject for an Foam::fvMesh, providing a
reference to the Foam::fvMesh.
If the selected region is not an Foam::fvMesh a Foam::FatalError will be
generated.
SeeAlso
Foam::regionFunctionObject
Foam::functionObject
SourceFiles
fvMeshFunctionObject.C
\*---------------------------------------------------------------------------*/
#ifndef functionObjects_fvMeshFunctionObject_H
#define functionObjects_fvMeshFunctionObject_H
#include "regionFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// Forward declaration of classes
class fvMesh;
namespace functionObjects
{
/*---------------------------------------------------------------------------*\
Class fvMeshFunctionObject Declaration
\*---------------------------------------------------------------------------*/
class fvMeshFunctionObject
:
public regionFunctionObject
{
protected:
// Protected member data
//- Reference to the fvMesh
const fvMesh& mesh_;
private:
// Private Member Functions
//- Disallow default bitwise copy construct
fvMeshFunctionObject(const fvMeshFunctionObject&);
//- Disallow default bitwise assignment
void operator=(const fvMeshFunctionObject&);
public:
//- Runtime type information
TypeName("fvMeshFunctionObject");
// Constructors
//- Construct from Time and dictionary
fvMeshFunctionObject
(
const word& name,
const Time& runTime,
const dictionary& dict
);
//- Destructor
virtual ~fvMeshFunctionObject();
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace functionObjects
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

View File

@ -47,9 +47,7 @@ Foam::volScalarField& Foam::functionObjects::div::divField
const dimensionSet& dims const dimensionSet& dims
) )
{ {
const fvMesh& mesh = refCast<const fvMesh>(obr_); if (!mesh_.foundObject<volScalarField>(divName))
if (!mesh.foundObject<volScalarField>(divName))
{ {
volScalarField* divFieldPtr volScalarField* divFieldPtr
( (
@ -58,20 +56,20 @@ Foam::volScalarField& Foam::functionObjects::div::divField
IOobject IOobject
( (
divName, divName,
mesh.time().timeName(), mesh_.time().timeName(),
mesh, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh_,
dimensionedScalar("zero", dims/dimLength, 0.0) dimensionedScalar("zero", dims/dimLength, 0.0)
) )
); );
mesh.objectRegistry::store(divFieldPtr); mesh_.objectRegistry::store(divFieldPtr);
} }
const volScalarField& field = mesh.lookupObject<volScalarField>(divName); const volScalarField& field = mesh_.lookupObject<volScalarField>(divName);
return const_cast<volScalarField&>(field); return const_cast<volScalarField&>(field);
} }
@ -86,23 +84,8 @@ Foam::functionObjects::div::div
const dictionary& dict const dictionary& dict
) )
: :
functionObject(name), fvMeshFunctionObject(name, runTime, dict)
obr_
(
runTime.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
)
),
fieldName_("undefined-fieldName"),
resultName_("undefined-resultName")
{ {
if (!isA<fvMesh>(obr_))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict); read(dict);
} }

View File

@ -40,7 +40,7 @@ SourceFiles
#ifndef functionObjects_div_H #ifndef functionObjects_div_H
#define functionObjects_div_H #define functionObjects_div_H
#include "functionObject.H" #include "fvMeshFunctionObject.H"
#include "volFieldsFwd.H" #include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -49,7 +49,6 @@ namespace Foam
{ {
// Forward declaration of classes // Forward declaration of classes
class objectRegistry;
class dimensionSet; class dimensionSet;
namespace functionObjects namespace functionObjects
@ -61,13 +60,10 @@ namespace functionObjects
class div class div
: :
public functionObject public fvMeshFunctionObject
{ {
// Private data // Private data
//- Reference to the objectRegistry
const objectRegistry& obr_;
//- Name of field to process //- Name of field to process
word fieldName_; word fieldName_;

View File

@ -36,11 +36,9 @@ void Foam::functionObjects::div::calcDiv
bool& processed bool& processed
) )
{ {
const fvMesh& mesh = refCast<const fvMesh>(obr_); if (mesh_.foundObject<FieldType>(fieldName))
if (mesh.foundObject<FieldType>(fieldName))
{ {
const FieldType& vf = mesh.lookupObject<FieldType>(fieldName); const FieldType& vf = mesh_.lookupObject<FieldType>(fieldName);
volScalarField& field = divField(resultName, vf.dimensions()); volScalarField& field = divField(resultName, vf.dimensions());

View File

@ -48,23 +48,8 @@ Foam::functionObjects::grad::grad
const dictionary& dict const dictionary& dict
) )
: :
functionObject(name), fvMeshFunctionObject(name, runTime, dict)
obr_
(
runTime.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
)
),
fieldName_("undefined-fieldName"),
resultName_("undefined-resultName")
{ {
if (!isA<fvMesh>(obr_))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict); read(dict);
} }

View File

@ -40,7 +40,7 @@ SourceFiles
#ifndef functionObjects_grad_H #ifndef functionObjects_grad_H
#define functionObjects_grad_H #define functionObjects_grad_H
#include "functionObject.H" #include "fvMeshFunctionObject.H"
#include "volFieldsFwd.H" #include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -49,7 +49,6 @@ namespace Foam
{ {
// Forward declaration of classes // Forward declaration of classes
class objectRegistry;
class dimensionSet; class dimensionSet;
namespace functionObjects namespace functionObjects
@ -61,13 +60,10 @@ namespace functionObjects
class grad class grad
: :
public functionObject public fvMeshFunctionObject
{ {
// Private data // Private data
//- Reference to the objectRegistry
const objectRegistry& obr_;
//- Name of field to process //- Name of field to process
word fieldName_; word fieldName_;

View File

@ -46,9 +46,7 @@ Foam::functionObjects::grad::gradField
typedef typename outerProduct<vector, Type>::type gradType; typedef typename outerProduct<vector, Type>::type gradType;
typedef GeometricField<gradType, fvPatchField, volMesh> vfGradType; typedef GeometricField<gradType, fvPatchField, volMesh> vfGradType;
const fvMesh& mesh = refCast<const fvMesh>(obr_); if (!mesh_.foundObject<vfGradType>(gradName))
if (!mesh.foundObject<vfGradType>(gradName))
{ {
vfGradType* gradFieldPtr vfGradType* gradFieldPtr
( (
@ -57,12 +55,12 @@ Foam::functionObjects::grad::gradField
IOobject IOobject
( (
gradName, gradName,
mesh.time().timeName(), mesh_.time().timeName(),
mesh, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh_,
dimensioned<gradType> dimensioned<gradType>
( (
"zero", "zero",
@ -72,10 +70,10 @@ Foam::functionObjects::grad::gradField
) )
); );
mesh.objectRegistry::store(gradFieldPtr); mesh_.objectRegistry::store(gradFieldPtr);
} }
const vfGradType& field = mesh.lookupObject<vfGradType>(gradName); const vfGradType& field = mesh_.lookupObject<vfGradType>(gradName);
return const_cast<vfGradType&>(field); return const_cast<vfGradType&>(field);
} }
@ -95,12 +93,9 @@ void Foam::functionObjects::grad::calcGrad
typedef typename outerProduct<vector, Type>::type gradType; typedef typename outerProduct<vector, Type>::type gradType;
typedef GeometricField<gradType, fvPatchField, volMesh> vfGradType; typedef GeometricField<gradType, fvPatchField, volMesh> vfGradType;
const fvMesh& mesh = refCast<const fvMesh>(obr_); if (mesh_.foundObject<vfType>(fieldName))
if (mesh.foundObject<vfType>(fieldName))
{ {
const vfType& vf = mesh.lookupObject<vfType>(fieldName); const vfType& vf = mesh_.lookupObject<vfType>(fieldName);
vfGradType& field = gradField<Type>(resultName, vf.dimensions()); vfGradType& field = gradField<Type>(resultName, vf.dimensions());
@ -109,9 +104,9 @@ void Foam::functionObjects::grad::calcGrad
processed = true; processed = true;
} }
else if (mesh.foundObject<sfType>(fieldName)) else if (mesh_.foundObject<sfType>(fieldName))
{ {
const sfType& sf = mesh.lookupObject<sfType>(fieldName); const sfType& sf = mesh_.lookupObject<sfType>(fieldName);
vfGradType& field = gradField<Type>(resultName, sf.dimensions()); vfGradType& field = gradField<Type>(resultName, sf.dimensions());

View File

@ -48,23 +48,8 @@ Foam::functionObjects::mag::mag
const dictionary& dict const dictionary& dict
) )
: :
functionObject(name), fvMeshFunctionObject(name, runTime, dict)
obr_
(
runTime.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
)
),
fieldName_("undefined-fieldName"),
resultName_("undefined-resultName")
{ {
if (!isA<fvMesh>(obr_))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict); read(dict);
} }

View File

@ -40,7 +40,7 @@ SourceFiles
#ifndef functionObjects_mag_H #ifndef functionObjects_mag_H
#define functionObjects_mag_H #define functionObjects_mag_H
#include "functionObject.H" #include "fvMeshFunctionObject.H"
#include "volFieldsFwd.H" #include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -49,7 +49,6 @@ namespace Foam
{ {
// Forward declaration of classes // Forward declaration of classes
class objectRegistry;
class dimensionSet; class dimensionSet;
namespace functionObjects namespace functionObjects
@ -61,13 +60,10 @@ namespace functionObjects
class mag class mag
: :
public functionObject public fvMeshFunctionObject
{ {
// Private data // Private data
//- Reference to the objectRegistry
const objectRegistry& obr_;
//- Name of field to process //- Name of field to process
word fieldName_; word fieldName_;

View File

@ -35,9 +35,7 @@ FieldType& Foam::functionObjects::mag::magField
const dimensionSet& dims const dimensionSet& dims
) )
{ {
const fvMesh& mesh = refCast<const fvMesh>(obr_); if (!mesh_.foundObject<FieldType>(magName))
if (!mesh.foundObject<FieldType>(magName))
{ {
FieldType* magFieldPtr FieldType* magFieldPtr
( (
@ -46,20 +44,20 @@ FieldType& Foam::functionObjects::mag::magField
IOobject IOobject
( (
magName, magName,
mesh.time().timeName(), mesh_.time().timeName(),
mesh, mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh_,
dimensionedScalar("zero", dims, 0.0) dimensionedScalar("zero", dims, 0.0)
) )
); );
mesh.objectRegistry::store(magFieldPtr); mesh_.objectRegistry::store(magFieldPtr);
} }
const FieldType& f = mesh.lookupObject<FieldType>(magName); const FieldType& f = mesh_.lookupObject<FieldType>(magName);
return const_cast<FieldType&>(f); return const_cast<FieldType&>(f);
} }
@ -78,11 +76,9 @@ void Foam::functionObjects::mag::calc
typedef GeometricField<Type, fvPatchField, volMesh> vfType; typedef GeometricField<Type, fvPatchField, volMesh> vfType;
typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType; typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType;
const fvMesh& mesh = refCast<const fvMesh>(obr_); if (mesh_.foundObject<vfType>(fieldName))
if (mesh.foundObject<vfType>(fieldName))
{ {
const vfType& vf = mesh.lookupObject<vfType>(fieldName); const vfType& vf = mesh_.lookupObject<vfType>(fieldName);
volScalarField& field = volScalarField& field =
magField<volScalarField>(resultName_, vf.dimensions()); magField<volScalarField>(resultName_, vf.dimensions());
@ -91,9 +87,9 @@ void Foam::functionObjects::mag::calc
processed = true; processed = true;
} }
else if (mesh.foundObject<sfType>(fieldName)) else if (mesh_.foundObject<sfType>(fieldName))
{ {
const sfType& sf = mesh.lookupObject<sfType>(fieldName); const sfType& sf = mesh_.lookupObject<sfType>(fieldName);
surfaceScalarField& field = surfaceScalarField& field =
magField<surfaceScalarField>(resultName_, sf.dimensions()); magField<surfaceScalarField>(resultName_, sf.dimensions());

View File

@ -48,23 +48,8 @@ Foam::functionObjects::blendingFactor::blendingFactor
const dictionary& dict const dictionary& dict
) )
: :
functionObject(name), fvMeshFunctionObject(name, runTime, dict)
obr_
(
runTime.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
)
),
phiName_("unknown-phiName"),
fieldName_("unknown-fieldName")
{ {
if (!isA<fvMesh>(obr_))
{
FatalErrorInFunction
<< "objectRegistry is not an fvMesh" << exit(FatalError);
}
read(dict); read(dict);
} }

View File

@ -32,6 +32,10 @@ Description
the bended convection schemes. The output is a volume field (cells) whose the bended convection schemes. The output is a volume field (cells) whose
value is calculated via the maximum blending factor for any cell face. value is calculated via the maximum blending factor for any cell face.
SeeAlso
Foam::fvMeshFunctionObject
Foam::functionObject
SourceFiles SourceFiles
blendingFactor.C blendingFactor.C
@ -40,7 +44,7 @@ SourceFiles
#ifndef functionObjects_blendingFactor_H #ifndef functionObjects_blendingFactor_H
#define functionObjects_blendingFactor_H #define functionObjects_blendingFactor_H
#include "functionObject.H" #include "fvMeshFunctionObject.H"
#include "volFieldsFwd.H" #include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -60,13 +64,10 @@ namespace functionObjects
class blendingFactor class blendingFactor
: :
public functionObject public fvMeshFunctionObject
{ {
// Private data // Private data
//- Reference to the objectRegistry
const objectRegistry& obr_;
//- Name of flux field, default is "phi" //- Name of flux field, default is "phi"
word phiName_; word phiName_;