From 6b80811b1f35a474f56c469728ed9f3580cb2db2 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 24 May 2016 10:40:02 +0100 Subject: [PATCH] functionObjects::surfaceInterpolateFields: Derive from fvMeshFunctionObject --- .../surfaceInterpolateFields.C | 15 +-------------- .../surfaceInterpolateFields.H | 9 +++------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C index 728aafcb5c..096d16a525 100644 --- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C +++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.C @@ -54,22 +54,9 @@ Foam::functionObjects::surfaceInterpolateFields::surfaceInterpolateFields const dictionary& dict ) : - functionObject(name), - obr_ - ( - runTime.lookupObject - ( - dict.lookupOrDefault("region", polyMesh::defaultRegion) - ) - ), + fvMeshFunctionObject(name, runTime, dict), fieldSet_() { - if (!isA(obr_)) - { - FatalErrorInFunction - << "objectRegistry is not an fvMesh" << exit(FatalError); - } - read(dict); } diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H index 463c274756..1a20882c6c 100644 --- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H +++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H @@ -58,7 +58,7 @@ Description SeeAlso - Foam::functionObject + Foam::functionObjects::fvMeshFunctionObject Foam::functionObjects::timeControl SourceFiles @@ -69,7 +69,7 @@ SourceFiles #ifndef functionObjects_surfaceInterpolateFields_H #define functionObjects_surfaceInterpolateFields_H -#include "functionObject.H" +#include "fvMeshFunctionObject.H" #include "surfaceFieldsFwd.H" #include "Tuple2.H" @@ -92,15 +92,12 @@ namespace functionObjects class surfaceInterpolateFields : - public functionObject + public fvMeshFunctionObject { protected: // Protected data - //- Reference to the objectRegistry - const objectRegistry& obr_; - //- Fields to process List> fieldSet_;