zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

strange triFace constructors

Browse Source
This commit is contained in:
mattijs
2008-05-29 13:26:21 +01:00
parent 2f6a6be48b
commit 2e0962685a
2 changed files with 22 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
View File

@ -81,11 +81,8 @@ public:
const label c
);
//- Construct from a face, discarding excess points
inline triFace(const face&);
//- Construct from a labelList, discarding excess points
explicit inline triFace(const labelList&);
//- Construct from a UList<label>
explicit inline triFace(const UList<label>&);
//- Construct from Istream
inline triFace(Istream&);

60
src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
View File

@ -28,15 +28,9 @@ License
#include "face.H"
#include "triPointRef.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
inline int triFace::compare(const triFace& a, const triFace& b)
inline int Foam::triFace::compare(const triFace& a, const triFace& b)
{
if
(
@ -64,15 +58,14 @@ inline int triFace::compare(const triFace& a, const triFace& b)
}
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct null
inline triFace::triFace()
inline Foam::triFace::triFace()
{}
// Construct from components
inline triFace::triFace
inline Foam::triFace::triFace
(
const label a,
const label b,
@ -84,20 +77,14 @@ inline triFace::triFace
operator[](2) = c;
}
// Construct from a face
inline triFace::triFace(const face& f)
:
FixedList<label, 3>(SubList<label>(f,3))
{}
// Construct from a labelList
inline triFace::triFace(const labelList& l)
inline Foam::triFace::triFace(const UList<label>& l)
:
FixedList<label, 3>(SubList<label>(l,3))
FixedList<label, 3>(l)
{}
inline triFace::triFace(Istream& is)
inline Foam::triFace::triFace(Istream& is)
:
FixedList<label, 3>(is)
{}
@ -105,7 +92,6 @@ inline triFace::triFace(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline Foam::label Foam::triFace::collapse()
{
// we cannot resize a FixedList, so mark duplicates with '-1'
@ -133,8 +119,7 @@ inline Foam::label Foam::triFace::collapse()
}
// Return the points associated with this face
inline pointField triFace::points(const pointField& points) const
inline Foam::pointField Foam::triFace::points(const pointField& points) const
{
pointField p(3);
@ -146,8 +131,7 @@ inline pointField triFace::points(const pointField& points) const
}
// Return triagle as a face
inline face triFace::triFaceFace() const
inline Foam::face Foam::triFace::triFaceFace() const
{
face f(3);
@ -159,13 +143,13 @@ inline face triFace::triFaceFace() const
}
inline label triFace::nEdges() const
inline Foam::label Foam::triFace::nEdges() const
{
return 3;
}
inline edgeList triFace::edges() const
inline Foam::edgeList Foam::triFace::edges() const
{
edgeList e(3);
@ -186,7 +170,7 @@ inline edgeList triFace::edges() const
// - +1: forward (counter-clockwise) on the face
// - -1: reverse (clockwise) on the face
// - 0: edge not found on the face
inline int triFace::edgeDirection(const edge& e) const
inline int Foam::triFace::edgeDirection(const edge& e) const
{
if
(
@ -213,7 +197,7 @@ inline int triFace::edgeDirection(const edge& e) const
}
inline point triFace::centre(const pointField& points) const
inline Foam::point Foam::triFace::centre(const pointField& points) const
{
return (1.0/3.0)*
(
@ -224,13 +208,13 @@ inline point triFace::centre(const pointField& points) const
}
inline scalar triFace::mag(const pointField& points) const
inline Foam::scalar Foam::triFace::mag(const pointField& points) const
{
return ::Foam::mag(normal(points));
}
inline vector triFace::normal(const pointField& points) const
inline Foam::vector Foam::triFace::normal(const pointField& points) const
{
return 0.5*
(
@ -240,7 +224,7 @@ inline vector triFace::normal(const pointField& points) const
}
inline scalar triFace::sweptVol
inline Foam::scalar Foam::triFace::sweptVol
(
const pointField& opts,
const pointField& npts
@ -273,7 +257,7 @@ inline scalar triFace::sweptVol
}
inline pointHit triFace::ray
inline Foam::pointHit Foam::triFace::ray
(
const point& p,
const vector& q,
@ -291,7 +275,7 @@ inline pointHit triFace::ray
}
inline triPointRef triFace::tri(const pointField& points) const
inline Foam::triPointRef Foam::triFace::tri(const pointField& points) const
{
return triPointRef
(
@ -304,20 +288,16 @@ inline triPointRef triFace::tri(const pointField& points) const
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
inline bool operator==(const triFace& a, const triFace& b)
inline bool Foam::operator==(const triFace& a, const triFace& b)
{
return triFace::compare(a,b) != 0;
}
inline bool operator!=(const triFace& a, const triFace& b)
inline bool Foam::operator!=(const triFace& a, const triFace& b)
{
return triFace::compare(a,b) == 0;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //