code tidying

This commit is contained in:
andy
2009-08-18 10:43:51 +01:00
parent dc385799db
commit 3e0ec9d835
95 changed files with 194 additions and 368 deletions

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "DispersionModel.H" #include "DispersionModel.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cloudAbsorptionEmission.H" #include "cloudAbsorptionEmission.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cloudScatter.H" #include "cloudScatter.H"

View File

@ -244,6 +244,7 @@ class PointEdgeWave
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const PointEdgeWave&); void operator=(const PointEdgeWave&);
public: public:
// Static Functions // Static Functions
@ -261,7 +262,6 @@ public:
} }
// Constructors // Constructors
//- Construct from mesh, list of changed points with the Type //- Construct from mesh, list of changed points with the Type

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "PointEdgeWave.H" #include "PointEdgeWave.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pointEdgePoint.H" #include "pointEdgePoint.H"
@ -32,8 +30,6 @@ Description
Foam::point Foam::pointEdgePoint::greatPoint(GREAT, GREAT, GREAT); Foam::point Foam::pointEdgePoint::greatPoint(GREAT, GREAT, GREAT);
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
Foam::Ostream& Foam::operator<< Foam::Ostream& Foam::operator<<
@ -45,9 +41,11 @@ Foam::Ostream& Foam::operator<<
return os << wDist.origin() << wDist.distSqr(); return os << wDist.origin() << wDist.distSqr();
} }
Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::pointEdgePoint& wDist) Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::pointEdgePoint& wDist)
{ {
return is >> wDist.origin_ >> wDist.distSqr_; return is >> wDist.origin_ >> wDist.distSqr_;
} }
// ************************************************************************* // // ************************************************************************* //

View File

@ -45,7 +45,6 @@ SourceFiles
#include "tensor.H" #include "tensor.H"
#include "pTraits.H" #include "pTraits.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
@ -69,6 +68,7 @@ class pointEdgePoint
//- normal distance (squared) from point to origin //- normal distance (squared) from point to origin
scalar distSqr_; scalar distSqr_;
// Private Member Functions // Private Member Functions
//- Evaluate distance to point. Update distSqr, origin from whomever //- Evaluate distance to point. Update distSqr, origin from whomever
@ -89,6 +89,7 @@ class pointEdgePoint
const scalar tol const scalar tol
); );
public: public:
// Static data members // Static data members
@ -96,6 +97,7 @@ public:
//- initial point far away. //- initial point far away.
static point greatPoint; static point greatPoint;
// Constructors // Constructors
//- Construct null //- Construct null

View File

@ -46,7 +46,7 @@ inline bool Foam::pointEdgePoint::update
origin_ = w2.origin(); origin_ = w2.origin();
return true; return true;
} }
scalar diff = distSqr_ - dist2; scalar diff = distSqr_ - dist2;
@ -71,7 +71,7 @@ inline bool Foam::pointEdgePoint::update
} }
} }
// Update this with w2 (information on same point) // Update this with w2 (information on same point)
inline bool Foam::pointEdgePoint::update inline bool Foam::pointEdgePoint::update
( (
@ -86,7 +86,7 @@ inline bool Foam::pointEdgePoint::update
origin_ = w2.origin(); origin_ = w2.origin();
return true; return true;
} }
scalar diff = distSqr_ - w2.distSqr(); scalar diff = distSqr_ - w2.distSqr();
@ -111,6 +111,7 @@ inline bool Foam::pointEdgePoint::update
} }
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Null constructor // Null constructor
@ -124,7 +125,7 @@ inline Foam::pointEdgePoint::pointEdgePoint()
// Construct from origin, distance // Construct from origin, distance
inline Foam::pointEdgePoint::pointEdgePoint inline Foam::pointEdgePoint::pointEdgePoint
( (
const point& origin, const point& origin,
const scalar distSqr const scalar distSqr
) )
: :
@ -229,14 +230,14 @@ inline bool Foam::pointEdgePoint::updatePoint
const scalar tol const scalar tol
) )
{ {
return return
update update
( (
mesh.points()[pointI], mesh.points()[pointI],
edgeInfo, edgeInfo,
tol tol
); );
} }
// Update this with new information on same point // Update this with new information on same point
@ -255,7 +256,7 @@ inline bool Foam::pointEdgePoint::updatePoint
newPointInfo, newPointInfo,
tol tol
); );
} }
// Update this with new information on same point. No extra information. // Update this with new information on same point. No extra information.
@ -266,7 +267,7 @@ inline bool Foam::pointEdgePoint::updatePoint
) )
{ {
return update(newPointInfo, tol); return update(newPointInfo, tol);
} }
// Update this with information from connected point // Update this with information from connected point
@ -292,7 +293,7 @@ inline bool Foam::pointEdgePoint::updateEdge
pointInfo, pointInfo,
tol tol
); );
} }
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellClassification.H" #include "cellClassification.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellInfo.H" #include "cellInfo.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellDistFuncs.H" #include "cellDistFuncs.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "wallPoint.H" #include "wallPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "wallPointData.H" #include "wallPointData.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellFeatures.H" #include "cellFeatures.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Class calculates cell quality measures.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/

