Commit 3e0ec9d8 authored by Andrew Heather's avatar Andrew Heather
Browse files

code tidying

parent dc385799
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "DispersionModel.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "cloudAbsorptionEmission.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "cloudScatter.H"
......
......@@ -244,6 +244,7 @@ class PointEdgeWave
//- Disallow default bitwise assignment
void operator=(const PointEdgeWave&);
public:
// Static Functions
......@@ -261,7 +262,6 @@ public:
}
// Constructors
//- Construct from mesh, list of changed points with the Type
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "PointEdgeWave.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "pointEdgePoint.H"
......@@ -32,8 +30,6 @@ Description
Foam::point Foam::pointEdgePoint::greatPoint(GREAT, GREAT, GREAT);
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
Foam::Ostream& Foam::operator<<
......@@ -45,9 +41,11 @@ Foam::Ostream& Foam::operator<<
return os << wDist.origin() << wDist.distSqr();
}
Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::pointEdgePoint& wDist)
{
return is >> wDist.origin_ >> wDist.distSqr_;
}
// ************************************************************************* //
......@@ -45,7 +45,6 @@ SourceFiles
#include "tensor.H"
#include "pTraits.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
......@@ -69,6 +68,7 @@ class pointEdgePoint
//- normal distance (squared) from point to origin
scalar distSqr_;
// Private Member Functions
//- Evaluate distance to point. Update distSqr, origin from whomever
......@@ -89,6 +89,7 @@ class pointEdgePoint
const scalar tol
);
public:
// Static data members
......@@ -96,6 +97,7 @@ public:
//- initial point far away.
static point greatPoint;
// Constructors
//- Construct null
......
......@@ -46,7 +46,7 @@ inline bool Foam::pointEdgePoint::update
origin_ = w2.origin();
return true;
}
}
scalar diff = distSqr_ - dist2;
......@@ -71,7 +71,7 @@ inline bool Foam::pointEdgePoint::update
}
}
// Update this with w2 (information on same point)
inline bool Foam::pointEdgePoint::update
(
......@@ -86,7 +86,7 @@ inline bool Foam::pointEdgePoint::update
origin_ = w2.origin();
return true;
}
}
scalar diff = distSqr_ - w2.distSqr();
......@@ -111,6 +111,7 @@ inline bool Foam::pointEdgePoint::update
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Null constructor
......@@ -124,7 +125,7 @@ inline Foam::pointEdgePoint::pointEdgePoint()
// Construct from origin, distance
inline Foam::pointEdgePoint::pointEdgePoint
(
const point& origin,
const point& origin,
const scalar distSqr
)
:
......@@ -229,14 +230,14 @@ inline bool Foam::pointEdgePoint::updatePoint
const scalar tol
)
{
return
return
update
(
mesh.points()[pointI],
edgeInfo,
tol
);
}
}
// Update this with new information on same point
......@@ -255,7 +256,7 @@ inline bool Foam::pointEdgePoint::updatePoint
newPointInfo,
tol
);
}
}
// Update this with new information on same point. No extra information.
......@@ -266,7 +267,7 @@ inline bool Foam::pointEdgePoint::updatePoint
)
{
return update(newPointInfo, tol);
}
}
// Update this with information from connected point
......@@ -292,7 +293,7 @@ inline bool Foam::pointEdgePoint::updateEdge
pointInfo,
tol
);
}
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "cellClassification.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "cellInfo.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "cellDistFuncs.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "wallPoint.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "wallPointData.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "cellFeatures.H"
......
......@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Class calculates cell quality measures.
\*---------------------------------------------------------------------------*/
......
......@@ -111,10 +111,7 @@ Foam::coordinateSystem::coordinateSystem
}
Foam::coordinateSystem::coordinateSystem
(
const dictionary& dict
)
Foam::coordinateSystem::coordinateSystem(const dictionary& dict)
:
name_(type()),
note_(),
......@@ -322,16 +319,17 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
os.writeKeyword("note") << note_ << token::END_STATEMENT << nl;
}
os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl;
os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl;
os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
if (subDict)
{
os << decrIndent << indent << token::END_BLOCK << endl;
os << decrIndent << indent << token::END_BLOCK << endl;
}
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
void Foam::coordinateSystem::operator=(const dictionary& rhs)
......
......@@ -166,6 +166,7 @@ class coordinateSystem
//- Global-to-Local transformation tensor
tensor Rtr_;
protected:
// Protected Member Functions
......@@ -194,6 +195,7 @@ protected:
bool translate
) const;
public:
//- Runtime type information
......@@ -249,6 +251,7 @@ public:
return autoPtr<coordinateSystem>(new coordinateSystem(*this));
}
// Declare run-time constructor selection table
declareRunTimeSelectionTable
......@@ -276,6 +279,7 @@ public:
(name, origin, cr)
);
// Selectors
//- Select constructed from dictionary
......@@ -297,160 +301,170 @@ public:
//- Select constructed from Istream
static autoPtr<coordinateSystem> New(Istream& is);
// Destructor
virtual ~coordinateSystem();
//- Destructor
virtual ~coordinateSystem();
// Member Functions
// Access
// Access
//- Return name
const word& name() const
{
return name_;
}
//- Return name
const word& name() const
{
return name_;
}
//- Return non-constant access to the optional note
string& note()
{
return note_;
}
//- Return non-constant access to the optional note
string& note()
{
return note_;
}
//- Return the optional note
const string& note() const
{
return note_;
}
//- Return the optional note
const string& note() const
{
return note_;
}
//- Return origin
const point& origin() const
{
return origin_;
}
//- Return origin
const point& origin() const
{
return origin_;
}
//- Return coordinate rotation
const coordinateRotation& rotation() const
{
return R_;
}
//- Return coordinate rotation
const coordinateRotation& rotation() const
{
return R_;
}
//- Return local-to-global transformation tensor
const tensor& R() const
{
return R_;
}
//- Return local-to-global transformation tensor
const tensor& R() const
{
return R_;
}
//- Return local Cartesian x-axis
const vector& e1() const
{
return Rtr_.x();
}
//- Return local Cartesian x-axis
const vector& e1() const
{
return Rtr_.x();
}
//- Return local Cartesian y-axis
const vector& e2() const
{
return Rtr_.y();
}
//- Return local Cartesian y-axis
const vector& e2() const
{
return Rtr_.y();
}
//- Return local Cartesian z-axis
const vector& e3() const
{
return Rtr_.z();
}
//- Return local Cartesian z-axis
const vector& e3() const
{
return Rtr_.z();
}
//- Return axis (e3: local Cartesian z-axis)
// @deprecated method e3 is preferred
const vector& axis() const
{
return Rtr_.z();
}
//- Return axis (e3: local Cartesian z-axis)
// @deprecated method e3 is preferred
const vector& axis() const
{
return Rtr_.z();
}
//- Return direction (e1: local Cartesian x-axis)
// @deprecated method e1 is preferred
const vector& direction() const
{
return Rtr_.x();
}
//- Return direction (e1: local Cartesian x-axis)
// @deprecated method e1 is preferred
const vector& direction() const
{
return Rtr_.x();
}
//- Return as dictionary of entries
// @param [in] ignoreType drop type (cartesian, cylindrical, etc)
// when generating the dictionary
virtual dictionary dict(bool ignoreType=false) const;
//- Return as dictionary of entries
// @param [in] ignoreType drop type (cartesian, cylindrical, etc)
// when generating the dictionary
virtual dictionary dict(bool ignoreType=false) const;
// Edit
// Edit
//- Rename
virtual void rename(const word& newName)
{
name_ = newName;
}
//- Rename
virtual void rename(const word& newName)
{
name_ = newName;
}
//- Edit access to origin
point& origin()
{
return origin_;
}
//- Edit access to origin
point& origin()
{
return origin_;
}
// Write
//- Write
virtual void write(Ostream&) const;
// Write
//- Write dictionary
virtual void writeDict(Ostream&, bool subDict=true) const;
//- Write
virtual void write(Ostream&) const;
// Transformations
//- Write dictionary
virtual void writeDict(Ostream&, bool subDict=true) const;
//- Convert from position in local coordinate system to global Cartesian position
point globalPosition(const point& local) const
{
return localToGlobal(local, true);
}
//- Convert from position in local coordinate system to global Cartesian position
tmp<pointField> globalPosition(const pointField& local) const
{
return localToGlobal(local, true);
}
// Transformations
//- Convert from vector components in local coordinate system to global Cartesian vector
vector globalVector(const vector& local) const
{
return localToGlobal(local, false);
}
//- Convert from position in local coordinate system to global
// Cartesian position
point globalPosition(const point& local) const
{
return localToGlobal(local, true);
}
//- Convert from vector components in local coordinate system to global Cartesian vector
tmp<vectorField> globalVector(const vectorField& local) const
{
return localToGlobal(local, false);
}
//- Convert from position in local coordinate system to global
// Cartesian position
tmp<pointField> globalPosition(const pointField& local) const
{
return localToGlobal(local, true);
}
//- Convert from global Cartesian position to position in local coordinate system
point localPosition(const point& global) const
{
return globalToLocal(global, true);
}
//- Convert from vector components in local coordinate system to
// global Cartesian vector
vector globalVector(const vector& local) const
{
return localToGlobal(local, false);
}
//- Convert from global Cartesian position to position in local coordinate system
tmp<pointField> localPosition(const pointField& global) const
{
return globalToLocal(global, true);
}
//- Convert from vector components in local coordinate system to
// global Cartesian vector
tmp<vectorField> globalVector(const vectorField& local) const
{
return localToGlobal(local, false);
}
//- Convert from global Cartesian vector to components in local coordinate system
vector localVector(const vector& global) const
{
return globalToLocal(global, false);
}
//- Convert from global Cartesian position to position in local
// coordinate system
point localPosition(const point& global) const
{
return globalToLocal(global, true);
}
//- Convert from global Cartesian vector to components in local coordinate system
tmp<vectorField> localVector(const vectorField& global) const
{
return globalToLocal(global, false);
}
//- Convert from global Cartesian position to position in local
// coordinate system
tmp<pointField> localPosition(const pointField& global) const
{
return globalToLocal(global, true);
}
//- Convert from global Cartesian vector to components in local
// coordinate system
vector localVector(const vector& global) const