From 9d5ce4ae765ec7819fe024efdeea508ba684ea27 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 13 Dec 2012 10:40:38 +0000
Subject: [PATCH] ENH: Updated function objects
---
.../IO/partialWrite/partialWrite.H | 4 +--
.../removeRegisteredObject.H | 4 +--
.../IO/writeDictionary/writeDictionary.H | 4 +--
.../writeRegisteredObject.H | 4 +--
.../cloud/cloudInfo/cloudInfo.H | 2 +-
.../fieldAverage/fieldAverage/fieldAverage.C | 2 +-
.../fieldAverage/fieldAverage/fieldAverage.H | 19 ++++++--------
.../fieldCoordinateSystemTransform.H | 4 +--
.../field/fieldMinMax/fieldMinMax.H | 4 +--
.../field/fieldValues/fieldValue/fieldValue.C | 26 +++++++++----------
.../field/fieldValues/fieldValue/fieldValue.H | 18 ++++++-------
.../fieldValueDelta/fieldValueDelta.C | 26 +++++++++----------
.../fieldValueDelta/fieldValueDelta.H | 12 ++++-----
.../field/nearWallFields/nearWallFields.H | 2 +-
.../field/processorField/processorField.H | 2 +-
.../field/readFields/readFields.H | 2 +-
.../regionSizeDistribution.H | 2 +-
.../field/streamLine/streamLine.C | 2 +-
.../field/streamLine/streamLine.H | 2 +-
.../surfaceInterpolateFields.H | 2 +-
.../field/turbulenceFields/turbulenceFields.H | 4 +--
.../wallBoundedStreamLine.C | 2 +-
.../wallBoundedStreamLine.H | 2 +-
.../functionObjects/forces/forces/forces.H | 4 +--
.../fvTools/calcFvcDiv/calcFvcDiv.H | 2 +-
.../fvTools/calcFvcGrad/calcFvcGrad.H | 2 +-
.../functionObjects/fvTools/calcMag/calcMag.H | 2 +-
.../abortCalculation/abortCalculation.H | 4 +--
.../functionObjects/systemCall/systemCall.H | 4 +--
.../utilities/CourantNo/CourantNo.H | 4 +--
.../DESModelRegions/DESModelRegions.H | 4 +--
.../utilities/Lambda2/Lambda2.H | 4 +--
.../functionObjects/utilities/Peclet/Peclet.H | 4 +--
.../functionObjects/utilities/Q/Q.H | 4 +--
.../codedFunctionObject/codedFunctionObject.H | 6 +++++
.../utilities/dsmcFields/dsmcFields.H | 7 ++---
.../utilities/pressureTools/pressureTools.H | 4 +--
.../scalarTransport/scalarTransport.H | 2 +-
.../timeActivatedFileUpdate.H | 4 +--
.../wallShearStress/wallShearStress.H | 4 +--
.../utilities/yPlusLES/yPlusLES.H | 4 +--
.../utilities/yPlusRAS/yPlusRAS.H | 4 +--
src/sampling/probes/probes.H | 2 +-
.../sampledSet/sampledSets/sampledSets.C | 4 +--
.../sampledSet/sampledSets/sampledSets.H | 4 +--
.../sampledSurfaces/sampledSurfaces.C | 2 +-
.../sampledSurfaces/sampledSurfaces.H | 4 +--
47 files changed, 120 insertions(+), 120 deletions(-)
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
index a5165aaf51e..62a53f51943 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
@@ -65,7 +65,6 @@ SourceFiles
#ifndef partialWrite_H
#define partialWrite_H
-#include "pointFieldFwd.H"
#include "HashSet.H"
#include "DynamicList.H"
#include "runTimeSelectionTables.H"
@@ -78,6 +77,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -166,7 +166,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
index b25925c3c1c..957c1a9a2d1 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
@@ -61,7 +61,6 @@ SourceFiles
#ifndef removeRegisteredObject_H
#define removeRegisteredObject_H
-#include "pointFieldFwd.H"
#include "wordList.H"
#include "runTimeSelectionTables.H"
@@ -73,6 +72,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -154,7 +154,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
index 8c21f32489d..1f12efd096f 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
+++ b/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
@@ -39,7 +39,6 @@ SourceFiles
#ifndef writeDictionary_H
#define writeDictionary_H
-#include "pointFieldFwd.H"
#include "wordList.H"
#include "runTimeSelectionTables.H"
#include "SHA1Digest.H"
@@ -52,6 +51,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -142,7 +142,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
index 7dbdb4bd258..f4bd97bd368 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
@@ -62,7 +62,6 @@ SourceFiles
#ifndef writeRegisteredObject_H
#define writeRegisteredObject_H
-#include "pointFieldFwd.H"
#include "wordList.H"
#include "runTimeSelectionTables.H"
@@ -74,6 +73,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -155,7 +155,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
index edd5d6897dd..85558d2e3fc 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
+++ b/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
@@ -170,7 +170,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index 5d63cced6c7..2de912282f1 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -408,7 +408,7 @@ void Foam::fieldAverage::updateMesh(const mapPolyMesh&)
}
-void Foam::fieldAverage::movePoints(const pointField&)
+void Foam::fieldAverage::movePoints(const polyMesh&)
{
// Do nothing
}
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 1ba37ec6d59..a77459f82f5 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -116,7 +116,6 @@ SourceFiles
#define fieldAverage_H
#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -130,10 +129,11 @@ class dictionary;
class fieldAverageItem;
template<class Type>
class List;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
- Class fieldAverage Declaration
+ Class fieldAverage Declaration
\*---------------------------------------------------------------------------*/
class fieldAverage
@@ -266,15 +266,6 @@ protected:
void readAveragingProperties();
- // Functions to be over-ridden from IOoutputFilter class
-
- //- Update mesh
- virtual void updateMesh(const mapPolyMesh&);
-
- //- Move points
- virtual void movePoints(const Field<point>&);
-
-
//- Disallow default bitwise copy construct
fieldAverage(const fieldAverage&);
@@ -324,6 +315,12 @@ public:
//- Calculate the field average data and write
virtual void write();
+
+ //- Update mesh
+ virtual void updateMesh(const mapPolyMesh&);
+
+ //- Move points
+ virtual void movePoints(const polyMesh&);
};
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index e583e6b168c..0671327ad8e 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -78,7 +78,6 @@ SourceFiles
#define fieldCoordinateSystemTransform_H
#include "OFstream.H"
-#include "pointFieldFwd.H"
#include "volFields.H"
#include "surfaceFields.H"
#include "coordinateSystem.H"
@@ -91,6 +90,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -181,7 +181,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index dbaf40b1da0..50e3017f893 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -82,7 +82,6 @@ SourceFiles
#include "HashSet.H"
#include "OFstream.H"
#include "Switch.H"
-#include "pointFieldFwd.H"
#include "NamedEnum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -93,6 +92,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -205,7 +205,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
index dc37c6909d3..5cb2faa3b69 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,18 +39,6 @@ namespace Foam
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-void Foam::fieldValue::updateMesh(const mapPolyMesh&)
-{
- // Do nothing
-}
-
-
-void Foam::fieldValue::movePoints(const Field<point>&)
-{
- // Do nothing
-}
-
-
void Foam::fieldValue::read(const dictionary& dict)
{
if (active_)
@@ -140,4 +128,16 @@ void Foam::fieldValue::end()
}
+void Foam::fieldValue::updateMesh(const mapPolyMesh&)
+{
+ // Do nothing
+}
+
+
+void Foam::fieldValue::movePoints(const polyMesh&)
+{
+ // Do nothing
+}
+
+
// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
index 1d6befa9ce9..1b2f2621e7b 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
@@ -40,9 +40,9 @@ SourceFiles
#include "functionObjectFile.H"
#include "Switch.H"
-#include "pointFieldFwd.H"
#include "OFstream.H"
#include "dictionary.H"
+#include "Field.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -53,6 +53,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class fvMesh;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -93,15 +94,6 @@ protected:
dictionary resultDict_;
- // Functions to be over-ridden from IOoutputFilter class
-
- //- Update mesh
- virtual void updateMesh(const mapPolyMesh&);
-
- //- Move points
- virtual void movePoints(const Field<point>&);
-
-
public:
//- Run-time type information
@@ -193,6 +185,12 @@ public:
//- Execute the at the final time-loop, currently does nothing
virtual void end();
+ //- Update mesh
+ virtual void updateMesh(const mapPolyMesh&);
+
+ //- Move points
+ virtual void movePoints(const polyMesh&);
+
//- Combine fields from all processor domains into single field
template<class Type>
void combineFields(Field<Type>& field);
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index ebcaaf2430a..52d1934a870 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -48,20 +48,6 @@ namespace Foam
}
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-void Foam::fieldValues::fieldValueDelta::updateMesh(const mapPolyMesh&)
-{
- // Do nothing
-}
-
-
-void Foam::fieldValues::fieldValueDelta::movePoints(const Field<point>&)
-{
- // Do nothing
-}
-
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::fieldValues::fieldValueDelta::fieldValueDelta
@@ -210,4 +196,16 @@ void Foam::fieldValues::fieldValueDelta::end()
}
+void Foam::fieldValues::fieldValueDelta::updateMesh(const mapPolyMesh&)
+{
+ // Do nothing
+}
+
+
+void Foam::fieldValues::fieldValueDelta::movePoints(const polyMesh&)
+{
+ // Do nothing
+}
+
+
// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index 916fa6d3b03..e28771109a2 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
@@ -140,12 +140,6 @@ protected:
// Functions to be over-ridden from IOoutputFilter class
- //- Update mesh
- virtual void updateMesh(const mapPolyMesh&);
-
- //- Move points
- virtual void movePoints(const Field<point>&);
-
//- Output file header information
virtual void writeFileHeader(const label i);
@@ -185,6 +179,12 @@ public:
//- Execute the at the final time-loop, currently does nothing
virtual void end();
+
+ //- Update mesh
+ virtual void updateMesh(const mapPolyMesh&);
+
+ //- Move points
+ virtual void movePoints(const polyMesh&);
};
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
index e6be5d7948e..df6c8f80635 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
@@ -199,7 +199,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.H b/src/postProcessing/functionObjects/field/processorField/processorField.H
index b1ecdb65f5c..cee878adc1d 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.H
+++ b/src/postProcessing/functionObjects/field/processorField/processorField.H
@@ -153,7 +153,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index 8a26b89f568..81f11922b7f 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.H
@@ -181,7 +181,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index e24a4fd5ac9..1fd236f024c 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -274,7 +274,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 47adbd003f3..dbe60ac94f4 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -749,7 +749,7 @@ void Foam::streamLine::updateMesh(const mapPolyMesh&)
}
-void Foam::streamLine::movePoints(const pointField&)
+void Foam::streamLine::movePoints(const polyMesh&)
{
// Moving mesh affects the search tree
read(dict_);
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index 08f01e45194..bce1808d90a 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -273,7 +273,7 @@ public:
virtual void updateMesh(const mapPolyMesh&);
//- Update for mesh point-motion
- virtual void movePoints(const pointField&);
+ virtual void movePoints(const polyMesh&);
////- Update for changes of mesh due to readUpdate
//virtual void readUpdate(const polyMesh::readUpdateState state);
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index 61d8724d698..07110c8d882 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
@@ -177,7 +177,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.H
index 527f332c468..b885759223f 100644
--- a/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/field/turbulenceFields/turbulenceFields.H
@@ -86,7 +86,6 @@ SourceFiles
#include "HashSet.H"
#include "IOobject.H"
#include "NamedEnum.H"
-#include "pointField.H"
#include "volFieldsFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -97,6 +96,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -214,7 +214,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index 8ae2ed96d21..0b736e44c3b 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -876,7 +876,7 @@ void Foam::wallBoundedStreamLine::updateMesh(const mapPolyMesh&)
}
-void Foam::wallBoundedStreamLine::movePoints(const pointField&)
+void Foam::wallBoundedStreamLine::movePoints(const polyMesh&)
{
// Moving mesh affects the search tree
read(dict_);
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index e7dceed8bb6..c6b8a178a35 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -279,7 +279,7 @@ public:
virtual void updateMesh(const mapPolyMesh&);
//- Update for mesh point-motion
- virtual void movePoints(const pointField&);
+ virtual void movePoints(const polyMesh&);
////- Update for changes of mesh due to readUpdate
//virtual void readUpdate(const polyMesh::readUpdateState state);
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index d2d2e4b2dcf..12d72f61a69 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -112,7 +112,6 @@ SourceFiles
#include "Tuple2.H"
#include "OFstream.H"
#include "Switch.H"
-#include "pointFieldFwd.H"
#include "writer.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -123,6 +122,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -316,7 +316,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
index bc07e0fab0a..bbf42c6809a 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
@@ -155,7 +155,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
index c7422eca4bd..7c8b15f4992 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
+++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
@@ -158,7 +158,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
index 1360e303cd6..96fe433d1e5 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
+++ b/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
@@ -152,7 +152,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
index 42da71f90c4..4040709fdb3 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
+++ b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
@@ -45,7 +45,6 @@ SourceFiles
#ifndef abortCalculation_H
#define abortCalculation_H
-#include "pointFieldFwd.H"
#include "NamedEnum.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -56,6 +55,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -154,7 +154,7 @@ public:
{}
//- Update for changes of mesh - does nothing
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.H b/src/postProcessing/functionObjects/systemCall/systemCall.H
index ad82219bcee..5de53fa26cf 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.H
@@ -88,7 +88,6 @@ SourceFiles
#define systemCall_H
#include "stringList.H"
-#include "pointFieldFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -98,6 +97,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -180,7 +180,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
index 319de39c16f..e74d6c9e2cc 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
@@ -43,7 +43,6 @@ SourceFiles
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "OFstream.H"
#include "Switch.H"
@@ -55,6 +54,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -142,7 +142,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.H b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.H
index fe36b462de7..858fab4e052 100644
--- a/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.H
+++ b/src/postProcessing/functionObjects/utilities/DESModelRegions/DESModelRegions.H
@@ -45,7 +45,6 @@ SourceFiles
#include "functionObjectFile.H"
#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "Switch.H"
#include "OFstream.H"
@@ -57,6 +56,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
class fvMesh;
@@ -144,7 +144,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
index d1865c7cfe9..77659532e26 100644
--- a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
+++ b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
@@ -43,7 +43,6 @@ SourceFiles
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "OFstream.H"
#include "Switch.H"
@@ -55,6 +54,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -135,7 +135,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
index 1445e8377b9..4c4ec390b7b 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
@@ -42,7 +42,6 @@ SourceFiles
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "OFstream.H"
#include "Switch.H"
@@ -54,6 +53,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -137,7 +137,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/Q/Q.H b/src/postProcessing/functionObjects/utilities/Q/Q.H
index c42099dac75..892808ef95d 100644
--- a/src/postProcessing/functionObjects/utilities/Q/Q.H
+++ b/src/postProcessing/functionObjects/utilities/Q/Q.H
@@ -46,7 +46,6 @@ SourceFiles
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "OFstream.H"
#include "Switch.H"
@@ -58,6 +57,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -138,7 +138,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index a9c6818f776..84b48a91e6a 100644
--- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
@@ -150,6 +150,12 @@ public:
//- Read and set the function object if its data have changed
virtual bool read(const dictionary&);
+
+ //- Update mesh
+ virtual void updateMesh(const mapPolyMesh&);
+
+ //- Move points
+ virtual void movePoints(const polyMesh&);
};
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
index 512ac251c6a..a88d3c20704 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
@@ -44,7 +44,7 @@ SourceFiles
#ifndef dsmcFields_H
#define dsmcFields_H
-#include "pointFieldFwd.H"
+#include "typeInfo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,10 +54,11 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
- Class dsmcFields Declaration
+ Class dsmcFields Declaration
\*---------------------------------------------------------------------------*/
class dsmcFields
@@ -130,7 +131,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
index 4a1866821a6..f54375926cc 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
+++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
@@ -111,7 +111,6 @@ SourceFiles
#define pressureTools_H
#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "dimensionedScalar.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -122,6 +121,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -253,7 +253,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
index 35a872f59e4..c948d9d6d2f 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
@@ -175,7 +175,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index 786e0f21fa7..dc43ee39a32 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -60,7 +60,6 @@ SourceFiles
#ifndef timeActivatedFileUpdate_H
#define timeActivatedFileUpdate_H
-#include "pointFieldFwd.H"
#include "Tuple2.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,6 +70,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
@@ -160,7 +160,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
index 6b31c9f6123..f8ecbbcfde7 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
@@ -75,7 +75,6 @@ SourceFiles
#include "functionObjectFile.H"
#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "Switch.H"
#include "OFstream.H"
@@ -87,6 +86,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
class fvMesh;
@@ -185,7 +185,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
index 45f8fec68e0..78e7d38db78 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusLES/yPlusLES.H
@@ -42,7 +42,6 @@ SourceFiles
#include "functionObjectFile.H"
#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "Switch.H"
#include "OFstream.H"
@@ -54,6 +53,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
class fvMesh;
@@ -161,7 +161,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
index 98b8134e0c7..241c4b6a74e 100644
--- a/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
+++ b/src/postProcessing/functionObjects/utilities/yPlusRAS/yPlusRAS.H
@@ -42,7 +42,6 @@ SourceFiles
#include "functionObjectFile.H"
#include "volFieldsFwd.H"
-#include "pointFieldFwd.H"
#include "Switch.H"
#include "OFstream.H"
@@ -54,6 +53,7 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
+class polyMesh;
class mapPolyMesh;
class fvMesh;
@@ -148,7 +148,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
};
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 9634d626dd0..85a3928fdca 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -254,7 +254,7 @@ public:
{}
//- Update for changes of mesh
- virtual void movePoints(const pointField&)
+ virtual void movePoints(const polyMesh&)
{}
//- Update for changes of mesh due to readUpdate
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 340b5cd091d..0d34fee8528 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -302,7 +302,7 @@ void Foam::sampledSets::updateMesh(const mapPolyMesh&)
}
-void Foam::sampledSets::movePoints(const pointField&)
+void Foam::sampledSets::movePoints(const polyMesh&)
{
correct();
}
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 2007cda3d5a..2b4987303d2 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -301,7 +301,7 @@ public:
virtual void updateMesh(const mapPolyMesh&);
//- Update for mesh point-motion
- virtual void movePoints(const pointField&);
+ virtual void movePoints(const polyMesh&);
//- Update for changes of mesh due to readUpdate
virtual void readUpdate(const polyMesh::readUpdateState state);
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index 6287722ae5e..89fc6a6e6e6 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -248,7 +248,7 @@ void Foam::sampledSurfaces::updateMesh(const mapPolyMesh&)
}
-void Foam::sampledSurfaces::movePoints(const pointField&)
+void Foam::sampledSurfaces::movePoints(const polyMesh&)
{
expire();
}
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index f16a2ceabfd..5278e850e9d 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -230,7 +230,7 @@ public:
virtual void updateMesh(const mapPolyMesh&);
//- Update for mesh point-motion - expires the surfaces
- virtual void movePoints(const pointField&);
+ virtual void movePoints(const polyMesh&);
//- Update for changes of mesh due to readUpdate - expires the surfaces
virtual void readUpdate(const polyMesh::readUpdateState state);
--
GitLab