View File

@ -111,10 +111,7 @@ Foam::coordinateSystem::coordinateSystem
} }
Foam::coordinateSystem::coordinateSystem Foam::coordinateSystem::coordinateSystem(const dictionary& dict)
(
const dictionary& dict
)
: :
name_(type()), name_(type()),
note_(), note_(),
@ -322,16 +319,17 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
os.writeKeyword("note") << note_ << token::END_STATEMENT << nl; os.writeKeyword("note") << note_ << token::END_STATEMENT << nl;
} }
os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl; os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl; os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl;
os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl; os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
if (subDict) if (subDict)
{ {
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }
} }
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
void Foam::coordinateSystem::operator=(const dictionary& rhs) void Foam::coordinateSystem::operator=(const dictionary& rhs)

View File

@ -166,6 +166,7 @@ class coordinateSystem
//- Global-to-Local transformation tensor //- Global-to-Local transformation tensor
tensor Rtr_; tensor Rtr_;
protected: protected:
// Protected Member Functions // Protected Member Functions
@ -194,6 +195,7 @@ protected:
bool translate bool translate
) const; ) const;
public: public:
//- Runtime type information //- Runtime type information
@ -249,6 +251,7 @@ public:
return autoPtr<coordinateSystem>(new coordinateSystem(*this)); return autoPtr<coordinateSystem>(new coordinateSystem(*this));
} }
// Declare run-time constructor selection table // Declare run-time constructor selection table
declareRunTimeSelectionTable declareRunTimeSelectionTable
@ -276,6 +279,7 @@ public:
(name, origin, cr) (name, origin, cr)
); );
// Selectors // Selectors
//- Select constructed from dictionary //- Select constructed from dictionary
@ -297,160 +301,170 @@ public:
//- Select constructed from Istream //- Select constructed from Istream
static autoPtr<coordinateSystem> New(Istream& is); static autoPtr<coordinateSystem> New(Istream& is);
// Destructor
virtual ~coordinateSystem(); //- Destructor
virtual ~coordinateSystem();
// Member Functions // Member Functions
// Access // Access
//- Return name //- Return name
const word& name() const const word& name() const
{ {
return name_; return name_;
} }
//- Return non-constant access to the optional note //- Return non-constant access to the optional note
string& note() string& note()
{ {
return note_; return note_;
} }
//- Return the optional note //- Return the optional note
const string& note() const const string& note() const
{ {
return note_; return note_;
} }
//- Return origin //- Return origin
const point& origin() const const point& origin() const
{ {
return origin_; return origin_;
} }
//- Return coordinate rotation //- Return coordinate rotation
const coordinateRotation& rotation() const const coordinateRotation& rotation() const
{ {
return R_; return R_;
} }
//- Return local-to-global transformation tensor //- Return local-to-global transformation tensor
const tensor& R() const const tensor& R() const
{ {
return R_; return R_;
} }
//- Return local Cartesian x-axis //- Return local Cartesian x-axis
const vector& e1() const const vector& e1() const
{ {
return Rtr_.x(); return Rtr_.x();
} }
//- Return local Cartesian y-axis //- Return local Cartesian y-axis
const vector& e2() const const vector& e2() const
{ {
return Rtr_.y(); return Rtr_.y();
} }
//- Return local Cartesian z-axis //- Return local Cartesian z-axis
const vector& e3() const const vector& e3() const
{ {
return Rtr_.z(); return Rtr_.z();
} }
//- Return axis (e3: local Cartesian z-axis) //- Return axis (e3: local Cartesian z-axis)
// @deprecated method e3 is preferred // @deprecated method e3 is preferred
const vector& axis() const const vector& axis() const
{ {
return Rtr_.z(); return Rtr_.z();
} }
//- Return direction (e1: local Cartesian x-axis) //- Return direction (e1: local Cartesian x-axis)
// @deprecated method e1 is preferred // @deprecated method e1 is preferred
const vector& direction() const const vector& direction() const
{ {
return Rtr_.x(); return Rtr_.x();
} }
//- Return as dictionary of entries //- Return as dictionary of entries
// @param [in] ignoreType drop type (cartesian, cylindrical, etc) // @param [in] ignoreType drop type (cartesian, cylindrical, etc)
// when generating the dictionary // when generating the dictionary
virtual dictionary dict(bool ignoreType=false) const; virtual dictionary dict(bool ignoreType=false) const;
// Edit // Edit
//- Rename //- Rename
virtual void rename(const word& newName) virtual void rename(const word& newName)
{ {
name_ = newName; name_ = newName;
} }
//- Edit access to origin //- Edit access to origin
point& origin() point& origin()
{ {
return origin_; return origin_;
} }
// Write
//- Write // Write
virtual void write(Ostream&) const;
//- Write dictionary //- Write
virtual void writeDict(Ostream&, bool subDict=true) const; 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 // Transformations
tmp<pointField> globalPosition(const pointField& local) const
{
return localToGlobal(local, true);
}
//- Convert from vector components in local coordinate system to global Cartesian vector //- Convert from position in local coordinate system to global
vector globalVector(const vector& local) const // Cartesian position
{ point globalPosition(const point& local) const
return localToGlobal(local, false); {
} return localToGlobal(local, true);
}
//- Convert from vector components in local coordinate system to global Cartesian vector //- Convert from position in local coordinate system to global
tmp<vectorField> globalVector(const vectorField& local) const // Cartesian position
{ tmp<pointField> globalPosition(const pointField& local) const
return localToGlobal(local, false); {
} return localToGlobal(local, true);
}
//- Convert from global Cartesian position to position in local coordinate system //- Convert from vector components in local coordinate system to
point localPosition(const point& global) const // global Cartesian vector
{ vector globalVector(const vector& local) const
return globalToLocal(global, true); {
} return localToGlobal(local, false);
}
//- Convert from global Cartesian position to position in local coordinate system //- Convert from vector components in local coordinate system to
tmp<pointField> localPosition(const pointField& global) const // global Cartesian vector
{ tmp<vectorField> globalVector(const vectorField& local) const
return globalToLocal(global, true); {
} return localToGlobal(local, false);
}
//- Convert from global Cartesian vector to components in local coordinate system //- Convert from global Cartesian position to position in local
vector localVector(const vector& global) const // coordinate system
{ point localPosition(const point& global) const
return globalToLocal(global, false); {
} return globalToLocal(global, true);
}
//- Convert from global Cartesian vector to components in local coordinate system //- Convert from global Cartesian position to position in local
tmp<vectorField> localVector(const vectorField& global) const // coordinate system
{ tmp<pointField> localPosition(const pointField& global) const
return globalToLocal(global, false); {
} return globalToLocal(global, true);
}
//- 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 vector to components in local
// coordinate system
tmp<vectorField> localVector(const vectorField& global) const
{
return globalToLocal(global, false);
}
// Member Operators // Member Operators
@ -467,6 +481,7 @@ public:
const coordinateSystem& const coordinateSystem&
); );
// IOstream Operators // IOstream Operators
friend Ostream& operator<<(Ostream&, const coordinateSystem&); friend Ostream& operator<<(Ostream&, const coordinateSystem&);

