Commit d1d453f0 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: relocate surfZoneIdentifier into OpenFOAM/meshes/Identifiers (issue #294)

Note that since these actually act more like 'patches'
(ie, contiguous addressing) it might be reasonable to rename as

    surfPatchIdentifier / surfacePatchIdentifier
parent b012e1c7
......@@ -418,6 +418,7 @@ $(cellShape)/cellShapeIOList.C
meshes/Identifiers/patch/patchIdentifier.C
meshes/Identifiers/patch/coupleGroupIdentifier.C
meshes/Identifiers/surface/surfZoneIdentifier.C
meshes/MeshObject/meshObject.C
......
......@@ -97,14 +97,11 @@ Foam::surfZoneIdentifier::~surfZoneIdentifier()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::surfZoneIdentifier::write(Ostream& os) const
{
if (geometricType_.size())
{
os.writeKeyword("geometricType")
<< geometricType_
<< token::END_STATEMENT << nl;
os.writeEntry("geometricType", geometricType_);
}
}
......@@ -112,7 +109,6 @@ void Foam::surfZoneIdentifier::write(Ostream& os) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
// needed for list output
bool Foam::surfZoneIdentifier::operator!=
(
const surfZoneIdentifier& rhs
......@@ -129,8 +125,9 @@ bool Foam::surfZoneIdentifier::operator==
{
return
(
name() == rhs.name()
&& geometricType() == rhs.geometricType()
(index() == rhs.index())
&& (name() == rhs.name())
&& (geometricType() == rhs.geometricType())
);
}
......@@ -139,8 +136,7 @@ bool Foam::surfZoneIdentifier::operator==
Foam::Istream& Foam::operator>>(Istream& is, surfZoneIdentifier& obj)
{
is >> obj.name_
>> obj.geometricType_;
is >> obj.name_ >> obj.geometricType_;
return is;
}
......@@ -148,7 +144,8 @@ Foam::Istream& Foam::operator>>(Istream& is, surfZoneIdentifier& obj)
Foam::Ostream& Foam::operator<<(Ostream& os, const surfZoneIdentifier& obj)
{
os << obj.name_ << ' ' << obj.geometricType_;
// newlines to separate, since that is what triSurface currently expects
os << nl << obj.name_ << nl << obj.geometricType_;
os.check("Ostream& operator<<(Ostream&, const surfZoneIdentifier&)");
return os;
......
......@@ -40,7 +40,6 @@ SourceFiles
#include "word.H"
#include "label.H"
#include "typeInfo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -56,7 +55,7 @@ Istream& operator>>(Istream&, surfZoneIdentifier&);
Ostream& operator<<(Ostream&, const surfZoneIdentifier&);
/*---------------------------------------------------------------------------*\
Class surfZoneIdentifier Declaration
Class surfZoneIdentifier Declaration
\*---------------------------------------------------------------------------*/
class surfZoneIdentifier
......
surfZone/surfZone/surfZone.C
surfZone/surfZone/surfZoneIOList.C
surfZone/surfZoneIdentifier/surfZoneIdentifier.C
MeshedSurfaceAllocator/MeshedSurfaceIOAllocator.C
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment