From 15773bf1b77ade054ae7b7a70ce47e04da39b640 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 22 May 2016 16:30:12 +0100
Subject: [PATCH] fvMeshFunctionObject: Rename 'write' -> 'writeField' to avoid
clash with base-class
---
.../fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C | 5 ++++-
.../fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.H | 2 +-
.../fieldCoordinateSystemTransform.C | 2 +-
.../functionObjects/field/fieldExpression/fieldExpression.C | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C b/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C
index 8feb625da77..47e86f2ee85 100644
--- a/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C
+++ b/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.C
@@ -40,7 +40,10 @@ namespace functionObjects
// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
-bool Foam::functionObjects::fvMeshFunctionObject::write(const word& fieldName)
+bool Foam::functionObjects::fvMeshFunctionObject::writeField
+(
+ const word& fieldName
+)
{
if (mesh_.foundObject<regIOobject>(fieldName))
{
diff --git a/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.H b/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.H
index bf89a2646d6..62315000f7a 100644
--- a/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.H
+++ b/src/finiteVolume/fvMesh/fvMeshFunctionObject/fvMeshFunctionObject.H
@@ -93,7 +93,7 @@ protected:
);
//- Write field if present in objectRegistry
- virtual bool write(const word& fieldName);
+ bool writeField(const word& fieldName);
private:
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
index 4f1ae748d7a..b1fa0ea3432 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
@@ -121,7 +121,7 @@ bool Foam::functionObjects::fieldCoordinateSystemTransform::write
{
forAll(fieldSet_, fieldi)
{
- fvMeshFunctionObject::write(transformFieldName(fieldSet_[fieldi]));
+ fvMeshFunctionObject::writeField(transformFieldName(fieldSet_[fieldi]));
}
return true;
diff --git a/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C b/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C
index 35ebf04fb4b..f55d45b0dc9 100644
--- a/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C
+++ b/src/postProcessing/functionObjects/field/fieldExpression/fieldExpression.C
@@ -81,7 +81,7 @@ bool Foam::functionObjects::fieldExpression::read(const dictionary& dict)
bool Foam::functionObjects::fieldExpression::write(const bool postProcess)
{
- return fvMeshFunctionObject::write(resultName_);
+ return fvMeshFunctionObject::writeField(resultName_);
}
--
GitLab