View File

@ -121,4 +121,5 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
return New(name, dict); return New(name, dict);
} }
// ************************************************************************* // // ************************************************************************* //

View File

@ -64,6 +64,7 @@ class coordinateSystems
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const coordinateSystems&); void operator=(const coordinateSystems&);
public: public:
//- Runtime type information //- Runtime type information
@ -88,11 +89,13 @@ public:
const Xfer<PtrList<coordinateSystem> >& const Xfer<PtrList<coordinateSystem> >&
); );
// Selectors // Selectors
//- Return previously registered or read construct from "constant" //- Return previously registered or read construct from "constant"
static const coordinateSystems& New(const objectRegistry&); static const coordinateSystems& New(const objectRegistry&);
// Member Functions // Member Functions
//- Find and return index for a given keyword, returns -1 if not found //- Find and return index for a given keyword, returns -1 if not found

View File

@ -86,6 +86,7 @@ protected:
bool translate bool translate
) const; ) const;
public: public:
//- Runtime type information //- Runtime type information
@ -142,7 +143,6 @@ public:
//- Non-const access to inDegrees //- Non-const access to inDegrees
bool& inDegrees(); bool& inDegrees();
}; };

View File

@ -159,6 +159,7 @@ Foam::vector Foam::parabolicCylindricalCS::globalToLocal
return vector::zero; return vector::zero;
} }
Foam::tmp<Foam::vectorField> Foam::parabolicCylindricalCS::globalToLocal Foam::tmp<Foam::vectorField> Foam::parabolicCylindricalCS::globalToLocal
( (
const vectorField& global, const vectorField& global,

View File

@ -85,6 +85,7 @@ protected:
bool translate bool translate
) const; ) const;
public: public:
//- Runtime type information //- Runtime type information
@ -106,7 +107,6 @@ public:
//- Construct from dictionary //- Construct from dictionary
parabolicCylindricalCS(const word&, const dictionary&); parabolicCylindricalCS(const word&, const dictionary&);
}; };

