diff --git a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
similarity index 89%
rename from src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C
rename to src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
index 6c4337e3b2624c17ae14a8ff982e7f943e4313b5..1a5659a5e953e36959d5d1b96f8b7018aac5de0e 100644
--- a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C
+++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
@@ -24,13 +24,13 @@ License
\*---------------------------------------------------------------------------*/
-#include "PrimitiveMeshedSurface.H"
+#include "BasicMeshedSurface.H"
#include "boundBox.H"
#include "mergePoints.H"
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
template<class Face>
-inline bool Foam::PrimitiveMeshedSurface<Face>::isTri()
+inline bool Foam::BasicMeshedSurface<Face>::isTri()
{
return false;
}
@@ -39,14 +39,14 @@ inline bool Foam::PrimitiveMeshedSurface<Face>::isTri()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Face>
-Foam::PrimitiveMeshedSurface<Face>::PrimitiveMeshedSurface()
+Foam::BasicMeshedSurface<Face>::BasicMeshedSurface()
:
ParentType(List<Face>(), pointField())
{}
template<class Face>
-Foam::PrimitiveMeshedSurface<Face>::PrimitiveMeshedSurface
+Foam::BasicMeshedSurface<Face>::BasicMeshedSurface
(
const xfer<pointField>& pointLst,
const xfer<List<Face> >& faceLst
@@ -61,14 +61,14 @@ Foam::PrimitiveMeshedSurface<Face>::PrimitiveMeshedSurface
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class Face>
-Foam::PrimitiveMeshedSurface<Face>::~PrimitiveMeshedSurface()
+Foam::BasicMeshedSurface<Face>::~BasicMeshedSurface()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Face>
-void Foam::PrimitiveMeshedSurface<Face>::clear()
+void Foam::BasicMeshedSurface<Face>::clear()
{
ParentType::clearOut();
@@ -78,7 +78,7 @@ void Foam::PrimitiveMeshedSurface<Face>::clear()
template<class Face>
-void Foam::PrimitiveMeshedSurface<Face>::movePoints(const pointField& newPoints)
+void Foam::BasicMeshedSurface<Face>::movePoints(const pointField& newPoints)
{
// Remove all geometry dependent data
ParentType::clearTopology();
@@ -92,7 +92,7 @@ void Foam::PrimitiveMeshedSurface<Face>::movePoints(const pointField& newPoints)
template<class Face>
-void Foam::PrimitiveMeshedSurface<Face>::scalePoints(const scalar& scaleFactor)
+void Foam::BasicMeshedSurface<Face>::scalePoints(const scalar& scaleFactor)
{
// avoid bad scaling
if (scaleFactor > 0 && scaleFactor != 1.0)
@@ -109,7 +109,7 @@ void Foam::PrimitiveMeshedSurface<Face>::scalePoints(const scalar& scaleFactor)
template<class Face>
-void Foam::PrimitiveMeshedSurface<Face>::reset
+void Foam::BasicMeshedSurface<Face>::reset
(
const xfer<pointField>& pointLst,
const xfer<List<Face> >& faceLst
@@ -133,7 +133,7 @@ void Foam::PrimitiveMeshedSurface<Face>::reset
// Remove badly degenerate faces, double faces.
template<class Face>
-void Foam::PrimitiveMeshedSurface<Face>::cleanup(const bool verbose)
+void Foam::BasicMeshedSurface<Face>::cleanup(const bool verbose)
{
// merge points (already done for STL, TRI)
stitchFaces(SMALL, verbose);
@@ -144,7 +144,7 @@ void Foam::PrimitiveMeshedSurface<Face>::cleanup(const bool verbose)
template<class Face>
-bool Foam::PrimitiveMeshedSurface<Face>::stitchFaces
+bool Foam::BasicMeshedSurface<Face>::stitchFaces
(
const scalar tol,
const bool verbose
@@ -165,7 +165,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::stitchFaces
if (verbose)
{
- Info<< "PrimitiveMeshedSurface::stitchFaces : Renumbering all faces"
+ Info<< "BasicMeshedSurface::stitchFaces : Renumbering all faces"
<< endl;
}
@@ -198,7 +198,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::stitchFaces
}
else if (verbose)
{
- Pout<< "PrimitiveMeshedSurface::stitchFaces : "
+ Pout<< "BasicMeshedSurface::stitchFaces : "
<< "Removing collapsed face " << faceI << endl
<< " vertices :" << f << endl;
}
@@ -209,7 +209,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::stitchFaces
{
if (verbose)
{
- Pout<< "PrimitiveMeshedSurface::stitchFaces : "
+ Pout<< "BasicMeshedSurface::stitchFaces : "
<< "Removed " << faceLst.size() - newFaceI
<< " faces" << endl;
}
@@ -226,7 +226,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::stitchFaces
// Remove badly degenerate faces and double faces.
template<class Face>
-bool Foam::PrimitiveMeshedSurface<Face>::checkFaces
+bool Foam::BasicMeshedSurface<Face>::checkFaces
(
const bool verbose
)
@@ -250,7 +250,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::checkFaces
{
if (f[fp] < 0 || f[fp] > maxPointI)
{
- FatalErrorIn("PrimitiveMeshedSurface::checkFaces(bool)")
+ FatalErrorIn("BasicMeshedSurface::checkFaces(bool)")
<< "face " << f
<< " uses point indices outside point range 0.."
<< maxPointI
@@ -271,7 +271,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::checkFaces
{
WarningIn
(
- "PrimitiveMeshedSurface::checkFaces(bool verbose)"
+ "BasicMeshedSurface::checkFaces(bool verbose)"
) << "face[" << faceI << "] = " << f
<< " does not have three unique vertices" << endl;
}
@@ -319,7 +319,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::checkFaces
{
WarningIn
(
- "PrimitiveMeshedSurface::checkFaces(bool verbose)"
+ "BasicMeshedSurface::checkFaces(bool verbose)"
) << "faces share the same vertices:" << nl
<< " face[" << faceI << "] : " << f << nl
<< " face[" << neiFaceI << "] : " << nei << endl;
@@ -353,7 +353,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::checkFaces
{
WarningIn
(
- "PrimitiveMeshedSurface::checkFaces(bool verbose)"
+ "BasicMeshedSurface::checkFaces(bool verbose)"
) << "Removed " << faceLst.size() - newFaceI
<< " illegal faces." << endl;
}
@@ -385,7 +385,7 @@ bool Foam::PrimitiveMeshedSurface<Face>::checkFaces
template<class Face>
-Foam::label Foam::PrimitiveMeshedSurface<Face>::triangulate()
+Foam::label Foam::BasicMeshedSurface<Face>::triangulate()
{
return triangulate
(
@@ -395,7 +395,7 @@ Foam::label Foam::PrimitiveMeshedSurface<Face>::triangulate()
template<class Face>
-Foam::label Foam::PrimitiveMeshedSurface<Face>::triangulate
+Foam::label Foam::BasicMeshedSurface<Face>::triangulate
(
List<label>& faceMapOut
)
@@ -500,13 +500,13 @@ Foam::label Foam::PrimitiveMeshedSurface<Face>::triangulate
// dummy implementation to avoid a pure virtual class
template<class Face>
-void Foam::PrimitiveMeshedSurface<Face>::remapFaces(const UList<label>&)
+void Foam::BasicMeshedSurface<Face>::remapFaces(const UList<label>&)
{
}
template<class Face>
-void Foam::PrimitiveMeshedSurface<Face>::writeStats(Ostream& os) const
+void Foam::BasicMeshedSurface<Face>::writeStats(Ostream& os) const
{
os << "points : " << this->points().size() << nl
<< (this->isTri() ? "triangles : " : "faces : ")
diff --git a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.H b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
similarity index 89%
rename from src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.H
rename to src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
index 602bc9fc6856e00c8739ef8a0e2a4a3799768c74..ec820beb49f0bab8d9f25dd573806376b4716751 100644
--- a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.H
+++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.H
@@ -23,18 +23,18 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
- Foam::PrimitiveMeshedSurface
+ Foam::BasicMeshedSurface
Description
- Holds surfaces without any patch information
+ Holds surfaces without any zone information
SourceFiles
- PrimitiveMeshedSurface.C
+ BasicMeshedSurface.C
\*---------------------------------------------------------------------------*/
-#ifndef PrimitiveMeshedSurface_H
-#define PrimitiveMeshedSurface_H
+#ifndef BasicMeshedSurface_H
+#define BasicMeshedSurface_H
#include "PrimitivePatchExtra.H"
#include "pointField.H"
@@ -50,11 +50,11 @@ namespace Foam
// Forward declaration of friend functions and operators
/*---------------------------------------------------------------------------*\
- Class PrimitiveMeshedSurface Declaration
+ Class BasicMeshedSurface Declaration
\*---------------------------------------------------------------------------*/
template<class Face>
-class PrimitiveMeshedSurface
+class BasicMeshedSurface
:
public PrimitivePatchExtra<Face, ::Foam::List, pointField, point>
{
@@ -98,10 +98,10 @@ public:
// Constructors
//- Construct null
- PrimitiveMeshedSurface();
+ BasicMeshedSurface();
//- Construct by transferring components (points, faces).
- PrimitiveMeshedSurface
+ BasicMeshedSurface
(
const xfer<pointField>&,
const xfer<List<Face> >&
@@ -109,7 +109,7 @@ public:
// Destructor
- virtual ~PrimitiveMeshedSurface();
+ virtual ~BasicMeshedSurface();
// Member Functions
@@ -175,21 +175,21 @@ public:
//- Specialization for holding triangulated information
template<>
-inline bool PrimitiveMeshedSurface<triFace>::isTri()
+inline bool BasicMeshedSurface<triFace>::isTri()
{
return true;
}
//- Specialization for holding triangulated information
template<>
-inline label PrimitiveMeshedSurface<triFace>::triangulate()
+inline label BasicMeshedSurface<triFace>::triangulate()
{
return 0;
}
//- Specialization for holding triangulated information
template<>
-inline label PrimitiveMeshedSurface<triFace>::triangulate(List<label>& faceMap)
+inline label BasicMeshedSurface<triFace>::triangulate(List<label>& faceMap)
{
if (&faceMap)
{
@@ -206,7 +206,7 @@ inline label PrimitiveMeshedSurface<triFace>::triangulate(List<label>& faceMap)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
-# include "PrimitiveMeshedSurface.C"
+# include "BasicMeshedSurface.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index dcef0c50b06989bfab349b4d5712c925bfb86287..0784dd04d749e8e93fc06f46ca68dede8a1fea7e 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -44,7 +44,7 @@ SourceFiles
#ifndef MeshedSurface_H
#define MeshedSurface_H
-#include "PrimitiveMeshedSurface.H"
+#include "BasicMeshedSurface.H"
#include "surfGroupList.H"
#include "surfaceFormatsCore.H"
#include "runTimeSelectionTables.H"
@@ -75,7 +75,7 @@ template<class Face>
template<class Face>
class MeshedSurface
:
- public PrimitiveMeshedSurface<Face>,
+ public BasicMeshedSurface<Face>,
public fileFormats::surfaceFormatsCore
{
friend class UnsortedMeshedSurface<Face>;
@@ -83,7 +83,7 @@ class MeshedSurface
private:
//- Private typedefs for convenience
- typedef PrimitiveMeshedSurface<Face> ParentType;
+ typedef BasicMeshedSurface<Face> ParentType;
typedef UnsortedMeshedSurface<Face> SiblingType;
// Private Member Data
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 8daeefa5519c4ca79b574f0b174be4be2dbd178c..238a0e9a54e06b320a49661f180bd4f696db6fc5 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -47,7 +47,7 @@ SourceFiles
#ifndef UnsortedMeshedSurface_H
#define UnsortedMeshedSurface_H
-#include "PrimitiveMeshedSurface.H"
+#include "BasicMeshedSurface.H"
#include "surfPatchIdentifierList.H"
#include "surfGroupList.H"
#include "surfaceFormatsCore.H"
@@ -80,7 +80,7 @@ template<class Face>
template<class Face>
class UnsortedMeshedSurface
:
- public PrimitiveMeshedSurface<Face>,
+ public BasicMeshedSurface<Face>,
public fileFormats::surfaceFormatsCore
{
friend class MeshedSurface<Face>;
@@ -88,7 +88,7 @@ class UnsortedMeshedSurface
private:
//- Typedefs for convenience
- typedef PrimitiveMeshedSurface<Face> ParentType;
+ typedef BasicMeshedSurface<Face> ParentType;
typedef MeshedSurface<Face> SiblingType;
// Private Member Data