From 43b3961dc83f6300a598e188cf82c5d7533fbf54 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Sun, 22 Mar 2015 09:49:37 +0000
Subject: [PATCH] STLtriangle: Removed duplicate class Resolves bug-report
http://www.openfoam.org/mantisbt/view.php?id=1024
---
.../triSurface/interfaces/STL/STLtriangle.H | 116 -----------------
.../triSurface/interfaces/STL/STLtriangleI.H | 119 ------------------
.../triSurface/interfaces/STL/readSTLBINARY.C | 4 +-
3 files changed, 2 insertions(+), 237 deletions(-)
delete mode 100644 src/triSurface/triSurface/interfaces/STL/STLtriangle.H
delete mode 100644 src/triSurface/triSurface/interfaces/STL/STLtriangleI.H
diff --git a/src/triSurface/triSurface/interfaces/STL/STLtriangle.H b/src/triSurface/triSurface/interfaces/STL/STLtriangle.H
deleted file mode 100644
index dbcf27048fd..00000000000
--- a/src/triSurface/triSurface/interfaces/STL/STLtriangle.H
+++ /dev/null
@@ -1,116 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
- \\/ 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 <http://www.gnu.org/licenses/>.
-
-Class
- Foam::STLtriangle
-
-Description
- A triangle representation for STL files.
-
-SourceFiles
- STLtriangleI.H
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef STLtriangle_H
-#define STLtriangle_H
-
-#include "STLpoint.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
- Class STLtriangle Declaration
-\*---------------------------------------------------------------------------*/
-
-class STLtriangle
-{
- // Private data
-
- STLpoint normal_, a_, b_, c_;
- unsigned short region_;
-
-
-public:
-
- // Constructors
-
- //- Construct null
- inline STLtriangle();
-
- //- Construct from components
- inline STLtriangle
- (
- const STLpoint& normal,
- const STLpoint& a,
- const STLpoint& b,
- const STLpoint& c,
- unsigned short region
- );
-
- //- Construct from istream (read binary)
- inline STLtriangle(istream&);
-
-
- // Member Functions
-
- // Access
-
- inline const STLpoint& a() const;
- inline const STLpoint& b() const;
- inline const STLpoint& c() const;
- inline unsigned short region() const;
-
- // Read
-
- //- Read from istream (binary)
- inline void read(istream&);
-
- // Write
-
- //- Write to istream (binary)
- inline void write(ostream&);
-
-
- // Ostream operator
-
- inline friend Ostream& operator<<(Ostream&, const STLtriangle&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "STLtriangleI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/triSurface/triSurface/interfaces/STL/STLtriangleI.H b/src/triSurface/triSurface/interfaces/STL/STLtriangleI.H
deleted file mode 100644
index 99ea4e378a5..00000000000
--- a/src/triSurface/triSurface/interfaces/STL/STLtriangleI.H
+++ /dev/null
@@ -1,119 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
- \\/ 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 <http://www.gnu.org/licenses/>.
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-//- Construct null
-inline STLtriangle::STLtriangle()
-{}
-
-
-//- Construct from components
-inline STLtriangle::STLtriangle
-(
- const STLpoint& normal,
- const STLpoint& a,
- const STLpoint& b,
- const STLpoint& c,
- unsigned short region
-)
-:
- normal_(normal),
- a_(a),
- b_(b),
- c_(c),
- region_(region)
-{}
-
-
-//- Construct from istream (binary)
-inline STLtriangle::STLtriangle(istream& is)
-{
- read(is);
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-inline const STLpoint& STLtriangle::a() const
-{
- return a_;
-}
-
-inline const STLpoint& STLtriangle::b() const
-{
- return b_;
-}
-
-inline const STLpoint& STLtriangle::c() const
-{
- return c_;
-}
-
-inline unsigned short STLtriangle::region() const
-{
- return region_;
-}
-
-
-inline void STLtriangle::read(istream& is)
-{
- is.read(reinterpret_cast<char*>(this), 4*sizeof(STLpoint));
- is.read(reinterpret_cast<char*>(®ion_), 2);
-}
-
-
-inline void STLtriangle::write(ostream& os)
-{
- os.write(reinterpret_cast<char*>(this), 4*sizeof(STLpoint));
- os.write(reinterpret_cast<char*>(®ion_), 2);
-}
-
-// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
-
-inline Ostream& operator<<(Ostream& os, const STLtriangle& stlt)
-{
- os << stlt.normal_ << token::SPACE
- << stlt.a_ << token::SPACE
- << stlt.b_ << token::SPACE
- << stlt.c_ << token::SPACE
- << stlt.region_;
-
- return os;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
index 624aa1ada0a..c0e06649ba2 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -109,7 +109,7 @@ bool Foam::triSurface::readSTLBINARY(const fileName& STLfileName)
STLpoints[pointI++] = stlTri.a();
STLpoints[pointI++] = stlTri.b();
STLpoints[pointI++] = stlTri.c();
- operator[](i).region() = stlTri.region();
+ operator[](i).region() = stlTri.attrib();
}
// Stitch points
--
GitLab