View File

@ -85,6 +85,7 @@ protected:
bool translate bool translate
) const; ) const;
public: public:
//- Runtime type information //- Runtime type information
@ -141,7 +142,6 @@ public:
//- Non-const access to inDegrees //- Non-const access to inDegrees
bool& inDegrees(); bool& inDegrees();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -158,8 +158,8 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
{ {
if (subDict) if (subDict)
{ {
os << indent << name() << nl os << indent << name() << nl
<< indent << token::BEGIN_BLOCK << incrIndent << nl; << indent << token::BEGIN_BLOCK << incrIndent << nl;
} }
coordinateSystem::writeDict(os, false); coordinateSystem::writeDict(os, false);
@ -167,8 +167,9 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
if (subDict) if (subDict)
{ {
os << decrIndent << indent << token::END_BLOCK << endl; os << decrIndent << indent << token::END_BLOCK << endl;
} }
} }
// ************************************************************************* // // ************************************************************************* //

View File

@ -46,7 +46,6 @@ SourceFiles
namespace Foam namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class toroidalCS Declaration Class toroidalCS Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -86,6 +85,7 @@ class toroidalCS
bool translate bool translate
) const; ) const;
public: public:
//- Runtime type information //- Runtime type information
@ -103,7 +103,6 @@ public:
const scalar radius const scalar radius
); );
//- Construct from dictionary //- Construct from dictionary
toroidalCS(const word& name, const dictionary&); toroidalCS(const word& name, const dictionary&);

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "indexedOctree.H" #include "indexedOctree.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "treeDataPoint.H" #include "treeDataPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "octree.H" #include "octree.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "octreeDataCell.H" #include "octreeDataCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
//#include "octreeDataPointTreeLeaf.H" //#include "octreeDataPointTreeLeaf.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "octree.H" #include "octree.H"

View File

@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
IOList of pointIndexHits
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pointIndexHitIOList.H" #include "pointIndexHitIOList.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "treeLeaf.H" #include "treeLeaf.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "treeLeaf.H" #include "treeLeaf.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "treeNode.H" #include "treeNode.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "treeNode.H" #include "treeNode.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "boxToCell.H" #include "boxToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellToCell.H" #include "cellToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "faceToCell.H" #include "faceToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fieldToCell.H" #include "fieldToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "nearestToCell.H" #include "nearestToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pointToCell.H" #include "pointToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "rotatedBoxToCell.H" #include "rotatedBoxToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "shapeToCell.H" #include "shapeToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "surfaceToCell.H" #include "surfaceToCell.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "boundaryToFace.H" #include "boundaryToFace.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "boxToFace.H" #include "boxToFace.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "faceToFace.H" #include "faceToFace.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "labelToFace.H" #include "labelToFace.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "normalToFace.H" #include "normalToFace.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "patchToFace.H" #include "patchToFace.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pointToFace.H" #include "pointToFace.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "boxToPoint.H" #include "boxToPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellToPoint.H" #include "cellToPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "faceToPoint.H" #include "faceToPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "labelToPoint.H" #include "labelToPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pointToPoint.H" #include "pointToPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "surfaceToPoint.H" #include "surfaceToPoint.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "topoSetSource.H" #include "topoSetSource.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "surfaceSets.H" #include "surfaceSets.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "booleanSurface.H" #include "booleanSurface.H"
@ -1098,7 +1096,4 @@ Foam::booleanSurface::booleanSurface
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* // // ************************************************************************* //

