diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C index eb9c375ccd..8fbb2bd8d4 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/face.C +++ b/src/OpenFOAM/meshes/meshShapes/face/face.C @@ -618,19 +618,17 @@ Foam::face Foam::face::reverseFace() const Foam::label Foam::face::which(const label globalIndex) const { - label pointInFace = -1; const labelList& f = *this; - forAll(f, i) + forAll(f, localIdx) { - if (f[i] == globalIndex) + if (f[localIdx] == globalIndex) { - pointInFace = i; - break; + return localIdx; } } - return pointInFace; + return -1; } @@ -654,9 +652,7 @@ Foam::scalar Foam::face::sweptVol point nextOldPoint = centreOldPoint; point nextNewPoint = centreNewPoint; - register label pI; - - for (pI = 0; pI < nPoints; pI++) + for (register label pI = 0; pI < nPoints; ++pI) { if (pI < nPoints - 1) { @@ -708,20 +704,18 @@ Foam::tensor Foam::face::inertia ).inertia(refPt, density); } - point c = centre(p); + const point ctr = centre(p); tensor J = tensor::zero; forAll(*this, i) { - triPointRef t + J += triPointRef ( p[operator[](i)], p[operator[](fcIndex(i))], - c - ); - - J += t.inertia(refPt, density); + ctr + ).inertia(refPt, density); } return J; @@ -734,9 +728,7 @@ Foam::edgeList Foam::face::edges() const edgeList e(points.size()); - label pointI; - - for (pointI = 0; pointI < points.size() - 1; pointI++) + for (label pointI = 0; pointI < points.size() - 1; ++pointI) { e[pointI] = edge(points[pointI], points[pointI + 1]); } @@ -839,9 +831,4 @@ Foam::label Foam::face::trianglesQuads } -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - // ************************************************************************* // diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H index 2b96610fca..3a85610fef 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/face.H +++ b/src/OpenFOAM/meshes/meshShapes/face/face.H @@ -27,12 +27,16 @@ Class Description A face is a list of labels corresponding to mesh vertices. +SeeAlso + Foam::triFace + SourceFiles faceI.H face.C faceIntersection.C faceContactSphere.C faceAreaInContact.C + faceTemplates.C \*---------------------------------------------------------------------------*/ @@ -191,6 +195,7 @@ public: //- Navigation through face vertices //- Which vertex on face (face index given a global index) + // returns -1 if not found label which(const label globalIndex) const; //- Next vertex on face @@ -289,8 +294,8 @@ public: //- Return number of edges inline label nEdges() const; - //- Return edges in face point ordering, i.e. edges()[0] is edge - // between [0] and [1] + //- Return edges in face point ordering, + // i.e. edges()[0] is edge between [0] and [1] edgeList edges() const; //- Return n-th face edge diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H index 165a11fd1a..9666e6a13b 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H +++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H @@ -35,7 +35,7 @@ inline Foam::label Foam::face::right(const label i) const // Edge to the left of face vertex i inline Foam::label Foam::face::left(const label i) const { - return i ? i-1 : size()-1; + return rcIndex(i); } diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C index f9f02eb612..4df16db781 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C +++ b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C @@ -21,9 +21,6 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Description - Return intersection of a line with the face - \*---------------------------------------------------------------------------*/ #include "face.H" @@ -51,6 +48,17 @@ Foam::pointHit Foam::face::ray const intersection::direction dir ) const { + // If the face is a triangle, do a direct calculation + if (size() == 3) + { + return triPointRef + ( + meshPoints[operator[](0)], + meshPoints[operator[](1)], + meshPoints[operator[](2)] + ).ray(p, n, alg, dir); + } + point ctr = Foam::average(points(meshPoints)); scalar nearestHitDist = GREAT; @@ -139,6 +147,17 @@ Foam::pointHit Foam::face::intersection const scalar tol ) const { + // If the face is a triangle, do a direct calculation + if (size() == 3) + { + return triPointRef + ( + meshPoints[operator[](0)], + meshPoints[operator[](1)], + meshPoints[operator[](2)] + ).intersection(p, q, alg, tol); + } + scalar nearestHitDist = VGREAT; // Initialize to miss, distance = GREAT @@ -198,6 +217,17 @@ Foam::pointHit Foam::face::nearestPointClassify label& nearLabel ) const { + // If the face is a triangle, do a direct calculation + if (size() == 3) + { + return triPointRef + ( + meshPoints[operator[](0)], + meshPoints[operator[](1)], + meshPoints[operator[](2)] + ).nearestPointClassify(p, nearType, nearLabel); + } + const face& f = *this; point ctr = centre(meshPoints); diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C index 24cfe1d4e6..ae072ea9ea 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C +++ b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C @@ -50,7 +50,7 @@ template Type Foam::face::average ( const pointField& meshPoints, - const Field& f + const Field& fld ) const { // Calculate the average by breaking the face into triangles and @@ -62,9 +62,9 @@ Type Foam::face::average return (1.0/3.0) *( - f[operator[](0)] - + f[operator[](1)] - + f[operator[](2)] + fld[operator[](0)] + + fld[operator[](1)] + + fld[operator[](2)] ); } @@ -76,7 +76,7 @@ Type Foam::face::average for (register label pI=0; pI + Type average(const pointField&, const Field&) const; + + //- Return scalar magnitude + inline scalar mag(const pointField&) const; + + //- Return vector normal + inline vector normal(const pointField&) const; + + //- Number of triangles after splitting + inline label nTriangles() const; + + //- Return face with reverse direction + inline triFace reverseFace() const; + + //- Return swept-volume + inline scalar sweptVol + ( + const pointField& oldPoints, + const pointField& newPoints + ) const; + + //- Return the inertia tensor, with optional reference + // point and density specification + inline tensor inertia + ( + const pointField&, + const point& refPt = vector::zero, + scalar density = 1.0 + ) const; + + //- Return point intersection with a ray starting at p, + // with direction q. + inline pointHit ray + ( + const point& p, + const vector& q, + const pointField& points, + const intersection::algorithm = intersection::FULL_RAY, + const intersection::direction dir = intersection::VECTOR + ) const; + + //- Fast intersection with a ray. + inline pointHit intersection + ( + const point& p, + const vector& q, + const pointField& points, + const intersection::algorithm alg, + const scalar tol = 0.0 + ) const; + + //- Return nearest point to face + inline pointHit nearestPoint + ( + const point& p, + const pointField& points + ) const; + + + //- Return nearest point to face and classify it: + // + near point (nearType=POINT, nearLabel=0, 1, 2) + // + near edge (nearType=EDGE, nearLabel=0, 1, 2) + // Note: edges are counted from starting vertex so + // e.g. edge n is from f[n] to f[0], where the face has n + 1 + // points + inline pointHit nearestPointClassify + ( + const point& p, + const pointField& points, + label& nearType, + label& nearLabel + ) const; + + //- Return number of edges + inline label nEdges() const; + + //- Return edges in face point ordering, + // i.e. edges()[0] is edge between [0] and [1] + inline edgeList edges() const; + + //- Return n-th face edge + inline edge faceEdge(const label n) const; + //- Return the edge direction on the face // - +1: forward (counter-clockwise) on the face // - -1: reverse (clockwise) on the face // - 0: edge not found on the face inline int edgeDirection(const edge&) const; - - // Properties - - //- Return the points corresponding to this face - inline pointField points(const pointField& points) const; - - //- Return triangle as a face - inline face triFaceFace() const; - - //- Return number of edges - inline label nEdges() const; - - //- Return edges - inline edgeList edges() const; - - //- Return centre (centroid) - inline point centre(const pointField&) const; - - //- Return scalar magnitude - inline scalar mag(const pointField&) const; - - //- Return vector normal - inline vector normal(const pointField&) const; - - //- Number of triangles after splitting - inline label nTriangles() const; - - //- Return face with reverse direction - inline triFace reverseFace() const; - - //- Return swept-volume - inline scalar sweptVol - ( - const pointField& oldPoints, - const pointField& newPoints - ) const; - - //- Return point intersection with a ray starting at p, with - // direction n. - inline pointHit ray - ( - const point& p, - const vector& q, - const pointField& points, - const intersection::algorithm = intersection::FULL_RAY, - const intersection::direction dir = intersection::VECTOR - ) const; - - //- Return the triangle - inline triPointRef tri(const pointField&) const; - //- compare triFaces // - 0: different // - +1: identical @@ -199,6 +250,10 @@ inline bool contiguous() {return true;} #include "triFaceI.H" +#ifdef NoRepository +# include "triFaceTemplates.C" +#endif + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #endif diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H index 1cac003d26..bc196f94dc 100644 --- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H +++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H @@ -142,57 +142,14 @@ inline Foam::face Foam::triFace::triFaceFace() const } -inline Foam::label Foam::triFace::nEdges() const +inline Foam::triPointRef Foam::triFace::tri(const pointField& points) const { - return 3; -} - - -inline Foam::edgeList Foam::triFace::edges() const -{ - edgeList e(3); - - e[0].start() = operator[](0); - e[0].end() = operator[](1); - - e[1].start() = operator[](1); - e[1].end() = operator[](2); - - e[2].start() = operator[](2); - e[2].end() = operator[](0); - - return e; -} - - -// return -// - +1: forward (counter-clockwise) on the face -// - -1: reverse (clockwise) on the face -// - 0: edge not found on the face -inline int Foam::triFace::edgeDirection(const edge& e) const -{ - if + return triPointRef ( - (operator[](0) == e.start() && operator[](1) == e.end()) - || (operator[](1) == e.start() && operator[](2) == e.end()) - || (operator[](2) == e.start() && operator[](0) == e.end()) - ) - { - return 1; - } - else if - ( - (operator[](0) == e.end() && operator[](1) == e.start()) - || (operator[](1) == e.end() && operator[](2) == e.start()) - || (operator[](2) == e.end() && operator[](0) == e.start()) - ) - { - return -1; - } - else - { - return 0; - } + points[operator[](0)], + points[operator[](1)], + points[operator[](2)] + ); } @@ -269,6 +226,18 @@ inline Foam::scalar Foam::triFace::sweptVol } +Foam::tensor Foam::triFace::inertia +( + const pointField& points, + const point& refPt, + scalar density +) const +{ + // a triangle, do a direct calculation + return this->tri(points).inertia(refPt, density); +} + + inline Foam::pointHit Foam::triFace::ray ( const point& p, @@ -278,23 +247,103 @@ inline Foam::pointHit Foam::triFace::ray const intersection::direction dir ) const { - return triPointRef - ( - points[operator[](0)], - points[operator[](1)], - points[operator[](2)] - ).ray(p, q, alg, dir); + return this->tri(points).ray(p, q, alg, dir); } -inline Foam::triPointRef Foam::triFace::tri(const pointField& points) const + +inline Foam::pointHit Foam::triFace::intersection +( + const point& p, + const vector& q, + const pointField& points, + const intersection::algorithm alg, + const scalar tol +) const { - return triPointRef + return this->tri(points).intersection(p, q, alg, tol); +} + + +inline Foam::pointHit Foam::triFace::nearestPoint +( + const point& p, + const pointField& points +) const +{ + return this->tri(points).nearestPoint(p); +} + + +inline Foam::pointHit Foam::triFace::nearestPointClassify +( + const point& p, + const pointField& points, + label& nearType, + label& nearLabel +) const +{ + return this->tri(points).nearestPointClassify(p, nearType, nearLabel); +} + + +inline Foam::label Foam::triFace::nEdges() const +{ + return 3; +} + + +inline Foam::edgeList Foam::triFace::edges() const +{ + edgeList e(3); + + e[0].start() = operator[](0); + e[0].end() = operator[](1); + + e[1].start() = operator[](1); + e[1].end() = operator[](2); + + e[2].start() = operator[](2); + e[2].end() = operator[](0); + + return e; +} + + +inline Foam::edge Foam::triFace::faceEdge(const label n) const +{ + return edge(operator[](n), operator[](fcIndex(n))); +} + + +// return +// - +1: forward (counter-clockwise) on the face +// - -1: reverse (clockwise) on the face +// - 0: edge not found on the face +inline int Foam::triFace::edgeDirection(const edge& e) const +{ + if ( - points[operator[](0)], - points[operator[](1)], - points[operator[](2)] - ); + (operator[](0) == e.start() && operator[](1) == e.end()) + || (operator[](1) == e.start() && operator[](2) == e.end()) + || (operator[](2) == e.start() && operator[](0) == e.end()) + ) + { + return 1; + } + else if + ( + (operator[](0) == e.end() && operator[](1) == e.start()) + || (operator[](1) == e.end() && operator[](2) == e.start()) + || (operator[](2) == e.end() && operator[](0) == e.start()) + ) + { + return -1; + } + else + { + return 0; + } } diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceTemplates.C b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceTemplates.C new file mode 100644 index 0000000000..1a4f36f269 --- /dev/null +++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceTemplates.C @@ -0,0 +1,50 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "triFace.H" + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +Type Foam::triFace::average +( + const pointField& meshPoints, + const Field& fld +) const +{ + // a triangle, do a direct calculation + return + ( + (1.0/3.0) + * + ( + fld[operator[](0)] + + fld[operator[](1)] + + fld[operator[](2)] + ) + ); +} + +// ************************************************************************* // diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H index abb5d7d8e4..54e6af92bd 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H +++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H @@ -69,7 +69,7 @@ inline Ostream& operator<< /*---------------------------------------------------------------------------*\ - class triangle Declaration + Class triangle Declaration \*---------------------------------------------------------------------------*/ template diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H index 7840d8ee7b..598ad6e237 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H +++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H @@ -27,15 +27,10 @@ License #include "pointHit.H" #include "mathematicalConstants.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -inline triangle::triangle +inline Foam::triangle::triangle ( const Point& a, const Point& b, @@ -49,7 +44,7 @@ inline triangle::triangle template -inline triangle::triangle(Istream& is) +inline Foam::triangle::triangle(Istream& is) { // Read beginning of triangle point pair is.readBegin("triangle"); @@ -67,47 +62,47 @@ inline triangle::triangle(Istream& is) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -inline const Point& triangle::a() const +inline const Point& Foam::triangle::a() const { return a_; } template -inline const Point& triangle::b() const +inline const Point& Foam::triangle::b() const { return b_; } template -inline const Point& triangle::c() const +inline const Point& Foam::triangle::c() const { return c_; } template -inline Point triangle::centre() const +inline Point Foam::triangle::centre() const { return (1.0/3.0)*(a_ + b_ + c_); } template -inline scalar triangle::mag() const +inline Foam::scalar Foam::triangle::mag() const { return Foam::mag(normal()); } template -inline vector triangle::normal() const +inline Foam::vector Foam::triangle::normal() const { return 0.5*((b_ - a_)^(c_ - a_)); } template -inline Point triangle::circumCentre() const +inline Point Foam::triangle::circumCentre() const { scalar d1 = (c_ - a_)&(b_ - a_); scalar d2 = -(c_ - b_)&(b_ - a_); @@ -127,7 +122,7 @@ inline Point triangle::circumCentre() const template -inline scalar triangle::circumRadius() const +inline Foam::scalar Foam::triangle::circumRadius() const { scalar d1 = (c_ - a_) & (b_ - a_); scalar d2 = - (c_ - b_) & (b_ - a_); @@ -149,7 +144,7 @@ inline scalar triangle::circumRadius() const template -inline scalar triangle::quality() const +inline Foam::scalar Foam::triangle::quality() const { // Note: 3*sqr(3)/(4*pi) = 0.4134966716 @@ -165,7 +160,10 @@ inline scalar triangle::quality() const template -inline scalar triangle::sweptVol(const triangle& t) const +inline Foam::scalar Foam::triangle::sweptVol +( + const triangle& t +) const { return (1.0/12.0)* ( @@ -181,7 +179,7 @@ inline scalar triangle::sweptVol(const triangle& t) const template -inline tensor triangle::inertia +inline Foam::tensor Foam::triangle::inertia ( PointRef refPt, scalar density @@ -218,7 +216,7 @@ inline tensor triangle::inertia template -inline Point triangle::randomPoint(Random& rndGen) const +inline Point Foam::triangle::randomPoint(Random& rndGen) const { // Generating Random Points in Triangles // by Greg Turk @@ -234,7 +232,7 @@ inline Point triangle::randomPoint(Random& rndGen) const template -scalar triangle::barycentric +Foam::scalar Foam::triangle::barycentric ( const point& pt, List& bary @@ -283,7 +281,7 @@ scalar triangle::barycentric template -inline pointHit triangle::ray +inline Foam::pointHit Foam::triangle::ray ( const point& p, const vector& q, @@ -399,7 +397,7 @@ inline pointHit triangle::ray // From "Fast, Minimum Storage Ray/Triangle Intersection" // Moeller/Trumbore. template -inline pointHit triangle::intersection +inline Foam::pointHit Foam::triangle::intersection ( const point& orig, const vector& dir, @@ -482,7 +480,7 @@ inline pointHit triangle::intersection template -pointHit triangle::nearestPointClassify +Foam::pointHit Foam::triangle::nearestPointClassify ( const point& p, label& nearType, @@ -595,7 +593,7 @@ pointHit triangle::nearestPointClassify template -inline pointHit triangle::nearestPoint +inline Foam::pointHit Foam::triangle::nearestPoint ( const point& p ) const @@ -609,7 +607,7 @@ inline pointHit triangle::nearestPoint template -inline bool triangle::classify +inline bool Foam::triangle::classify ( const point& p, label& nearType, @@ -623,7 +621,10 @@ inline bool triangle::classify // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // template -inline Istream& operator>>(Istream& is, triangle& t) +inline Foam::Istream& Foam::operator>> +( + Istream& is, triangle& t +) { // Read beginning of triangle point pair is.readBegin("triangle"); @@ -641,7 +642,11 @@ inline Istream& operator>>(Istream& is, triangle& t) template -inline Ostream& operator<<(Ostream& os, const triangle& t) +inline Foam::Ostream& Foam::operator<< +( + Ostream& os, + const triangle& t +) { os << nl << token::BEGIN_LIST @@ -652,8 +657,4 @@ inline Ostream& operator<<(Ostream& os, const triangle& t) } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C index f3c4c5bde8..f015ab69fd 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurface.C +++ b/src/surfMesh/MeshedSurface/MeshedSurface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H index b47e2c98d7..0e15c548c9 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurface.H +++ b/src/surfMesh/MeshedSurface/MeshedSurface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -156,6 +156,11 @@ protected: public: + // Public typedefs + + //- Face type used + typedef Face FaceType; + //- Runtime type information ClassName("MeshedSurface"); diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C index 9efc4ba7fd..a1d3864784 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C +++ b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C index d3c2fab9e1..d7795d432b 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C +++ b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C index 68169388eb..9538b75552 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C +++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C index a61ca0f1b7..f3dc48b016 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C +++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaces.C b/src/surfMesh/MeshedSurface/MeshedSurfaces.C index b94af3e3f5..97cb5a295a 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaces.C +++ b/src/surfMesh/MeshedSurface/MeshedSurfaces.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaces.H b/src/surfMesh/MeshedSurface/MeshedSurfaces.H index 21b800bebd..0f2330bc3a 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfaces.H +++ b/src/surfMesh/MeshedSurface/MeshedSurfaces.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurface/MeshedSurfacesFwd.H b/src/surfMesh/MeshedSurface/MeshedSurfacesFwd.H index cb4fd482eb..4cbb344b1d 100644 --- a/src/surfMesh/MeshedSurface/MeshedSurfacesFwd.H +++ b/src/surfMesh/MeshedSurface/MeshedSurfacesFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C index 009a2ad8a0..d29c42883f 100644 --- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C +++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H index 716d0c88e7..0d701085df 100644 --- a/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H +++ b/src/surfMesh/MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C index b2cf9e26cd..2d5b74f3dc 100644 --- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C +++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H index 9a11f197e8..ea051f5135 100644 --- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H +++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,6 +78,12 @@ class MeshedSurfaceProxy public: + // Public typedefs + + //- Face type used + typedef Face FaceType; + + // Static //- Runtime type information diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C index ec5b8d6431..6e5bd6b730 100644 --- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C +++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxyCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C index 660365b28b..44121ebb76 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H index 61359a9381..1b6dec5b12 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -132,6 +132,11 @@ protected: public: + // Public typedefs + + //- Face type used + typedef Face FaceType; + //- Runtime type information TypeName("UnsortedMeshedSurface"); diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C index 044f2654bd..60e22c887e 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C index 334928e2f0..fa556f2ae1 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.H index 09c25ad038..947f49b273 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.H +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaces.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H index e7aac1dce0..fdb95ea4cf 100644 --- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H +++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfacesFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfFields/surfFields.C b/src/surfMesh/surfFields/surfFields/surfFields.C index 00b07f738f..8f50dc6f6b 100644 --- a/src/surfMesh/surfFields/surfFields/surfFields.C +++ b/src/surfMesh/surfFields/surfFields/surfFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfFields/surfFields.H b/src/surfMesh/surfFields/surfFields/surfFields.H index 2b7acced86..5d42d08c61 100644 --- a/src/surfMesh/surfFields/surfFields/surfFields.H +++ b/src/surfMesh/surfFields/surfFields/surfFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfFields/surfFieldsFwd.H b/src/surfMesh/surfFields/surfFields/surfFieldsFwd.H index f55504ddd4..93a7cc4e1c 100644 --- a/src/surfMesh/surfFields/surfFields/surfFieldsFwd.H +++ b/src/surfMesh/surfFields/surfFields/surfFieldsFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfFields/surfGeoMesh.H b/src/surfMesh/surfFields/surfFields/surfGeoMesh.H index 7a49d041de..de836524de 100644 --- a/src/surfMesh/surfFields/surfFields/surfGeoMesh.H +++ b/src/surfMesh/surfFields/surfFields/surfGeoMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointFields.C b/src/surfMesh/surfFields/surfPointFields/surfPointFields.C index 6e9d3c7d62..f374559506 100644 --- a/src/surfMesh/surfFields/surfPointFields/surfPointFields.C +++ b/src/surfMesh/surfFields/surfPointFields/surfPointFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointFields.H b/src/surfMesh/surfFields/surfPointFields/surfPointFields.H index 271effcd0f..6d169ec516 100644 --- a/src/surfMesh/surfFields/surfPointFields/surfPointFields.H +++ b/src/surfMesh/surfFields/surfPointFields/surfPointFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointFieldsFwd.H b/src/surfMesh/surfFields/surfPointFields/surfPointFieldsFwd.H index 7587100a88..ab89f7544c 100644 --- a/src/surfMesh/surfFields/surfPointFields/surfPointFieldsFwd.H +++ b/src/surfMesh/surfFields/surfPointFields/surfPointFieldsFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H b/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H index ebe66ad3b4..a406a6e30e 100644 --- a/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H +++ b/src/surfMesh/surfFields/surfPointFields/surfPointGeoMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZone/surfZone.C b/src/surfMesh/surfZone/surfZone/surfZone.C index 01d6feb0e6..51c0cbb1ce 100644 --- a/src/surfMesh/surfZone/surfZone/surfZone.C +++ b/src/surfMesh/surfZone/surfZone/surfZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZone/surfZone.H b/src/surfMesh/surfZone/surfZone/surfZone.H index 8bebc540e6..3cfda4230f 100644 --- a/src/surfMesh/surfZone/surfZone/surfZone.H +++ b/src/surfMesh/surfZone/surfZone/surfZone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C index e9f44025ab..cb103fab1f 100644 --- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.C +++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H index b8a48b8998..3c34c621a8 100644 --- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H +++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZone/surfZoneList.H b/src/surfMesh/surfZone/surfZone/surfZoneList.H index d4b3975622..b037693b0b 100644 --- a/src/surfMesh/surfZone/surfZone/surfZoneList.H +++ b/src/surfMesh/surfZone/surfZone/surfZoneList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C index 2ad4c95716..f569660a04 100644 --- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C +++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H index b39dd3ac1d..4f69ef5d9d 100644 --- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H +++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifierList.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifierList.H index fa0acc8a3a..97e3a25c51 100644 --- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifierList.H +++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifierList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C index a46884780b..7837df2c48 100644 --- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H index 4963368fff..2bfc0c3358 100644 --- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H +++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C index 80db186628..3795d433f9 100644 --- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H index 3320c54731..02e99acbb3 100644 --- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H +++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C index ce0fc8c61c..800734127f 100644 --- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C +++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C index e6ba574c58..1efcc222ab 100644 --- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C +++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H index 4aaf425437..fcec9f3383 100644 --- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H +++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C index aa9f22d9a3..bc998f2f5b 100644 --- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H index 527e0d0e46..400233d243 100644 --- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H +++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C index ff73ac77ca..252cdd2fe3 100644 --- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.H index 1b4c965138..a4e913c9bb 100644 --- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.H +++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatCore.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C index 7cc3382ecc..d9a0607514 100644 --- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C +++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C index e48a551072..908f76a00e 100644 --- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H index 54bf15701d..4765fc8740 100644 --- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H +++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C index aba74a2f08..94d4761c7a 100644 --- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C +++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.H index ceb17f42bc..a0dfb62706 100644 --- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.H +++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatCore.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatRunTime.C b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatRunTime.C index 6a5ca6f6f2..a1109c06b7 100644 --- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatRunTime.C +++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormatRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.C b/src/surfMesh/surfaceRegistry/surfaceRegistry.C index 2412064ab6..979adec9fa 100644 --- a/src/surfMesh/surfaceRegistry/surfaceRegistry.C +++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.H b/src/surfMesh/surfaceRegistry/surfaceRegistry.H index fba492b13a..9236ca7b95 100644 --- a/src/surfMesh/surfaceRegistry/surfaceRegistry.H +++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H index fc9f532516..35c8e34a8d 100644 --- a/src/triSurface/triSurface/triSurface.H +++ b/src/triSurface/triSurface/triSurface.H @@ -223,6 +223,9 @@ public: // Public typedefs + //- Face type used + typedef labelledTri FaceType; + //- Placeholder only, but do not remove - it is needed for GeoMesh typedef bool BoundaryMesh;