Commit 9d5ce4ae authored by andy's avatar andy
Browse files

ENH: Updated function objects

parent 6aba1d08
......@@ -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&)
{}
};
......
......@@ -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&)
{}
};
......
......@@ -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&)
{}
};
......
......@@ -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&)
{}
};
......
......@@ -170,7 +170,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -408,7 +408,7 @@ void Foam::fieldAverage::updateMesh(const mapPolyMesh&)
}
void Foam::fieldAverage::movePoints(const pointField&)
void Foam::fieldAverage::movePoints(const polyMesh&)
{
// Do nothing
}
......
......@@ -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&);
};
......
......@@ -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&)
{}
};
......
......@@ -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&)
{}
};
......
......@@ -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
}
// ************************************************************************* //
......@@ -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);
......
......@@ -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
}
// ************************************************************************* //
......@@ -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&);
};
......
......@@ -199,7 +199,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -153,7 +153,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -181,7 +181,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -274,7 +274,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -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_);
......
......@@ -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);
......
......@@ -177,7 +177,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -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&)
{}
};
......
......@@ -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_);
......
......@@ -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);
......
......@@ -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&)
{}
};
......
......@@ -155,7 +155,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -158,7 +158,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -152,7 +152,7 @@ public:
{}
//- Update for changes of mesh
virtual void movePoints(const pointField&)
virtual void movePoints(const polyMesh&)
{}
};
......
......@@ -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&)
{}
};
......
......@@ -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&)