View File

@ -82,6 +82,7 @@ class booleanSurface
INSIDE INSIDE
}; };
// Private data // Private data
//- From new to old face + surface: //- From new to old face + surface:
@ -90,6 +91,7 @@ class booleanSurface
// face2 (e.g. face2I = -faceMap[]-1) // face2 (e.g. face2I = -faceMap[]-1)
labelList faceMap_; labelList faceMap_;
// Private Member Functions // Private Member Functions
//- Check whether subset of faces (from markZones) reaches up to //- Check whether subset of faces (from markZones) reaches up to
@ -151,6 +153,7 @@ class booleanSurface
labelList& side labelList& side
); );
public: public:
ClassName("booleanSurface"); ClassName("booleanSurface");
@ -175,7 +178,7 @@ public:
booleanSurface(); booleanSurface();
//- Construct from surfaces and face labels to keep. //- Construct from surfaces and face labels to keep.
// Walks from provided seed faces without crossing intersection line // Walks from provided seed faces without crossing intersection line
// to determine faces to keep. // to determine faces to keep.
booleanSurface booleanSurface
( (
@ -233,8 +236,6 @@ public:
} }
return -faceMap_[faceI]-1; return -faceMap_[faceI]-1;
} }
}; };

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "edgeSurface.H" #include "edgeSurface.H"

View File

@ -117,7 +117,6 @@ private:
void calcPointEdges(); void calcPointEdges();
public: public:
ClassName("edgeSurface"); ClassName("edgeSurface");

View File

@ -205,7 +205,6 @@ void Foam::intersectedSurface::printVisit
} }
// Check if the two vertices that f0 and f1 share are in the same order on // Check if the two vertices that f0 and f1 share are in the same order on
// both faces. // both faces.
bool Foam::intersectedSurface::sameEdgeOrder bool Foam::intersectedSurface::sameEdgeOrder

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "edgeIntersections.H" #include "edgeIntersections.H"
@ -46,7 +44,7 @@ Description
defineTypeNameAndDebug(Foam::edgeIntersections, 0); defineTypeNameAndDebug(Foam::edgeIntersections, 0);
Foam::scalar Foam::edgeIntersections::alignedCos_ = Foam::scalar Foam::edgeIntersections::alignedCos_ =
Foam::cos(89.0 * Foam::mathematicalConstant::pi/180.0); Foam::cos(89.0*Foam::mathematicalConstant::pi/180.0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -721,13 +719,4 @@ Foam::label Foam::edgeIntersections::removeDegenerates
} }
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
// ************************************************************************* // // ************************************************************************* //

View File

@ -131,6 +131,7 @@ class edgeIntersections
boolList& affectedEdges boolList& affectedEdges
) const; ) const;
public: public:
ClassName("edgeIntersections"); ClassName("edgeIntersections");

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "surfaceIntersection.H" #include "surfaceIntersection.H"
@ -201,7 +199,6 @@ bool Foam::surfaceIntersection::excludeEdgeHit
//} //}
void Foam::surfaceIntersection::storeIntersection void Foam::surfaceIntersection::storeIntersection
( (
const bool isFirstSurf, const bool isFirstSurf,

View File

@ -76,7 +76,7 @@ class triSurface;
class edgeIntersections; class edgeIntersections;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class surfaceIntersection Declaration Class surfaceIntersection Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class surfaceIntersection class surfaceIntersection
@ -171,7 +171,7 @@ class surfaceIntersection
// const point& eStart, // const point& eStart,
// const point& eEnd // const point& eEnd
//); //);
//- Debugging: Dump intersected edges to stream //- Debugging: Dump intersected edges to stream
void writeIntersectedEdges void writeIntersectedEdges
@ -233,6 +233,7 @@ class surfaceIntersection
List<DynamicList<label> >& surfEdgeCuts List<DynamicList<label> >& surfEdgeCuts
); );
public: public:
ClassName("surfaceIntersection"); ClassName("surfaceIntersection");
@ -284,7 +285,6 @@ public:
const labelListList& surf1EdgeCuts() const; const labelListList& surf1EdgeCuts() const;
const labelListList& surf2EdgeCuts() const; const labelListList& surf2EdgeCuts() const;
}; };

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "surfaceIntersection.H" #include "surfaceIntersection.H"
@ -37,9 +35,6 @@ Description
#include "octree.H" #include "octree.H"
#include "meshTools.H" #include "meshTools.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::surfaceIntersection::writeOBJ(const point& pt, Ostream& os) void Foam::surfaceIntersection::writeOBJ(const point& pt, Ostream& os)

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "surfaceIntersection.H" #include "surfaceIntersection.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "octreeDataTriSurface.H" #include "octreeDataTriSurface.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "octreeDataTriSurfaceTreeLeaf.H" #include "octreeDataTriSurfaceTreeLeaf.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "orientedSurface.H" #include "orientedSurface.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "surfaceFeatures.H" #include "surfaceFeatures.H"
@ -1097,8 +1095,8 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
// Step to next sample point using local distance. // Step to next sample point using local distance.
// Truncate to max 1/minSampleDist samples per feature edge. // Truncate to max 1/minSampleDist samples per feature edge.
// s += max(minSampleDist*eMag, sampleDist[e.start()]); // s += max(minSampleDist*eMag, sampleDist[e.start()]);
s += 0.01*eMag; s += 0.01*eMag;
if (s >= (1-minSampleDist)*eMag) if (s >= (1-minSampleDist)*eMag)
{ {

View File

@ -27,15 +27,6 @@ License
#include "surfaceLocation.H" #include "surfaceLocation.H"
#include "triSurface.H" #include "triSurface.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
@ -72,12 +63,6 @@ Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
} }
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
void Foam::surfaceLocation::write(Ostream& os, const triSurface& s) const void Foam::surfaceLocation::write(Ostream& os, const triSurface& s) const

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "triSurfaceTools.H" #include "triSurfaceTools.H"
@ -158,7 +156,7 @@ void Foam::triSurfaceTools::greenRefine
} }
// Refine all triangles marked for refinement. // Refine all triangles marked for refinement.
Foam::triSurface Foam::triSurfaceTools::doRefine Foam::triSurface Foam::triSurfaceTools::doRefine
( (
const triSurface& surf, const triSurface& surf,
@ -358,7 +356,7 @@ void Foam::triSurfaceTools::protectNeighbours
forAll(myFaces, myFaceI) forAll(myFaces, myFaceI)
{ {
label faceI = myFaces[myFaceI]; label faceI = myFaces[myFaceI];
if ((faceStatus[faceI] == ANYEDGE) || (faceStatus[faceI] >= 0)) if ((faceStatus[faceI] == ANYEDGE) || (faceStatus[faceI] >= 0))
{ {
faceStatus[faceI] = NOEDGE; faceStatus[faceI] = NOEDGE;
@ -392,10 +390,10 @@ Foam::labelHashSet Foam::triSurfaceTools::getCollapsedFaces
{ {
facesToBeCollapsed.insert(myFaces[myFaceI]); facesToBeCollapsed.insert(myFaces[myFaceI]);
} }
// From faces using v1 check if they share an edge with faces // From faces using v1 check if they share an edge with faces
// using v2. // using v2.
// - share edge: are part of 'splay' tree and will collapse if edge // - share edge: are part of 'splay' tree and will collapse if edge
// collapses // collapses
const labelList& v1Faces = surf.pointFaces()[v1]; const labelList& v1Faces = surf.pointFaces()[v1];
@ -795,7 +793,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
// //
// // Now neighbours contains first layer of triangles outside of // // Now neighbours contains first layer of triangles outside of
// // collapseFaces // // collapseFaces
// // There should be // // There should be
// // -two if edgeI is a boundary edge // // -two if edgeI is a boundary edge
// // since the outside 'edge' of collapseFaces should // // since the outside 'edge' of collapseFaces should
// // form a triangle and the face connected to edgeI is not inserted. // // form a triangle and the face connected to edgeI is not inserted.
@ -816,7 +814,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
// for (label j = i+1; j < neighbourList.size(); i++) // for (label j = i+1; j < neighbourList.size(); i++)
// { // {
// const labelList& faceJEdges = surf.faceEdges()[neighbourList[j]]; // const labelList& faceJEdges = surf.faceEdges()[neighbourList[j]];
// //
// // Check if faceI and faceJ share an edge // // Check if faceI and faceJ share an edge
// forAll(faceIEdges, fI) // forAll(faceIEdges, fI)
// { // {
@ -1194,7 +1192,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::visitFaces
nearest.setHit(); nearest.setHit();
nearest.triangle() = triI; nearest.triangle() = triI;
break; break;
} }
else else
{ {
// Which edge is cut. // Which edge is cut.
@ -1913,7 +1911,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
// Storage for new faces // Storage for new faces
DynamicList<labelledTri> newFaces(0); DynamicList<labelledTri> newFaces(0);
pointField newPoints(surf.localPoints()); pointField newPoints(surf.localPoints());
newPoints.setSize(surf.nPoints() + surf.nEdges()); newPoints.setSize(surf.nPoints() + surf.nEdges());
label newPointI = surf.nPoints(); label newPointI = surf.nPoints();
@ -2635,7 +2633,7 @@ Foam::triSurface Foam::triSurfaceTools::delaunay2D(const List<vector2D>& pts)
// // ~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~
// //
// label vertI = 0; // label vertI = 0;
// for // for
// ( // (
// Vertex_iterator it = T.vertices_begin(); // Vertex_iterator it = T.vertices_begin();
// it != T.vertices_end(); // it != T.vertices_end();
@ -2849,7 +2847,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
// Nearest point could be on point or edge. Retest. // Nearest point could be on point or edge. Retest.
label index, elemType; label index, elemType;
//bool inside = //bool inside =
triPointRef(s[triI].tri(s.points())).classify triPointRef(s[triI].tri(s.points())).classify
( (
trianglePoint, trianglePoint,
@ -2865,7 +2863,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
nearest.setHit(); nearest.setHit();
nearest.setIndex(triI); nearest.setIndex(triI);
nearest.elementType() = triPointRef::NONE; nearest.elementType() = triPointRef::NONE;
} }
else if (elemType == triPointRef::EDGE) else if (elemType == triPointRef::EDGE)
{ {
nearest.setMiss(); nearest.setMiss();

View File

@ -22,11 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Class applies a two-dimensional correction to mesh motion point field.
The correction guarantees that the mesh does not get twisted during motion
and thus introduce a third dimension into a 2-D problem.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "twoDPointCorrector.H" #include "twoDPointCorrector.H"

View File

@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Selection function for 'basic' density-based thermodynamics
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "basicRhoThermo.H" #include "basicRhoThermo.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "liquidMixture.H" #include "liquidMixture.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
*/ */

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "iC3H8O.H" #include "iC3H8O.H"

View File

@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Perfect gas equation of state.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "perfectGas.H" #include "perfectGas.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "IrreversibleReaction.H" #include "IrreversibleReaction.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "NonEquilibriumReversibleReaction.H" #include "NonEquilibriumReversibleReaction.H"

View File

@ -22,10 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Simple extension of ReactionThermo to handle Reaction kinetics in addition
to the equilibrium thermodynamics already handled.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "Reaction.H" #include "Reaction.H"
@ -207,7 +203,7 @@ Reaction<ReactionThermo>::Reaction
setLRhs(is); setLRhs(is);
setThermo(thermoDatabase); setThermo(thermoDatabase);
} }
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "ReversibleReaction.H" #include "ReversibleReaction.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "reactionTypes.H" #include "reactionTypes.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "makeReactionThermo.H" #include "makeReactionThermo.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "reactionTypes.H" #include "reactionTypes.H"

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "speciesTable.H" #include "speciesTable.H"

View File

@ -22,10 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Constant properties Transport package. Templated ito a given
thermodynamics package (needed for thermal conductivity).
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "constTransport.H" #include "constTransport.H"

View File

@ -22,14 +22,9 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Basic species Transport type based on the use of a fitting
function for nu. All other properties are derived from function for nu. All other properties are derived from
this primitive function. this primitive function.
The nu function must be provided by the derived type,
e.g. SutherlandTransport.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "speciesTransport.H" #include "speciesTransport.H"

View File

@ -38,7 +38,6 @@ SourceFiles
speciesTransportI.H speciesTransportI.H
speciesTransport.C speciesTransport.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef speciesTransport_H #ifndef speciesTransport_H

View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "NSRDSfunc4.H" #include "NSRDSfunc4.H"