diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index e608e4695bca383c91b9902a921da1176434eaad..7bff2143ec5b3dbb5e34bf634cc74b69da29c9bb 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -345,6 +345,9 @@ $(globalMeshData)/globalIndex.C
$(polyMesh)/syncTools/syncTools.C
+zone = $(polyMesh)/zones/zone
+$(zone)/zone.C
+
cellZone = $(polyMesh)/zones/cellZone
$(cellZone)/cellZone.C
$(cellZone)/newCellZone.C
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
index 5c98efd84a036a2a6d042d44e1d9386a5ffa1aab..b6800dceb68571cf67c5cb11d97ae608a8d0b427 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneID/ZoneID.H
@@ -114,6 +114,7 @@ public:
return index_ > -1;
}
+
// Edit
//- Update
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index ff8041fc602e4d7d24fdeed6d2a70c310aa52cd9..a7672104dab5bdd580848088442ebef2a279cd72 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- A subset of mesh cells.
-
\*---------------------------------------------------------------------------*/
#include "cellZone.H"
@@ -45,59 +42,9 @@ namespace Foam
addToRunTimeSelectionTable(cellZone, cellZone, dictionary);
}
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-const Foam::Map<Foam::label>& Foam::cellZone::cellLookupMap() const
-{
- if (!cellLookupMapPtr_)
- {
- calcCellLookupMap();
- }
-
- return *cellLookupMapPtr_;
-}
-
-
-void Foam::cellZone::calcCellLookupMap() const
-{
- if (debug)
- {
- Info<< "void cellZone::calcCellLookupMap() const : "
- << "Calculating cell lookup map"
- << endl;
- }
-
- if (cellLookupMapPtr_)
- {
- FatalErrorIn
- (
- "void cellZone::calcCellLookupMap() const"
- ) << "cell lookup map already calculated"
- << abort(FatalError);
- }
-
- const labelList& addr = *this;
-
- cellLookupMapPtr_ = new Map<label>(2*addr.size());
- Map<label>& clm = *cellLookupMapPtr_;
-
- forAll (addr, cellI)
- {
- clm.insert(addr[cellI], cellI);
- }
-
- if (debug)
- {
- Info<< "void cellZone::calcCellLookupMap() const : "
- << "Finished calculating cell lookup map"
- << endl;
- }
-}
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::cellZone::cellZone
(
const word& name,
@@ -106,11 +53,8 @@ Foam::cellZone::cellZone
const cellZoneMesh& zm
)
:
- labelList(addr),
- name_(name),
- index_(index),
- zoneMesh_(zm),
- cellLookupMapPtr_(NULL)
+ zone(name, addr, index),
+ zoneMesh_(zm)
{}
@@ -122,15 +66,11 @@ Foam::cellZone::cellZone
const cellZoneMesh& zm
)
:
- labelList(addr),
- name_(name),
- index_(index),
- zoneMesh_(zm),
- cellLookupMapPtr_(NULL)
+ zone(name, addr, index),
+ zoneMesh_(zm)
{}
-// Construct from dictionary
Foam::cellZone::cellZone
(
const word& name,
@@ -139,16 +79,11 @@ Foam::cellZone::cellZone
const cellZoneMesh& zm
)
:
- labelList(dict.lookup("cellLabels")),
- name_(name),
- index_(index),
- zoneMesh_(zm),
- cellLookupMapPtr_(NULL)
+ zone("cell", name, dict, index),
+ zoneMesh_(zm)
{}
-// Construct given the original zone and resetting the
-// cell list and zone mesh information
Foam::cellZone::cellZone
(
const cellZone& cz,
@@ -157,11 +92,8 @@ Foam::cellZone::cellZone
const cellZoneMesh& zm
)
:
- labelList(addr),
- name_(cz.name()),
- index_(index),
- zoneMesh_(zm),
- cellLookupMapPtr_(NULL)
+ zone(cz, addr, index),
+ zoneMesh_(zm)
{}
Foam::cellZone::cellZone
@@ -172,38 +104,22 @@ Foam::cellZone::cellZone
const cellZoneMesh& zm
)
:
- labelList(addr),
- name_(cz.name()),
- index_(index),
- zoneMesh_(zm),
- cellLookupMapPtr_(NULL)
+ zone(cz, addr, index),
+ zoneMesh_(zm)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::cellZone::~cellZone()
-{
- clearAddressing();
-}
+{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::label Foam::cellZone::whichCell(const label globalCellID) const
{
- const Map<label>& clm = cellLookupMap();
-
- Map<label>::const_iterator clmIter = clm.find(globalCellID);
-
- if (clmIter == clm.end())
- {
- return -1;
- }
- else
- {
- return clmIter();
- }
+ return zone::localID(globalCellID);
}
@@ -213,45 +129,9 @@ const Foam::cellZoneMesh& Foam::cellZone::zoneMesh() const
}
-void Foam::cellZone::clearAddressing()
-{
- deleteDemandDrivenData(cellLookupMapPtr_);
-}
-
-
bool Foam::cellZone::checkDefinition(const bool report) const
{
- const labelList& addr = *this;
-
- bool boundaryError = false;
-
- forAll(addr, i)
- {
- if (addr[i] < 0 || addr[i] >= zoneMesh_.mesh().nCells())
- {
- boundaryError = true;
-
- if (report)
- {
- SeriousErrorIn
- (
- "bool cellZone::checkDefinition("
- "const bool report) const"
- ) << "Zone " << name()
- << " contains invalid cell label " << addr[i] << nl
- << "Valid cell labels are 0.."
- << zoneMesh_.mesh().nCells()-1 << endl;
- }
- }
- }
- return boundaryError;
-}
-
-
-void Foam::cellZone::write(Ostream& os) const
-{
- os << nl << name()
- << nl << static_cast<const labelList&>(*this);
+ return zone::checkDefinition(zoneMesh_.mesh().nCells(), report);
}
@@ -284,10 +164,10 @@ void Foam::cellZone::operator=(const labelList& addr)
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
-Foam::Ostream& Foam::operator<<(Ostream& os, const cellZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const cellZone& cz)
{
- p.write(os);
- os.check("Ostream& operator<<(Ostream& f, const cellZone& p");
+ cz.write(os);
+ os.check("Ostream& operator<<(Ostream& os, const cellZone& cz");
return os;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index b133eee4361ff19fb46d25071176286087604358..67c9c2f52f9331a81fbf72b609a41c77b01b593d 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -42,12 +42,8 @@ SourceFiles
#ifndef cellZone_H
#define cellZone_H
-#include "labelList.H"
-#include "typeInfo.H"
-#include "dictionary.H"
+#include "zone.H"
#include "cellZoneMeshFwd.H"
-#include "pointFieldFwd.H"
-#include "Map.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,36 +62,22 @@ Ostream& operator<<(Ostream&, const cellZone&);
class cellZone
:
- public labelList
+ public zone
{
- // Private data
- //- Name of zone
- word name_;
+protected:
- //- Index of zone
- label index_;
+ // Protected data
//- Reference to zone list
const cellZoneMesh& zoneMesh_;
- // Demand-driven private data
-
- //- Map of cell labels in zone for fast location lookup
- mutable Map<label>* cellLookupMapPtr_;
-
// Private Member Functions
//- Disallow default bitwise copy construct
cellZone(const cellZone&);
- //- Return map of local cell indices
- const Map<label>& cellLookupMap() const;
-
- //- Build map of local cell indices
- void calcCellLookupMap() const;
-
public:
@@ -208,45 +190,19 @@ public:
//- Destructor
-
- virtual ~cellZone();
+ virtual ~cellZone();
// Member Functions
- //- Return name
- const word& name() const
- {
- return name_;
- }
-
- //- Map storing the local cell index for every global cell
- // index. Used to find out the index of cell in the zone from
- // the known global cell index. If the cell is not in the
- // zone, returns -1
+ //- Helper function to re-direct to zone::localID(...)
label whichCell(const label globalCellID) const;
- //- Return the index of this zone in zone list
- label index() const
- {
- return index_;
- }
-
//- Return zoneMesh reference
const cellZoneMesh& zoneMesh() const;
- //- Clear addressing
- void clearAddressing();
-
//- Check zone definition. Return true if in error.
- bool checkDefinition(const bool report = false) const;
-
- //- Correct patch after moving points
- virtual void movePoints(const pointField&)
- {}
-
- //- Write
- virtual void write(Ostream&) const;
+ virtual bool checkDefinition(const bool report = false) const;
//- Write dictionary
virtual void writeDict(Ostream&) const;
@@ -261,8 +217,9 @@ public:
void operator=(const labelList&);
- // Ostream Operator
+ // I-O
+ //- Ostream Operator
friend Ostream& operator<<(Ostream&, const cellZone&);
};
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
index 1905c9beda87ef8ca8be42dddca9b2f227fd3e44..607f47511a229591a70acd96f6a71bd211881a0c 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/newCellZone.C
@@ -22,15 +22,11 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cellZone.H"
#include "dictionary.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
@@ -61,7 +57,7 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
"const label, const cellZoneMesh&)",
dict
) << "Unknown cellZone type " << zoneType << endl << endl
- << "Valid cellZone types are :" << endl
+ << "Valid cellZone types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -70,6 +66,4 @@ Foam::autoPtr<Foam::cellZone> Foam::cellZone::New
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index d4cc0a284360f45bab1dd8ff9f995dfce256e606..e56730bd9eec8a55d1a3bc796e849fed0d461fd9 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- A subset of mesh faces.
-
\*---------------------------------------------------------------------------*/
#include "faceZone.H"
@@ -100,54 +97,6 @@ void Foam::faceZone::calcFaceZonePatch() const
}
-const Foam::Map<Foam::label>& Foam::faceZone::faceLookupMap() const
-{
- if (!faceLookupMapPtr_)
- {
- calcFaceLookupMap();
- }
-
- return *faceLookupMapPtr_;
-}
-
-
-void Foam::faceZone::calcFaceLookupMap() const
-{
- if (debug)
- {
- Info<< "void faceZone::calcFaceLookupMap() const : "
- << "Calculating face lookup map"
- << endl;
- }
-
- if (faceLookupMapPtr_)
- {
- FatalErrorIn
- (
- "void faceZone::calcFaceLookupMap() const"
- ) << "face lookup map already calculated"
- << abort(FatalError);
- }
-
- const labelList& addr = *this;
-
- faceLookupMapPtr_ = new Map<label>(2*addr.size());
- Map<label>& flm = *faceLookupMapPtr_;
-
- forAll (addr, faceI)
- {
- flm.insert(addr[faceI], faceI);
- }
-
- if (debug)
- {
- Info<< "void faceZone::calcFaceLookupMap() const : "
- << "Finished calculating face lookup map"
- << endl;
- }
-}
-
-
void Foam::faceZone::calcCellLayers() const
{
if (debug)
@@ -228,16 +177,13 @@ Foam::faceZone::faceZone
const faceZoneMesh& zm
)
:
- labelList(addr),
- name_(name),
+ zone(name, addr, index),
flipMap_(fm),
- index_(index),
zoneMesh_(zm),
patchPtr_(NULL),
masterCellsPtr_(NULL),
slaveCellsPtr_(NULL),
- mePtr_(NULL),
- faceLookupMapPtr_(NULL)
+ mePtr_(NULL)
{
checkAddressing();
}
@@ -252,22 +198,18 @@ Foam::faceZone::faceZone
const faceZoneMesh& zm
)
:
- labelList(addr),
- name_(name),
+ zone(name, addr, index),
flipMap_(fm),
- index_(index),
zoneMesh_(zm),
patchPtr_(NULL),
masterCellsPtr_(NULL),
slaveCellsPtr_(NULL),
- mePtr_(NULL),
- faceLookupMapPtr_(NULL)
+ mePtr_(NULL)
{
checkAddressing();
}
-// Construct from dictionary
Foam::faceZone::faceZone
(
const word& name,
@@ -276,23 +218,18 @@ Foam::faceZone::faceZone
const faceZoneMesh& zm
)
:
- labelList(dict.lookup("faceLabels")),
- name_(name),
+ zone("face", name, dict, index),
flipMap_(dict.lookup("flipMap")),
- index_(index),
zoneMesh_(zm),
patchPtr_(NULL),
masterCellsPtr_(NULL),
slaveCellsPtr_(NULL),
- mePtr_(NULL),
- faceLookupMapPtr_(NULL)
+ mePtr_(NULL)
{
checkAddressing();
}
-// Construct given the original zone and resetting the
-// face list and zone mesh information
Foam::faceZone::faceZone
(
const faceZone& fz,
@@ -302,16 +239,13 @@ Foam::faceZone::faceZone
const faceZoneMesh& zm
)
:
- labelList(addr),
- name_(fz.name()),
+ zone(fz, addr, index),
flipMap_(fm),
- index_(index),
zoneMesh_(zm),
patchPtr_(NULL),
masterCellsPtr_(NULL),
slaveCellsPtr_(NULL),
- mePtr_(NULL),
- faceLookupMapPtr_(NULL)
+ mePtr_(NULL)
{
checkAddressing();
}
@@ -326,16 +260,13 @@ Foam::faceZone::faceZone
const faceZoneMesh& zm
)
:
- labelList(addr),
- name_(fz.name()),
+ zone(fz, addr, index),
flipMap_(fm),
- index_(index),
zoneMesh_(zm),
patchPtr_(NULL),
masterCellsPtr_(NULL),
slaveCellsPtr_(NULL),
- mePtr_(NULL),
- faceLookupMapPtr_(NULL)
+ mePtr_(NULL)
{
checkAddressing();
}
@@ -351,26 +282,15 @@ Foam::faceZone::~faceZone()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::label Foam::faceZone::whichFace(const label globalFaceID) const
+const Foam::faceZoneMesh& Foam::faceZone::zoneMesh() const
{
- const Map<label>& flm = faceLookupMap();
-
- Map<label>::const_iterator flmIter = flm.find(globalFaceID);
-
- if (flmIter == flm.end())
- {
- return -1;
- }
- else
- {
- return flmIter();
- }
+ return zoneMesh_;
}
-const Foam::faceZoneMesh& Foam::faceZone::zoneMesh() const
+Foam::label Foam::faceZone::whichFace(const label globalFaceID) const
{
- return zoneMesh_;
+ return zone::localID(globalFaceID);
}
@@ -450,13 +370,14 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
void Foam::faceZone::clearAddressing()
{
+ zone::clearAddressing();
+
deleteDemandDrivenData(patchPtr_);
deleteDemandDrivenData(masterCellsPtr_);
deleteDemandDrivenData(slaveCellsPtr_);
deleteDemandDrivenData(mePtr_);
- deleteDemandDrivenData(faceLookupMapPtr_);
}
@@ -504,30 +425,7 @@ void Foam::faceZone::updateMesh(const mapPolyMesh& mpm)
bool Foam::faceZone::checkDefinition(const bool report) const
{
- const labelList& addr = *this;
-
- bool boundaryError = false;
-
- forAll(addr, i)
- {
- if (addr[i] < 0 || addr[i] >= zoneMesh().mesh().faces().size())
- {
- boundaryError = true;
-
- if (report)
- {
- SeriousErrorIn
- (
- "bool faceZone::checkDefinition("
- "const bool report) const"
- ) << "Zone " << name()
- << " contains invalid face label " << addr[i] << nl
- << "Valid face labels are 0.."
- << zoneMesh().mesh().faces().size()-1 << endl;
- }
- }
- }
- return boundaryError;
+ return zone::checkDefinition(zoneMesh().mesh().faces().size(), report);
}
@@ -642,10 +540,10 @@ void Foam::faceZone::writeDict(Ostream& os) const
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
-Foam::Ostream& Foam::operator<<(Ostream& os, const faceZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const faceZone& fz)
{
- p.write(os);
- os.check("Ostream& operator<<(Ostream& f, const faceZone& p");
+ fz.write(os);
+ os.check("Ostream& operator<<(Ostream& os, const faceZone& fz");
return os;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 16c7e82b09c0ad272d99d1f9d60ecd552afcf3f9..7b1b46d2c4d5edffebabcb161f5f46ef1dcfcb89 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -41,13 +41,10 @@ SourceFiles
#ifndef faceZone_H
#define faceZone_H
-#include "typeInfo.H"
-#include "dictionary.H"
-#include "labelList.H"
+#include "zone.H"
#include "faceZoneMeshFwd.H"
#include "boolList.H"
#include "primitiveFacePatch.H"
-#include "Map.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,20 +65,17 @@ Ostream& operator<<(Ostream&, const faceZone&);
class faceZone
:
- public labelList
+ public zone
{
- // Private data
- //- Name of zone
- word name_;
+protected:
+
+ // Protected data
//- Flip map for all faces in the zone. Set to true if the
// face needs to be flipped to achieve the correct orientation.
boolList flipMap_;
- //- Index of zone
- label index_;
-
//- Reference to zone list
const faceZoneMesh& zoneMesh_;
@@ -100,9 +94,6 @@ class faceZone
//- Global edge addressing
mutable labelList* mePtr_;
- //- Map of face labels in zone for fast location lookup
- mutable Map<label>* faceLookupMapPtr_;
-
// Private Member Functions
@@ -118,9 +109,6 @@ class faceZone
//- Return map of local face indices
const Map<label>& faceLookupMap() const;
- //- Build map of local face indices
- void calcFaceLookupMap() const;
-
//- Calculate master and slave face layer
void calcCellLayers() const;
@@ -244,38 +232,23 @@ public:
//- Destructor
-
- virtual ~faceZone();
+ virtual ~faceZone();
// Member Functions
- //- Return name
- const word& name() const
- {
- return name_;
- }
-
//- Return face flip map
const boolList& flipMap() const
{
return flipMap_;
}
- //- Map storing the local face index for every global face index.
- // Used to find out the index of face in the zone from the known global
- // face index. If the face is not in the zone, returns -1
- label whichFace(const label globalFaceID) const;
+ //- Helper function to re-direct to zone::localID(...)
+ label whichFace(const label globalCellID) const;
//- Return reference to primitive patch
const primitiveFacePatch& operator()() const;
- //- Return the index of this zone in zone list
- label index() const
- {
- return index_;
- }
-
//- Return zoneMesh reference
const faceZoneMesh& zoneMesh() const;
@@ -294,23 +267,23 @@ public:
//- Clear addressing
- void clearAddressing();
+ virtual void clearAddressing();
//- Reset addressing and flip map (clearing demand-driven data)
- void resetAddressing(const labelList&, const boolList&);
+ virtual void resetAddressing(const labelList&, const boolList&);
//- Check zone definition. Return true if in error.
- bool checkDefinition(const bool report = false) const;
+ virtual bool checkDefinition(const bool report = false) const;
//- Check whether all procs have faces synchronised. Return
// true if in error.
- bool checkParallelSync(const bool report = false) const;
+ virtual bool checkParallelSync(const bool report = false) const;
//- Correct patch after moving points
virtual void movePoints(const pointField&);
//- Update for changes in topology
- void updateMesh(const mapPolyMesh& mpm);
+ virtual void updateMesh(const mapPolyMesh& mpm);
//- Write
virtual void write(Ostream&) const;
@@ -319,8 +292,9 @@ public:
virtual void writeDict(Ostream&) const;
- // Ostream Operator
+ // I-O
+ //- Ostream Operator
friend Ostream& operator<<(Ostream&, const faceZone&);
};
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
index 91506f5ce885005f7e218ecf9edefa7b7eb5c955..07f85cc180524642c7270ab25b5647f5fa5ebb91 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/newFaceZone.C
@@ -22,15 +22,11 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "faceZone.H"
#include "dictionary.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
@@ -61,7 +57,7 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
"const label, const faceZoneMesh&)",
dict
) << "Unknown faceZone type " << zoneType << endl << endl
- << "Valid faceZone types are :" << endl
+ << "Valid faceZone types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -70,6 +66,4 @@ Foam::autoPtr<Foam::faceZone> Foam::faceZone::New
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
index 015bdea31805a935f259a5d883c5a9dee250950f..695e9f3bb6e56c9970de2124afcdbe0068b75441 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/newPointZone.C
@@ -22,15 +22,11 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "pointZone.H"
#include "dictionary.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
@@ -61,7 +57,7 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
"const label, const pointZoneMesh&)",
dict
) << "Unknown pointZone type " << zoneType << endl << endl
- << "Valid pointZone types are :" << endl
+ << "Valid pointZone types are:" << nl
<< dictionaryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -69,6 +65,5 @@ Foam::autoPtr<Foam::pointZone> Foam::pointZone::New
return autoPtr<pointZone>(cstrIter()(name, dict, index, zm));
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index d1c450691f13dbb565184d95687edc5d4c46ca62..c6098a38a2f03ca15165f7bc3e6f18dbf98bd76d 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- A subset of mesh points.
-
\*---------------------------------------------------------------------------*/
#include "pointZone.H"
@@ -43,59 +40,9 @@ namespace Foam
addToRunTimeSelectionTable(pointZone, pointZone, dictionary);
}
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-const Foam::Map<Foam::label>& Foam::pointZone::pointLookupMap() const
-{
- if (!pointLookupMapPtr_)
- {
- calcPointLookupMap();
- }
-
- return *pointLookupMapPtr_;
-}
-
-
-void Foam::pointZone::calcPointLookupMap() const
-{
- if (debug)
- {
- Info<< "void pointZone::calcPointLookupMap() const : "
- << "Calculating point lookup map"
- << endl;
- }
-
- if (pointLookupMapPtr_)
- {
- FatalErrorIn
- (
- "void pointZone::calcPointLookupMap() const"
- ) << "point lookup map already calculated"
- << abort(FatalError);
- }
-
- const labelList& addr = *this;
-
- pointLookupMapPtr_ = new Map<label>(2*addr.size());
- Map<label>& plm = *pointLookupMapPtr_;
-
- forAll (addr, pointI)
- {
- plm.insert(addr[pointI], pointI);
- }
-
- if (debug)
- {
- Info<< "void pointZone::calcPointLookupMap() const : "
- << "Finished calculating point lookup map"
- << endl;
- }
-}
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::pointZone::pointZone
(
const word& name,
@@ -104,11 +51,8 @@ Foam::pointZone::pointZone
const pointZoneMesh& zm
)
:
- labelList(addr),
- name_(name),
- index_(index),
- zoneMesh_(zm),
- pointLookupMapPtr_(NULL)
+ zone(name, addr, index),
+ zoneMesh_(zm)
{}
@@ -120,15 +64,11 @@ Foam::pointZone::pointZone
const pointZoneMesh& zm
)
:
- labelList(addr),
- name_(name),
- index_(index),
- zoneMesh_(zm),
- pointLookupMapPtr_(NULL)
+ zone(name, addr, index),
+ zoneMesh_(zm)
{}
-// Construct from dictionary
Foam::pointZone::pointZone
(
const word& name,
@@ -137,16 +77,11 @@ Foam::pointZone::pointZone
const pointZoneMesh& zm
)
:
- labelList(dict.lookup("pointLabels")),
- name_(name),
- index_(index),
- zoneMesh_(zm),
- pointLookupMapPtr_(NULL)
+ zone("point", name, dict, index),
+ zoneMesh_(zm)
{}
-// Construct given the original zone and resetting the
-// point list and zone mesh information
Foam::pointZone::pointZone
(
const pointZone& pz,
@@ -155,11 +90,8 @@ Foam::pointZone::pointZone
const pointZoneMesh& zm
)
:
- labelList(addr),
- name_(pz.name()),
- index_(index),
- zoneMesh_(zm),
- pointLookupMapPtr_(NULL)
+ zone(pz, addr, index),
+ zoneMesh_(zm)
{}
@@ -171,92 +103,40 @@ Foam::pointZone::pointZone
const pointZoneMesh& zm
)
:
- labelList(addr),
- name_(pz.name()),
- index_(index),
- zoneMesh_(zm),
- pointLookupMapPtr_(NULL)
+ zone(pz, addr, index),
+ zoneMesh_(zm)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::pointZone::~pointZone()
-{
- clearAddressing();
-}
+{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::label Foam::pointZone::whichPoint(const label globalPointID) const
-{
- const Map<label>& plm = pointLookupMap();
-
- Map<label>::const_iterator plmIter = plm.find(globalPointID);
-
- if (plmIter == plm.end())
- {
- return -1;
- }
- else
- {
- return plmIter();
- }
-}
-
-
const Foam::pointZoneMesh& Foam::pointZone::zoneMesh() const
{
return zoneMesh_;
}
-void Foam::pointZone::clearAddressing()
+Foam::label Foam::pointZone::whichPoint(const label globalPointID) const
{
- deleteDemandDrivenData(pointLookupMapPtr_);
+ return zone::localID(globalPointID);
}
bool Foam::pointZone::checkDefinition(const bool report) const
{
- const labelList& addr = *this;
-
- bool boundaryError = false;
-
- forAll(addr, i)
- {
- if (addr[i] < 0 || addr[i] >= zoneMesh_.mesh().points().size())
- {
- boundaryError = true;
-
- if (report)
- {
- SeriousErrorIn
- (
- "bool pointZone::checkDefinition("
- "const bool report) const"
- ) << "Zone " << name()
- << " contains invalid point label " << addr[i] << nl
- << "Valid point labels are 0.."
- << zoneMesh_.mesh().points().size()-1 << endl;
- }
- }
- }
- return boundaryError;
-}
-
-
-void Foam::pointZone::write(Ostream& os) const
-{
- os << nl << name()
- << nl << static_cast<const labelList&>(*this);
+ return zone::checkDefinition(zoneMesh_.mesh().points().size(), report);
}
void Foam::pointZone::writeDict(Ostream& os) const
{
- os << nl << name() << nl << token::BEGIN_BLOCK << nl
+ os << nl << name_ << nl << token::BEGIN_BLOCK << nl
<< " type " << type() << token::END_STATEMENT << nl;
writeEntry("pointLabels", os);
@@ -267,10 +147,10 @@ void Foam::pointZone::writeDict(Ostream& os) const
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-void Foam::pointZone::operator=(const pointZone& cz)
+void Foam::pointZone::operator=(const pointZone& pz)
{
clearAddressing();
- labelList::operator=(cz);
+ labelList::operator=(pz);
}
@@ -283,10 +163,10 @@ void Foam::pointZone::operator=(const labelList& addr)
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
-Foam::Ostream& Foam::operator<<(Ostream& os, const pointZone& p)
+Foam::Ostream& Foam::operator<<(Ostream& os, const pointZone& pz)
{
- p.write(os);
- os.check("Ostream& operator<<(Ostream& f, const pointZone& p");
+ pz.write(os);
+ os.check("Ostream& operator<<(Ostream& os, const pointZone& pz");
return os;
}
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 66719530f524fb183e529eca8da1c3ec6f31c60e..89f8349461b4b4f052dba80c1bf4ecd691aa2a49 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -43,12 +43,8 @@ SourceFiles
#ifndef pointZone_H
#define pointZone_H
-#include "labelList.H"
-#include "typeInfo.H"
-#include "dictionary.H"
+#include "zone.H"
#include "pointZoneMeshFwd.H"
-#include "Map.H"
-#include "pointField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -67,37 +63,22 @@ Ostream& operator<<(Ostream&, const pointZone&);
class pointZone
:
- public labelList
+ public zone
{
- // Private data
- //- Name of zone
- word name_;
+protected:
- //- Index of zone
- label index_;
+ // Private data
//- Reference to zone list
const pointZoneMesh& zoneMesh_;
- // Demand-driven private data
-
- //- Map of point labels in zone for fast location lookup
- mutable Map<label>* pointLookupMapPtr_;
-
-
// Private Member Functions
//- Disallow default bitwise copy construct
pointZone(const pointZone&);
- //- Return map of local point indices
- const Map<label>& pointLookupMap() const;
-
- //- Build map of local point indices
- void calcPointLookupMap() const;
-
public:
@@ -210,46 +191,24 @@ public:
//- Destructor
-
- virtual ~pointZone();
+ virtual ~pointZone();
// Member Functions
- //- Return name
- const word& name() const
- {
- return name_;
- }
-
- //- Map storing the local point index for every global point
- // index. Used to find out the index of point in the zone from
- // the known global point index. If the point is not in the
- // zone, returns -1
- label whichPoint(const label globalPointID) const;
-
- //- Return the index of this zone in zone list
- label index() const
- {
- return index_;
- }
-
//- Return zoneMesh reference
const pointZoneMesh& zoneMesh() const;
- //- Clear addressing
- void clearAddressing();
+ //- Helper function to re-direct to zone::localID(...)
+ label whichPoint(const label globalPointID) const;
//- Check zone definition. Return true if in error.
- bool checkDefinition(const bool report = false) const;
+ virtual bool checkDefinition(const bool report = false) const;
//- Correct patch after moving points
virtual void movePoints(const pointField&)
{}
- //- Write
- virtual void write(Ostream&) const;
-
//- Write dictionary
virtual void writeDict(Ostream&) const;
@@ -263,8 +222,9 @@ public:
void operator=(const labelList&);
- // Ostream Operator
+ // I-O
+ //- Ostream Operator
friend Ostream& operator<<(Ostream&, const pointZone&);
};
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
new file mode 100644
index 0000000000000000000000000000000000000000..20195888c57de05076d4a6d2f793b33e3d9b66fb
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -0,0 +1,239 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-2009 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "zone.H"
+#include "IOstream.H"
+#include "demandDrivenData.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(zone, 0);
+}
+
+// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * //
+
+const Foam::Map<Foam::label>& Foam::zone::lookupMap() const
+{
+ if (!lookupMapPtr_)
+ {
+ calcLookupMap();
+ }
+
+ return *lookupMapPtr_;
+}
+
+
+void Foam::zone::calcLookupMap() const
+{
+ if (debug)
+ {
+ Info<< "void zone::calcLookupMap() const: "
+ << "Calculating lookup map"
+ << endl;
+ }
+
+ if (lookupMapPtr_)
+ {
+ FatalErrorIn("void zone::calcLookupMap() const")
+ << "Lookup map already calculated" << nl
+ << abort(FatalError);
+ }
+
+ const labelList& addr = *this;
+
+ lookupMapPtr_ = new Map<label>(2*addr.size());
+ Map<label>& lm = *lookupMapPtr_;
+
+ forAll(addr, i)
+ {
+ lm.insert(addr[i], i);
+ }
+
+ if (debug)
+ {
+ Info<< "void zone::calcLookupMap() const: "
+ << "Finished calculating lookup map"
+ << endl;
+ }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
+
+Foam::zone::zone
+(
+ const word& name,
+ const labelList& addr,
+ const label index
+)
+:
+ labelList(addr),
+ name_(name),
+ index_(index),
+ lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+ const word& name,
+ const Xfer<labelList>& addr,
+ const label index
+)
+:
+ labelList(addr),
+ name_(name),
+ index_(index),
+ lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+ const word& zoneType,
+ const word& name,
+ const dictionary& dict,
+ const label index
+)
+:
+ labelList(dict.lookup(zoneType + "Labels")),
+ name_(name),
+ index_(index),
+ lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+ const zone& z,
+ const labelList& addr,
+ const label index
+)
+:
+ labelList(addr),
+ name_(z.name()),
+ index_(index),
+ lookupMapPtr_(NULL)
+{}
+
+
+Foam::zone::zone
+(
+ const zone& z,
+ const Xfer<labelList>& addr,
+ const label index
+)
+:
+ labelList(addr),
+ name_(z.name()),
+ index_(index),
+ lookupMapPtr_(NULL)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
+
+Foam::zone::~zone()
+{
+ clearAddressing();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
+
+Foam::label Foam::zone::localID(const label globalCellID) const
+{
+ const Map<label>& lm = lookupMap();
+
+ Map<label>::const_iterator lmIter = lm.find(globalCellID);
+
+ if (lmIter == lm.end())
+ {
+ return -1;
+ }
+ else
+ {
+ return lmIter();
+ }
+}
+
+
+void Foam::zone::clearAddressing()
+{
+ deleteDemandDrivenData(lookupMapPtr_);
+}
+
+
+bool Foam::zone::checkDefinition(const label maxSize, const bool report) const
+{
+ const labelList& addr = *this;
+
+ bool boundaryError = false;
+
+ forAll(addr, i)
+ {
+ if (addr[i] < 0 || addr[i] >= maxSize)
+ {
+ boundaryError = true;
+
+ if (report)
+ {
+ SeriousErrorIn
+ (
+ "bool zone::checkDefinition("
+ "const label maxSize, const bool report) const"
+ ) << "Zone " << name_
+ << " contains invalid index label " << addr[i] << nl
+ << "Valid index labels are 0.."
+ << maxSize-1 << endl;
+ }
+ }
+ }
+
+ return boundaryError;
+}
+
+
+void Foam::zone::write(Ostream& os) const
+{
+ os << nl << name_
+ << nl << static_cast<const labelList&>(*this);
+}
+
+
+// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const zone& z)
+{
+ z.write(os);
+ os.check("Ostream& operator<<(Ostream& f, const zone& z");
+ return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
new file mode 100644
index 0000000000000000000000000000000000000000..fb5d2453e653867e92a7dde99eed2eacf52d7218
--- /dev/null
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 1991-2009 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 2 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, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+ Foam::cellZone
+
+Description
+ Base class for zones
+
+SourceFiles
+ zone.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef zone_H
+#define zone_H
+
+#include "labelList.H"
+#include "typeInfo.H"
+#include "dictionary.H"
+#include "Map.H"
+#include "pointFieldFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+class zone;
+Ostream& operator<<(Ostream&, const zone&);
+
+/*---------------------------------------------------------------------------*\
+ Class zone Declaration
+\*---------------------------------------------------------------------------*/
+
+class zone
+:
+ public labelList
+{
+
+protected:
+
+ // Protected data
+
+ //- Name of zone
+ word name_;
+
+ //- Index of zone
+ label index_;
+
+
+ // Demand-driven private data
+
+ //- Map of labels in zone for fast location lookup
+ mutable Map<label>* lookupMapPtr_;
+
+
+ // Protected Member Functions
+
+ //- Return a reference to the look-up map
+ const Map<label>& lookupMap() const;
+
+ //- Construct the look-up map
+ void calcLookupMap() const;
+
+ //- Disallow default bitwise copy construct
+ zone(const zone&);
+
+
+public:
+
+ //- Runtime type information
+ TypeName("zone");
+
+
+ // Constructors
+
+ //- Construct from components
+ zone
+ (
+ const word& name,
+ const labelList& addr,
+ const label index
+ );
+
+ //- Construct from components, transferring contents
+ zone
+ (
+ const word& name,
+ const Xfer<labelList>& addr,
+ const label index
+ );
+
+ //- Construct from dictionary
+ zone
+ (
+ const word& zoneType,
+ const word& name,
+ const dictionary&,
+ const label index
+ );
+
+ //- Construct given the original zone and resetting the
+ // cell list and zone mesh information
+ zone
+ (
+ const zone&,
+ const labelList& addr,
+ const label index
+ );
+
+ //- Construct given the original zone, resetting the
+ // cell list and zone mesh information
+ zone
+ (
+ const zone&,
+ const Xfer<labelList>& addr,
+ const label index
+ );
+
+
+ //- Destructor
+ virtual ~zone();
+
+
+ // Member Functions
+
+ //- Return name
+ const word& name() const
+ {
+ return name_;
+ }
+
+ //- Map storing the local index for every global index. Used to find
+ // the index of the item in the zone from the known global index. If
+ // the item is not in the zone, returns -1
+ label localID(const label globalID) const;
+
+ //- Return the index of this zone in zone list
+ label index() const
+ {
+ return index_;
+ }
+
+ //- Clear addressing
+ virtual void clearAddressing();
+
+ //- Check zone definition. Return true if in error.
+ virtual bool checkDefinition(const bool report = false) const = 0;
+
+ //- Check zone definition with max size given. Return true if in error.
+ virtual bool checkDefinition
+ (
+ const label maxSize,
+ const bool report = false
+ ) const;
+
+ //- Correct patch after moving points
+ virtual void movePoints(const pointField&)
+ {}
+
+ //- Write
+ virtual void write(Ostream&) const;
+
+ //- Write dictionary
+ virtual void writeDict(Ostream&) const = 0;
+
+
+ // I-O
+
+ //- Ostream Operator
+ friend Ostream& operator<<(Ostream&, const zone&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
index 35c748949be8be87a480d12a7e73c196e3cd3297..9347146b01f4cb61443bf27a58801d674f97651c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "DispersionModel.H"
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index fae1d15e6b2aadaad63af8cc36531a29314ee21a..e9cf99d723540ca5c6cd089f52ae417ee09f7ccc 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cloudAbsorptionEmission.H"
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
index 6fc8c65acf6aa1139b62361e99aa32747480d663..533adf4f05280f3f8bee829a053a57ced80bb200 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cloudScatter.H"
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index c7c79e96b31a1e4fed15e71f378cc957c0b6334b..ee684801a6fd9612ac98613b8e48a8e39ba9d58b 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -244,6 +244,7 @@ class PointEdgeWave
//- Disallow default bitwise assignment
void operator=(const PointEdgeWave&);
+
public:
// Static Functions
@@ -261,7 +262,6 @@ public:
}
-
// Constructors
//- Construct from mesh, list of changed points with the Type
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWaveName.C b/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
index 5a834dac45fa059988dbab663e241e0419566c2c..8c6a37e11f5313973a8873b6a5406b1af23a885b 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
+++ b/src/meshTools/PointEdgeWave/PointEdgeWaveName.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "PointEdgeWave.H"
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.C b/src/meshTools/PointEdgeWave/pointEdgePoint.C
index e994774059de10cb27bbac69a9c0cc357b629dd7..ad0fc3869cd0ad95fdfc424aa7ab88aedc291954 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.C
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "pointEdgePoint.H"
@@ -32,8 +30,6 @@ Description
Foam::point Foam::pointEdgePoint::greatPoint(GREAT, GREAT, GREAT);
-
-
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
Foam::Ostream& Foam::operator<<
@@ -45,9 +41,11 @@ Foam::Ostream& Foam::operator<<
return os << wDist.origin() << wDist.distSqr();
}
+
Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::pointEdgePoint& wDist)
{
return is >> wDist.origin_ >> wDist.distSqr_;
}
+
// ************************************************************************* //
diff --git a/src/meshTools/PointEdgeWave/pointEdgePoint.H b/src/meshTools/PointEdgeWave/pointEdgePoint.H
index 23a2eeb2c35a9b505dafe1aad6ee37836c35770b..1e83edd1d9af0fd62d8e55eda637f97ff8f32c16 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePoint.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePoint.H
@@ -45,7 +45,6 @@ SourceFiles
#include "tensor.H"
#include "pTraits.H"
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@@ -69,6 +68,7 @@ class pointEdgePoint
//- normal distance (squared) from point to origin
scalar distSqr_;
+
// Private Member Functions
//- Evaluate distance to point. Update distSqr, origin from whomever
@@ -89,6 +89,7 @@ class pointEdgePoint
const scalar tol
);
+
public:
// Static data members
@@ -96,6 +97,7 @@ public:
//- initial point far away.
static point greatPoint;
+
// Constructors
//- Construct null
diff --git a/src/meshTools/PointEdgeWave/pointEdgePointI.H b/src/meshTools/PointEdgeWave/pointEdgePointI.H
index 0e46d2b1a5a4da880aa7c3b9a806ab941cee0ad7..72842946e20d3cdc51a9ec4de25de02153cbd85b 100644
--- a/src/meshTools/PointEdgeWave/pointEdgePointI.H
+++ b/src/meshTools/PointEdgeWave/pointEdgePointI.H
@@ -46,7 +46,7 @@ inline bool Foam::pointEdgePoint::update
origin_ = w2.origin();
return true;
- }
+ }
scalar diff = distSqr_ - dist2;
@@ -71,7 +71,7 @@ inline bool Foam::pointEdgePoint::update
}
}
-
+
// Update this with w2 (information on same point)
inline bool Foam::pointEdgePoint::update
(
@@ -86,7 +86,7 @@ inline bool Foam::pointEdgePoint::update
origin_ = w2.origin();
return true;
- }
+ }
scalar diff = distSqr_ - w2.distSqr();
@@ -111,6 +111,7 @@ inline bool Foam::pointEdgePoint::update
}
}
+
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Null constructor
@@ -124,7 +125,7 @@ inline Foam::pointEdgePoint::pointEdgePoint()
// Construct from origin, distance
inline Foam::pointEdgePoint::pointEdgePoint
(
- const point& origin,
+ const point& origin,
const scalar distSqr
)
:
@@ -229,14 +230,14 @@ inline bool Foam::pointEdgePoint::updatePoint
const scalar tol
)
{
- return
+ return
update
(
mesh.points()[pointI],
edgeInfo,
tol
);
- }
+}
// Update this with new information on same point
@@ -255,7 +256,7 @@ inline bool Foam::pointEdgePoint::updatePoint
newPointInfo,
tol
);
-}
+}
// Update this with new information on same point. No extra information.
@@ -266,7 +267,7 @@ inline bool Foam::pointEdgePoint::updatePoint
)
{
return update(newPointInfo, tol);
-}
+}
// Update this with information from connected point
@@ -292,7 +293,7 @@ inline bool Foam::pointEdgePoint::updateEdge
pointInfo,
tol
);
-}
+}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index f54876c9c5071e2319e4168272b66081f0021d8e..518fd5ae4a03e171ff1b85ab39a2bc935dabf7bd 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cellClassification.H"
diff --git a/src/meshTools/cellClassification/cellInfo.C b/src/meshTools/cellClassification/cellInfo.C
index f7828fc2925c497d45d2edde5114343edc262f57..92aff0b76d5c287c7ce19119f3d366b8872163d1 100644
--- a/src/meshTools/cellClassification/cellInfo.C
+++ b/src/meshTools/cellClassification/cellInfo.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cellInfo.H"
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index 8bc65470bcf053f2d80257052eb8b91bbf23f118..d1d3a5638c8bb17ec5fd6ed39ce9c5b44dc126d2 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cellDistFuncs.H"
diff --git a/src/meshTools/cellDist/wallPoint/wallPoint.C b/src/meshTools/cellDist/wallPoint/wallPoint.C
index b25b64ba867723983e7937ac778c4c195d2d8644..168a401f3008d90d310a7cc440080e43cdef1309 100644
--- a/src/meshTools/cellDist/wallPoint/wallPoint.C
+++ b/src/meshTools/cellDist/wallPoint/wallPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "wallPoint.H"
diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.C b/src/meshTools/cellDist/wallPoint/wallPointData.C
index 3d4f3431324707a4dc5846118db50b2556e4150b..7143872d8b5a51a2ddc9a02de60dc228375fe9ef 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointData.C
+++ b/src/meshTools/cellDist/wallPoint/wallPointData.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "wallPointData.H"
diff --git a/src/meshTools/cellFeatures/cellFeatures.C b/src/meshTools/cellFeatures/cellFeatures.C
index 8d3170dca39c7a620a51b47f3446c06df3551ab6..d023d66eb8fe148d8f91cd29851712f5c7cbc8d8 100644
--- a/src/meshTools/cellFeatures/cellFeatures.C
+++ b/src/meshTools/cellFeatures/cellFeatures.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cellFeatures.H"
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index 57e450dfe882353096e1caba631d68524e40f277..b1c47e8f10dd2debc2f77bf1891f7667a67e491d 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Class calculates cell quality measures.
\*---------------------------------------------------------------------------*/
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.C b/src/meshTools/coordinateSystems/coordinateSystem.C
index 80232ffd8d12c850a5efcc6ae600ed7f8fe6c600..1c2dd701e882753ec4aca034ef67ace2af0171e9 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.C
+++ b/src/meshTools/coordinateSystems/coordinateSystem.C
@@ -111,10 +111,7 @@ Foam::coordinateSystem::coordinateSystem
}
-Foam::coordinateSystem::coordinateSystem
-(
- const dictionary& dict
-)
+Foam::coordinateSystem::coordinateSystem(const dictionary& dict)
:
name_(type()),
note_(),
@@ -322,16 +319,17 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
os.writeKeyword("note") << note_ << token::END_STATEMENT << nl;
}
- os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
- os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl;
- os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
+ os.writeKeyword("origin") << origin_ << token::END_STATEMENT << nl;
+ os.writeKeyword("e1") << e1() << token::END_STATEMENT << nl;
+ os.writeKeyword("e3") << e3() << token::END_STATEMENT << nl;
if (subDict)
{
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os << decrIndent << indent << token::END_BLOCK << endl;
}
}
+
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
void Foam::coordinateSystem::operator=(const dictionary& rhs)
diff --git a/src/meshTools/coordinateSystems/coordinateSystem.H b/src/meshTools/coordinateSystems/coordinateSystem.H
index 5bff54e52311078a96aea9736d7e87df385048ce..cfdecfd398e35f3ede00c2a6936aff138b6c9ab4 100644
--- a/src/meshTools/coordinateSystems/coordinateSystem.H
+++ b/src/meshTools/coordinateSystems/coordinateSystem.H
@@ -166,6 +166,7 @@ class coordinateSystem
//- Global-to-Local transformation tensor
tensor Rtr_;
+
protected:
// Protected Member Functions
@@ -194,6 +195,7 @@ protected:
bool translate
) const;
+
public:
//- Runtime type information
@@ -249,6 +251,7 @@ public:
return autoPtr<coordinateSystem>(new coordinateSystem(*this));
}
+
// Declare run-time constructor selection table
declareRunTimeSelectionTable
@@ -276,6 +279,7 @@ public:
(name, origin, cr)
);
+
// Selectors
//- Select constructed from dictionary
@@ -297,160 +301,170 @@ public:
//- Select constructed from Istream
static autoPtr<coordinateSystem> New(Istream& is);
- // Destructor
- virtual ~coordinateSystem();
+ //- Destructor
+ virtual ~coordinateSystem();
// Member Functions
- // Access
+ // Access
- //- Return name
- const word& name() const
- {
- return name_;
- }
+ //- Return name
+ const word& name() const
+ {
+ return name_;
+ }
- //- Return non-constant access to the optional note
- string& note()
- {
- return note_;
- }
+ //- Return non-constant access to the optional note
+ string& note()
+ {
+ return note_;
+ }
- //- Return the optional note
- const string& note() const
- {
- return note_;
- }
+ //- Return the optional note
+ const string& note() const
+ {
+ return note_;
+ }
- //- Return origin
- const point& origin() const
- {
- return origin_;
- }
+ //- Return origin
+ const point& origin() const
+ {
+ return origin_;
+ }
- //- Return coordinate rotation
- const coordinateRotation& rotation() const
- {
- return R_;
- }
+ //- Return coordinate rotation
+ const coordinateRotation& rotation() const
+ {
+ return R_;
+ }
- //- Return local-to-global transformation tensor
- const tensor& R() const
- {
- return R_;
- }
+ //- Return local-to-global transformation tensor
+ const tensor& R() const
+ {
+ return R_;
+ }
- //- Return local Cartesian x-axis
- const vector& e1() const
- {
- return Rtr_.x();
- }
+ //- Return local Cartesian x-axis
+ const vector& e1() const
+ {
+ return Rtr_.x();
+ }
- //- Return local Cartesian y-axis
- const vector& e2() const
- {
- return Rtr_.y();
- }
+ //- Return local Cartesian y-axis
+ const vector& e2() const
+ {
+ return Rtr_.y();
+ }
- //- Return local Cartesian z-axis
- const vector& e3() const
- {
- return Rtr_.z();
- }
+ //- Return local Cartesian z-axis
+ const vector& e3() const
+ {
+ return Rtr_.z();
+ }
- //- Return axis (e3: local Cartesian z-axis)
- // @deprecated method e3 is preferred
- const vector& axis() const
- {
- return Rtr_.z();
- }
+ //- Return axis (e3: local Cartesian z-axis)
+ // @deprecated method e3 is preferred
+ const vector& axis() const
+ {
+ return Rtr_.z();
+ }
- //- Return direction (e1: local Cartesian x-axis)
- // @deprecated method e1 is preferred
- const vector& direction() const
- {
- return Rtr_.x();
- }
+ //- Return direction (e1: local Cartesian x-axis)
+ // @deprecated method e1 is preferred
+ const vector& direction() const
+ {
+ return Rtr_.x();
+ }
- //- Return as dictionary of entries
- // @param [in] ignoreType drop type (cartesian, cylindrical, etc)
- // when generating the dictionary
- virtual dictionary dict(bool ignoreType=false) const;
+ //- Return as dictionary of entries
+ // @param [in] ignoreType drop type (cartesian, cylindrical, etc)
+ // when generating the dictionary
+ virtual dictionary dict(bool ignoreType=false) const;
- // Edit
+ // Edit
- //- Rename
- virtual void rename(const word& newName)
- {
- name_ = newName;
- }
+ //- Rename
+ virtual void rename(const word& newName)
+ {
+ name_ = newName;
+ }
- //- Edit access to origin
- point& origin()
- {
- return origin_;
- }
+ //- Edit access to origin
+ point& origin()
+ {
+ return origin_;
+ }
- // Write
- //- Write
- virtual void write(Ostream&) const;
+ // Write
- //- Write dictionary
- virtual void writeDict(Ostream&, bool subDict=true) const;
+ //- Write
+ virtual void write(Ostream&) const;
- // Transformations
+ //- Write dictionary
+ virtual void writeDict(Ostream&, bool subDict=true) const;
- //- Convert from position in local coordinate system to global Cartesian position
- point globalPosition(const point& local) const
- {
- return localToGlobal(local, true);
- }
- //- Convert from position in local coordinate system to global Cartesian position
- tmp<pointField> globalPosition(const pointField& local) const
- {
- return localToGlobal(local, true);
- }
+ // Transformations
- //- Convert from vector components in local coordinate system to global Cartesian vector
- vector globalVector(const vector& local) const
- {
- return localToGlobal(local, false);
- }
+ //- Convert from position in local coordinate system to global
+ // Cartesian position
+ point globalPosition(const point& local) const
+ {
+ return localToGlobal(local, true);
+ }
- //- Convert from vector components in local coordinate system to global Cartesian vector
- tmp<vectorField> globalVector(const vectorField& local) const
- {
- return localToGlobal(local, false);
- }
+ //- Convert from position in local coordinate system to global
+ // Cartesian position
+ tmp<pointField> globalPosition(const pointField& local) const
+ {
+ return localToGlobal(local, true);
+ }
- //- Convert from global Cartesian position to position in local coordinate system
- point localPosition(const point& global) const
- {
- return globalToLocal(global, true);
- }
+ //- Convert from vector components in local coordinate system to
+ // global Cartesian vector
+ vector globalVector(const vector& local) const
+ {
+ return localToGlobal(local, false);
+ }
- //- Convert from global Cartesian position to position in local coordinate system
- tmp<pointField> localPosition(const pointField& global) const
- {
- return globalToLocal(global, true);
- }
+ //- Convert from vector components in local coordinate system to
+ // global Cartesian vector
+ tmp<vectorField> globalVector(const vectorField& local) const
+ {
+ return localToGlobal(local, false);
+ }
- //- Convert from global Cartesian vector to components in local coordinate system
- vector localVector(const vector& global) const
- {
- return globalToLocal(global, false);
- }
+ //- Convert from global Cartesian position to position in local
+ // coordinate system
+ point localPosition(const point& global) const
+ {
+ return globalToLocal(global, true);
+ }
- //- Convert from global Cartesian vector to components in local coordinate system
- tmp<vectorField> localVector(const vectorField& global) const
- {
- return globalToLocal(global, false);
- }
+ //- Convert from global Cartesian position to position in local
+ // coordinate system
+ tmp<pointField> localPosition(const pointField& global) const
+ {
+ return globalToLocal(global, true);
+ }
+
+ //- Convert from global Cartesian vector to components in local
+ // coordinate system
+ vector localVector(const vector& global) const
+ {
+ return globalToLocal(global, false);
+ }
+
+ //- Convert from global Cartesian vector to components in local
+ // coordinate system
+ tmp<vectorField> localVector(const vectorField& global) const
+ {
+ return globalToLocal(global, false);
+ }
// Member Operators
@@ -467,6 +481,7 @@ public:
const coordinateSystem&
);
+
// IOstream Operators
friend Ostream& operator<<(Ostream&, const coordinateSystem&);
diff --git a/src/meshTools/coordinateSystems/coordinateSystemNew.C b/src/meshTools/coordinateSystems/coordinateSystemNew.C
index 0c0752ededc995d311d08a137d6e08d2f3eae3fc..25039ce0e1d5b52b60f65befb48433e4daffebb2 100644
--- a/src/meshTools/coordinateSystems/coordinateSystemNew.C
+++ b/src/meshTools/coordinateSystems/coordinateSystemNew.C
@@ -121,4 +121,5 @@ Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
return New(name, dict);
}
+
// ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H
index f9fdc012e08cca734c532d3cf3dd693c1949ed28..cc1554768e300d5ac2bd7538b53de989a540ac82 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.H
+++ b/src/meshTools/coordinateSystems/coordinateSystems.H
@@ -64,6 +64,7 @@ class coordinateSystems
//- Disallow default bitwise assignment
void operator=(const coordinateSystems&);
+
public:
//- Runtime type information
@@ -88,11 +89,13 @@ public:
const Xfer<PtrList<coordinateSystem> >&
);
+
// Selectors
//- Return previously registered or read construct from "constant"
static const coordinateSystems& New(const objectRegistry&);
+
// Member Functions
//- Find and return index for a given keyword, returns -1 if not found
diff --git a/src/meshTools/coordinateSystems/cylindricalCS.H b/src/meshTools/coordinateSystems/cylindricalCS.H
index e41f263a7ed94e3039b848d8ca0e30506ec187df..0aa8da574617327c3cac20c95b06f791d23b9e05 100644
--- a/src/meshTools/coordinateSystems/cylindricalCS.H
+++ b/src/meshTools/coordinateSystems/cylindricalCS.H
@@ -86,6 +86,7 @@ protected:
bool translate
) const;
+
public:
//- Runtime type information
@@ -142,7 +143,6 @@ public:
//- Non-const access to inDegrees
bool& inDegrees();
-
};
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
index f2e83108ace812d8c7c137bcd9931d8aa5ec26ed..f80b75a7240c6710ce0d983914dbe6c5216a97b8 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.C
@@ -159,6 +159,7 @@ Foam::vector Foam::parabolicCylindricalCS::globalToLocal
return vector::zero;
}
+
Foam::tmp<Foam::vectorField> Foam::parabolicCylindricalCS::globalToLocal
(
const vectorField& global,
diff --git a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
index d5fb5ccec37fe80002a9bcda2cc516ff4a773216..5b389f070ef6b76d592346e9392b2327397ecd92 100644
--- a/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
+++ b/src/meshTools/coordinateSystems/parabolicCylindricalCS.H
@@ -85,6 +85,7 @@ protected:
bool translate
) const;
+
public:
//- Runtime type information
@@ -106,7 +107,6 @@ public:
//- Construct from dictionary
parabolicCylindricalCS(const word&, const dictionary&);
-
};
diff --git a/src/meshTools/coordinateSystems/sphericalCS.H b/src/meshTools/coordinateSystems/sphericalCS.H
index 31d32bc9e4eba0430efc66b33126b8c17fcf0f2b..d211ec798ecd082b8ff4990c2e5603a8e5857eb7 100644
--- a/src/meshTools/coordinateSystems/sphericalCS.H
+++ b/src/meshTools/coordinateSystems/sphericalCS.H
@@ -85,6 +85,7 @@ protected:
bool translate
) const;
+
public:
//- Runtime type information
@@ -141,7 +142,6 @@ public:
//- Non-const access to inDegrees
bool& inDegrees();
-
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinateSystems/toroidalCS.C b/src/meshTools/coordinateSystems/toroidalCS.C
index f098a0d18f4b220af74bd008ea206c926b130495..189e0e4979082509ad2211b952cc026ee833c3e8 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.C
+++ b/src/meshTools/coordinateSystems/toroidalCS.C
@@ -158,8 +158,8 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
{
if (subDict)
{
- os << indent << name() << nl
- << indent << token::BEGIN_BLOCK << incrIndent << nl;
+ os << indent << name() << nl
+ << indent << token::BEGIN_BLOCK << incrIndent << nl;
}
coordinateSystem::writeDict(os, false);
@@ -167,8 +167,9 @@ void Foam::toroidalCS::writeDict(Ostream& os, bool subDict) const
if (subDict)
{
- os << decrIndent << indent << token::END_BLOCK << endl;
+ os << decrIndent << indent << token::END_BLOCK << endl;
}
}
+
// ************************************************************************* //
diff --git a/src/meshTools/coordinateSystems/toroidalCS.H b/src/meshTools/coordinateSystems/toroidalCS.H
index c04498dda8c1e81bd35f78add89193f50aea5930..7631bd6fee8d5ccb0457144c4afcc8224d255ea1 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.H
+++ b/src/meshTools/coordinateSystems/toroidalCS.H
@@ -46,7 +46,6 @@ SourceFiles
namespace Foam
{
-
/*---------------------------------------------------------------------------*\
Class toroidalCS Declaration
\*---------------------------------------------------------------------------*/
@@ -86,6 +85,7 @@ class toroidalCS
bool translate
) const;
+
public:
//- Runtime type information
@@ -103,7 +103,6 @@ public:
const scalar radius
);
-
//- Construct from dictionary
toroidalCS(const word& name, const dictionary&);
diff --git a/src/meshTools/indexedOctree/indexedOctreeName.C b/src/meshTools/indexedOctree/indexedOctreeName.C
index bc98c21926cc622e15e76b14ee135fee2c1a6b9c..e658d328af0193f836993ece5aac75553d864c74 100644
--- a/src/meshTools/indexedOctree/indexedOctreeName.C
+++ b/src/meshTools/indexedOctree/indexedOctreeName.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "indexedOctree.H"
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index 5303156518e93277e21f8b110de84f78456b9dc4..1115ff13f95e9799fbd3b00d34c347785e361048 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "treeDataPoint.H"
diff --git a/src/meshTools/octree/octree.C b/src/meshTools/octree/octree.C
index fa180fd9c12baebe4080a60d2eb6d846a7c6c48e..fe841e93f1b8cb294af6e45dce16b9b970119d3e 100644
--- a/src/meshTools/octree/octree.C
+++ b/src/meshTools/octree/octree.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "octree.H"
diff --git a/src/meshTools/octree/octreeDataCell.C b/src/meshTools/octree/octreeDataCell.C
index df9bd9ef123f9813710b2b1f9afb8ab07cf2aefc..2a3882f16e82868f8b49d209d67be6eed318a8b7 100644
--- a/src/meshTools/octree/octreeDataCell.C
+++ b/src/meshTools/octree/octreeDataCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "octreeDataCell.H"
diff --git a/src/meshTools/octree/octreeDataPointTreeLeaf.C b/src/meshTools/octree/octreeDataPointTreeLeaf.C
index 2e5cafc9b7a5411c703da40dceeada1065481a10..844bf498a87ac1ef059f940e48a7cbb263e8c526 100644
--- a/src/meshTools/octree/octreeDataPointTreeLeaf.C
+++ b/src/meshTools/octree/octreeDataPointTreeLeaf.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
//#include "octreeDataPointTreeLeaf.H"
diff --git a/src/meshTools/octree/octreeName.C b/src/meshTools/octree/octreeName.C
index 59b9f85f30196e39945326d02534395aa8ad5356..e09b142766c0b5bfe738f26da3d9f5894ee0c140 100644
--- a/src/meshTools/octree/octreeName.C
+++ b/src/meshTools/octree/octreeName.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "octree.H"
diff --git a/src/meshTools/octree/pointIndexHitIOList.C b/src/meshTools/octree/pointIndexHitIOList.C
index 79976abdcfdb0ae17d169337c072e3b2c1772325..844f3b5eac3fa75a11e4b33e8f49f50358026fbf 100644
--- a/src/meshTools/octree/pointIndexHitIOList.C
+++ b/src/meshTools/octree/pointIndexHitIOList.C
@@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- IOList of pointIndexHits
-
\*---------------------------------------------------------------------------*/
#include "pointIndexHitIOList.H"
diff --git a/src/meshTools/octree/treeLeaf.C b/src/meshTools/octree/treeLeaf.C
index 3cff3dfd60448b22871958d7411d0750d7747280..555edaa2b0033ebfad2d404b79ce0ff15b156f00 100644
--- a/src/meshTools/octree/treeLeaf.C
+++ b/src/meshTools/octree/treeLeaf.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "treeLeaf.H"
diff --git a/src/meshTools/octree/treeLeafName.C b/src/meshTools/octree/treeLeafName.C
index 414a2eb3a41675abe7d7b344eed1ba872821b9c6..af0447bb2338ed37d6122b27e610cf1359befd71 100644
--- a/src/meshTools/octree/treeLeafName.C
+++ b/src/meshTools/octree/treeLeafName.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "treeLeaf.H"
diff --git a/src/meshTools/octree/treeNode.C b/src/meshTools/octree/treeNode.C
index 3e503f13a08be5552b8d07364f964efab7bda5fc..e8e5ece609b39a890d9d0c695c3b669f235c993d 100644
--- a/src/meshTools/octree/treeNode.C
+++ b/src/meshTools/octree/treeNode.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "treeNode.H"
diff --git a/src/meshTools/octree/treeNodeName.C b/src/meshTools/octree/treeNodeName.C
index 002c8d3063af0d33a9e8cb4b4cde30defb212574..3bd8cb58a0653ec701d0e7db0cbc8194925aed87 100644
--- a/src/meshTools/octree/treeNodeName.C
+++ b/src/meshTools/octree/treeNodeName.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "treeNode.H"
diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
index c53a881e82c2509af95df89b459037f4ebd48128..5b454c41d2e094bd802333057dc2e808c1decc7c 100644
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "boxToCell.H"
diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
index 760d3541bc905e440e3c6d94bd0c0294bb87ff6d..222d14965f636b8b345401c394139113ce2b354d 100644
--- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
+++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cellToCell.H"
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 270e58f30064bb5caddf0fdfeb1714231f18dc4c..233a4cfd9675730ae1293282b93d24b6bb399919 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "faceToCell.H"
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
index 1111a9f62ba12f02ca1400504f3d0ad161dde1ae..aad4d776dc6dae65b4698cbfc6be70a9fc24c186 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "fieldToCell.H"
diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
index 66e6734028d6b4642f22c16378f3cc07873d17fb..8ed5cc4684b75a33f708a380aa503d3648ff596d 100644
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "nearestToCell.H"
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index c05e527a33e5ccbf4b657bd3d90591ea5569ee1e..323809ab5be6f77ae36e6fd44e5ec485c91d2563 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "pointToCell.H"
diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
index 4a63a4d213726966df6f633f2d9567722c87924d..0f0421ef81009dde900d13f966b2c4dfe26026f3 100644
--- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
+++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "rotatedBoxToCell.H"
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
index d5ca0772aeb27be17ec1d669de6d2ad414979e93..c8f23570d4d9adabdbf22a4f0add95fe7581c730 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "shapeToCell.H"
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
index 97352fe606f5568719f51a2d2543296bf1af78fc..eec8051b2fde457270db9352f1dd3e13f233fb57 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "surfaceToCell.H"
diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
index aaf7ebee0cb4221e14e1387d8bb5e229b4ecfa4c..185b3eca2e4cb44c1389956694874ecc2d4b0bc5 100644
--- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
+++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "boundaryToFace.H"
diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
index ba30ce0266d15a3a4b87d25cd643bd4cfb9db83d..e0683883abcf60f1cb71a081151228c3cba9aa5e 100644
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "boxToFace.H"
diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
index 7e031664ad5b976f547de40ba0e28651dca2074d..69ee32b780384ec1781202947cca16861ee81c0d 100644
--- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
+++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "faceToFace.H"
diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
index d9d922bcf4483a08b7256dd6d04b0c7ebd14ff48..c2c378a5139daada1fd69541ce8f3838f3243e2a 100644
--- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
+++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "labelToFace.H"
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index f0c0925cd7a2ae29c548b2cae79fac5e018b0446..a310082f8aed6bf8cfa4f340bd5ef3e9e07eb24f 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "normalToFace.H"
diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
index 000db639a96180f2e24ada7aa4f08b4a621685e4..0d76a37e4bedfe9616c703ea6d3b056ba641dcc6 100644
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "patchToFace.H"
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index 6b063bab2995076c670bc5e66e2b368216190a64..80f7be2838a49800dadb4053e8d85cdfde4f3c56 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "pointToFace.H"
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
index 7f68dcfafcf1d4ed33cd21213c4a763bb30e38bf..357bf44d2987fe1c6938943e8b602c00750ccb26 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "boxToPoint.H"
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index 4b83fcae80e799041701f65d92aabe5fa1cd89cb..1753f84848f8e90f007a9e2a462fb2837eaa4be1 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "cellToPoint.H"
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 1ae3fb1f66facf495ed78d3197c49b14b3203890..242d3bd5669135e6a5f102f78b74caa4daa26085 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "faceToPoint.H"
diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
index a80ca084d67388bcca16e94ba440d9beb43baaa4..48710a9de88ec039bc106a0a2cf61f6722416f5d 100644
--- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
+++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "labelToPoint.H"
diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
index 6ae1220845fff26f0abdf4d26cda031524e41982..bc28d066f4cd97b6dae2695e564d28d66380d48e 100644
--- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
+++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "pointToPoint.H"
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
index 25601a213424c2dadc6de6528e261a4bbace61d7..8bb787f3afd27bbd27890b3a4315f6e5cf738e42 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "surfaceToPoint.H"
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.C b/src/meshTools/sets/topoSetSource/topoSetSource.C
index 63aff6fc8334c931d06722bd1bef1e629d3e9c31..7579ffffad5c33ba25c2efd399cb528606e96b8c 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.C
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "topoSetSource.H"
diff --git a/src/meshTools/surfaceSets/surfaceSets.C b/src/meshTools/surfaceSets/surfaceSets.C
index eb82bd44ff53fb888d0fd7c41948ddbed93bf348..93a8cb1ce5d9ebd19d5feeec2c025bae52cc12a1 100644
--- a/src/meshTools/surfaceSets/surfaceSets.C
+++ b/src/meshTools/surfaceSets/surfaceSets.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "surfaceSets.H"
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
index 3e007c880e8d80680ba91e338ff0d2ecb1c9aa93..fdccecf61778000882eeb37d6a50135ae62956f6 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "booleanSurface.H"
@@ -1098,7 +1096,4 @@ Foam::booleanSurface::booleanSurface
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
index f1ce39aa6e0475322fc16f1747b1ca27aeb593cc..8c28eb36a323a915892869d70dc263c00a6cb4e2 100644
--- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
+++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.H
@@ -82,6 +82,7 @@ class booleanSurface
INSIDE
};
+
// Private data
//- From new to old face + surface:
@@ -90,6 +91,7 @@ class booleanSurface
// face2 (e.g. face2I = -faceMap[]-1)
labelList faceMap_;
+
// Private Member Functions
//- Check whether subset of faces (from markZones) reaches up to
@@ -151,6 +153,7 @@ class booleanSurface
labelList& side
);
+
public:
ClassName("booleanSurface");
@@ -175,7 +178,7 @@ public:
booleanSurface();
//- Construct from surfaces and face labels to keep.
- // Walks from provided seed faces without crossing intersection line
+ // Walks from provided seed faces without crossing intersection line
// to determine faces to keep.
booleanSurface
(
@@ -233,8 +236,6 @@ public:
}
return -faceMap_[faceI]-1;
}
-
-
};
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index 8d73f64d5187a2a4b058dafd2f77864d314d0575..5caa377e0549a686d9388865c9bc7bf88e2ff04a 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "edgeSurface.H"
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
index 73fe36815be72b6dcd968115d320f5d7b99d3c97..c1e8fd0491b3ba9ad6d58fc412155449469ce338 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.H
@@ -117,7 +117,6 @@ private:
void calcPointEdges();
-
public:
ClassName("edgeSurface");
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 9450865081106b2747a9be30c70e358fc711e147..be758c07fdf0c6b4d9677b57629c066ee4d2fda1 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -205,7 +205,6 @@ void Foam::intersectedSurface::printVisit
}
-
// Check if the two vertices that f0 and f1 share are in the same order on
// both faces.
bool Foam::intersectedSurface::sameEdgeOrder
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index f3ee58ed0b1539df188661f46ceac9bd896cc228..7ff2327196dd4b6242a20163dca54b3697725d6b 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "edgeIntersections.H"
@@ -46,7 +44,7 @@ Description
defineTypeNameAndDebug(Foam::edgeIntersections, 0);
Foam::scalar Foam::edgeIntersections::alignedCos_ =
- Foam::cos(89.0 * Foam::mathematicalConstant::pi/180.0);
+ Foam::cos(89.0*Foam::mathematicalConstant::pi/180.0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -721,13 +719,4 @@ Foam::label Foam::edgeIntersections::removeDegenerates
}
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-
-
// ************************************************************************* //
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
index e1ca17c44156363ad7bfe63016ee7f6f7104d68d..45c54995cccff8fa4c69669eb7cf1b3a1d1fcd8e 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.H
@@ -131,6 +131,7 @@ class edgeIntersections
boolList& affectedEdges
) const;
+
public:
ClassName("edgeIntersections");
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index 38ee335d33cf72b02f80a6a1ce24dec618ce3773..33940989b8228a358caa1c19ebfda82404a94344 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "surfaceIntersection.H"
@@ -201,7 +199,6 @@ bool Foam::surfaceIntersection::excludeEdgeHit
//}
-
void Foam::surfaceIntersection::storeIntersection
(
const bool isFirstSurf,
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index 3f23e9e370cbb8c6b5709f748c07e2e220bfe402..2b4304c694ef9db65fd522094634f21ebe307e9a 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -76,7 +76,7 @@ class triSurface;
class edgeIntersections;
/*---------------------------------------------------------------------------*\
- Class surfaceIntersection Declaration
+ Class surfaceIntersection Declaration
\*---------------------------------------------------------------------------*/
class surfaceIntersection
@@ -171,7 +171,7 @@ class surfaceIntersection
// const point& eStart,
// const point& eEnd
//);
-
+
//- Debugging: Dump intersected edges to stream
void writeIntersectedEdges
@@ -233,6 +233,7 @@ class surfaceIntersection
List<DynamicList<label> >& surfEdgeCuts
);
+
public:
ClassName("surfaceIntersection");
@@ -284,7 +285,6 @@ public:
const labelListList& surf1EdgeCuts() const;
const labelListList& surf2EdgeCuts() const;
-
};
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 711ede3cd2c0dd50a3862c5e0fee06710e798b3d..b2a5eec086885c647d557aef1b4969bf236429f3 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "surfaceIntersection.H"
@@ -37,9 +35,6 @@ Description
#include "octree.H"
#include "meshTools.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::surfaceIntersection::writeOBJ(const point& pt, Ostream& os)
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
index aeec3a8daf1c900941a4208108413d421adf9ef0..03aac83298874d5b8d48383d00f47ff6a48bf2f5 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionTemplates.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "surfaceIntersection.H"
diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
index ef1cbbae6ecbea1c4170e9f3fcf4b65a462b22cd..a2d826cb4b720036bed24be4f7c86c823d95dcea 100644
--- a/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
+++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurface.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "octreeDataTriSurface.H"
diff --git a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
index e555cb2487cbe48d2b7f2e7ad48f39f457025a77..9582d6118d5bb4836a87a09ad6ab05c9c6ddbc6c 100644
--- a/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
+++ b/src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "octreeDataTriSurfaceTreeLeaf.H"
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index f4c165d83f40ee11ee1dffcc2a997f28282f9eba..34a230744754b257802e9a2a47c39320ac5e75fb 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "orientedSurface.H"
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 0e08c13c272d03431809d6c8af7f1cc940ebe455..af3be4840a9248cb807a0c57a22766cdb47577f0 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "surfaceFeatures.H"
@@ -1097,8 +1095,8 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
// Step to next sample point using local distance.
// Truncate to max 1/minSampleDist samples per feature edge.
-// s += max(minSampleDist*eMag, sampleDist[e.start()]);
-s += 0.01*eMag;
+ // s += max(minSampleDist*eMag, sampleDist[e.start()]);
+ s += 0.01*eMag;
if (s >= (1-minSampleDist)*eMag)
{
diff --git a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
index e3d6758cffbfafc7801f1b32a1ad3e6b42c35e42..3df84cb551d4970a7478063a73d7b29aa7e67813 100644
--- a/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
+++ b/src/meshTools/triSurface/surfaceLocation/surfaceLocation.C
@@ -27,15 +27,6 @@ License
#include "surfaceLocation.H"
#include "triSurface.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
@@ -72,12 +63,6 @@ Foam::vector Foam::surfaceLocation::normal(const triSurface& s) const
}
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
void Foam::surfaceLocation::write(Ostream& os, const triSurface& s) const
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index b89afdab63b372cb73ad5839afec77febf4d14d0..b406fb0467200ed2faafac79038d98a4cf974c4e 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "triSurfaceTools.H"
@@ -158,7 +156,7 @@ void Foam::triSurfaceTools::greenRefine
}
-// Refine all triangles marked for refinement.
+// Refine all triangles marked for refinement.
Foam::triSurface Foam::triSurfaceTools::doRefine
(
const triSurface& surf,
@@ -358,7 +356,7 @@ void Foam::triSurfaceTools::protectNeighbours
forAll(myFaces, myFaceI)
{
label faceI = myFaces[myFaceI];
-
+
if ((faceStatus[faceI] == ANYEDGE) || (faceStatus[faceI] >= 0))
{
faceStatus[faceI] = NOEDGE;
@@ -392,10 +390,10 @@ Foam::labelHashSet Foam::triSurfaceTools::getCollapsedFaces
{
facesToBeCollapsed.insert(myFaces[myFaceI]);
}
-
+
// From faces using v1 check if they share an edge with faces
// using v2.
- // - share edge: are part of 'splay' tree and will collapse if edge
+ // - share edge: are part of 'splay' tree and will collapse if edge
// collapses
const labelList& v1Faces = surf.pointFaces()[v1];
@@ -795,7 +793,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
//
// // Now neighbours contains first layer of triangles outside of
// // collapseFaces
-// // There should be
+// // There should be
// // -two if edgeI is a boundary edge
// // since the outside 'edge' of collapseFaces should
// // form a triangle and the face connected to edgeI is not inserted.
@@ -816,7 +814,7 @@ bool Foam::triSurfaceTools::collapseCreatesFold
// for (label j = i+1; j < neighbourList.size(); i++)
// {
// const labelList& faceJEdges = surf.faceEdges()[neighbourList[j]];
-//
+//
// // Check if faceI and faceJ share an edge
// forAll(faceIEdges, fI)
// {
@@ -1194,7 +1192,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::visitFaces
nearest.setHit();
nearest.triangle() = triI;
break;
- }
+ }
else
{
// Which edge is cut.
@@ -1913,7 +1911,7 @@ Foam::triSurface Foam::triSurfaceTools::greenRefine
// Storage for new faces
DynamicList<labelledTri> newFaces(0);
-
+
pointField newPoints(surf.localPoints());
newPoints.setSize(surf.nPoints() + surf.nEdges());
label newPointI = surf.nPoints();
@@ -2635,7 +2633,7 @@ Foam::triSurface Foam::triSurfaceTools::delaunay2D(const List<vector2D>& pts)
// // ~~~~~~~~~~~~~~~
//
// label vertI = 0;
-// for
+// for
// (
// Vertex_iterator it = T.vertices_begin();
// it != T.vertices_end();
@@ -2849,7 +2847,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
// Nearest point could be on point or edge. Retest.
label index, elemType;
- //bool inside =
+ //bool inside =
triPointRef(s[triI].tri(s.points())).classify
(
trianglePoint,
@@ -2865,7 +2863,7 @@ Foam::surfaceLocation Foam::triSurfaceTools::classify
nearest.setHit();
nearest.setIndex(triI);
nearest.elementType() = triPointRef::NONE;
- }
+ }
else if (elemType == triPointRef::EDGE)
{
nearest.setMiss();
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index c5c0e3d4da38cee88fbc4f2c3e6f49cd5c98b742..f98585b5ded981127264678eb86a9059ac0ac1d8 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -22,11 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Class applies a two-dimensional correction to mesh motion point field.
- The correction guarantees that the mesh does not get twisted during motion
- and thus introduce a third dimension into a 2-D problem.
-
\*---------------------------------------------------------------------------*/
#include "twoDPointCorrector.H"
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 29ac4c2a3b06820004cedd1675bb1f4d2cef3eb3..eef0ce53fcfc2edb50952ff01d48267b174ff89d 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
@@ -120,6 +120,7 @@ protected:
//- Prime-squared average
static const word EXT_PRIME2MEAN;
+
// Private data
//- Name of this set of field averages.
@@ -144,6 +145,7 @@ protected:
// calculated and output
List<fieldAverageItem> faItems_;
+
// Lists of averages
// Arithmetic mean fields
@@ -220,7 +222,7 @@ protected:
) const;
- // IO
+ // I-O
//- Write averages
virtual void writeAverages() const;
@@ -272,8 +274,7 @@ public:
//- Destructor
-
- virtual ~fieldAverage();
+ virtual ~fieldAverage();
// Member Functions
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index beffadd573cd7b463766200156109b9ff0d6d393..d2f544eedd12d288126d63881ab23668c5d19937 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -116,9 +116,8 @@ public:
fieldAverageItem(const fieldAverageItem&);
- // Destructor
-
- ~fieldAverageItem();
+ //- Destructor
+ ~fieldAverageItem();
// Member Functions
@@ -166,6 +165,7 @@ public:
void operator=(const fieldAverageItem&);
+
// Friend Operators
friend bool operator==
@@ -190,6 +190,7 @@ public:
return !(a == b);
}
+
// IOstream Operators
friend Istream& operator>>(Istream&, fieldAverageItem&);
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index 8c8a3aaf479a3a788b43fd07d9ae1af829fa0f86..36b88ecdfad83e1a02cb63a88a7b78ce7f27f091 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
@@ -140,9 +140,8 @@ public:
);
- // Destructor
-
- virtual ~fieldMinMax();
+ //- Destructor
+ virtual ~fieldMinMax();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
index d9a948db0896e2115d8de42adf671ef98315de51..beb7cec9567c515ba067e64fdeda275d30aa0863 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -116,9 +116,8 @@ public:
);
- // Destructor
-
- virtual ~forceCoeffs();
+ //- Destructor
+ virtual ~forceCoeffs();
// Member Functions
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index bb82aac4121443b4125e0a1e40a1ea990184b329..6fcdccc50ecba7636a20b8896c5297f086a73940 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -196,9 +196,8 @@ public:
);
- // Destructor
-
- virtual ~forces();
+ //- Destructor
+ virtual ~forces();
// Member Functions
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index 44f7948c80a1bdd00a524b4b7e69a1058a7f5cf7..ea429e91063dd17205b829ade1b10113dbff8050 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -66,8 +66,8 @@ Foam::systemCall::~systemCall()
void Foam::systemCall::read(const dictionary& dict)
{
dict.readIfPresent("executeCalls", executeCalls_);
- dict.readIfPresent("endCalls", endCalls_);
- dict.readIfPresent("writeCalls", writeCalls_);
+ dict.readIfPresent("endCalls", endCalls_);
+ dict.readIfPresent("writeCalls", writeCalls_);
if (executeCalls_.empty() && endCalls_.empty() && writeCalls_.empty())
{
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.H b/src/postProcessing/functionObjects/systemCall/systemCall.H
index 042ee0fc4d8667749314e03cea856dbff25c6016..a5039f66369aace2fc81b820ba6175021723b063 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.H
@@ -101,9 +101,8 @@ public:
);
- // Destructor
-
- virtual ~systemCall();
+ //- Destructor
+ virtual ~systemCall();
// Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
index 3e6b33c0d37ed766bd83480e540cc583d58508e9..87b9d393b052a6f5fa0bcdc41a07e4c4344f7ffe 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
@@ -98,9 +98,8 @@ public:
);
- // Destructor
-
- virtual ~dsmcFields();
+ //- Destructor
+ virtual ~dsmcFields();
// Member Functions
diff --git a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
index 71c4fd3516b5d9947dbe70ac694b12de1f7258f0..8bf734ba14b5feca22a473cc679089738af20c2b 100644
--- a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
+++ b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.H
@@ -106,9 +106,8 @@ public:
);
- // Destructor
-
- virtual ~staticPressure();
+ //- Destructor
+ virtual ~staticPressure();
// Member Functions
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
index e0489208991d047a207359280ded08d5df2ce5ef..36740cbf11005ff1e5658cb29ae2e33417586a3c 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.C
@@ -57,7 +57,7 @@ Foam::faceZonesIntegration::faceZonesIntegration
log_(false),
faceZonesSet_(),
fItems_(),
- faceZonesIntegrationFilePtr_(NULL)
+ filePtr_(NULL)
{
// Check if the available mesh is an fvMesh otherise deactivate
if (!isA<fvMesh>(obr_))
@@ -104,7 +104,7 @@ void Foam::faceZonesIntegration::read(const dictionary& dict)
void Foam::faceZonesIntegration::makeFile()
{
// Create the face Zone file if not already created
- if (faceZonesIntegrationFilePtr_.empty())
+ if (filePtr_.empty())
{
if (debug)
{
@@ -132,7 +132,7 @@ void Foam::faceZonesIntegration::makeFile()
mkDir(faceZonesIntegrationDir);
// Open new file at start up
- faceZonesIntegrationFilePtr_.resize(fItems_.size());
+ filePtr_.resize(fItems_.size());
forAll(fItems_, Ifields)
{
@@ -143,7 +143,7 @@ void Foam::faceZonesIntegration::makeFile()
faceZonesIntegrationDir/fieldName
);
- faceZonesIntegrationFilePtr_.insert(fieldName, sPtr);
+ filePtr_.insert(fieldName, sPtr);
}
// Add headers to output data
@@ -155,11 +155,11 @@ void Foam::faceZonesIntegration::makeFile()
void Foam::faceZonesIntegration::writeFileHeader()
{
- forAllIter(HashPtrTable<OFstream>, faceZonesIntegrationFilePtr_, iter)
+ forAllIter(HashPtrTable<OFstream>, filePtr_, iter)
{
unsigned int w = IOstream::defaultPrecision() + 7;
- OFstream& os = *faceZonesIntegrationFilePtr_[iter.key()];
+ OFstream& os = *filePtr_[iter.key()];
os << "#Time " << setw(w);
@@ -196,10 +196,10 @@ void Foam::faceZonesIntegration::write()
{
const word& fieldName = fItems_[fieldI];
- const surfaceScalarField& fD =
+ const surfaceScalarField& sField =
obr_.lookupObject<surfaceScalarField>(fieldName);
- const fvMesh& mesh = fD.mesh();
+ const fvMesh& mesh = sField.mesh();
// 1. integrate over all face zones
@@ -211,11 +211,11 @@ void Foam::faceZonesIntegration::write()
label zoneID = mesh.faceZones().findZoneID(name);
- const faceZone& fz = mesh.faceZones()[zoneID];
+ const faceZone& fZone = mesh.faceZones()[zoneID];
integralVals[setI] = returnReduce
(
- calcFaceZonesIntegral(fD, fz),
+ calcIntegral(sField, fZone),
sumOp<scalar>()
);
}
@@ -225,13 +225,9 @@ void Foam::faceZonesIntegration::write()
// 2. Write only on master
- if
- (
- Pstream::master()
- && faceZonesIntegrationFilePtr_.found(fieldName)
- )
+ if (Pstream::master() && filePtr_.found(fieldName))
{
- OFstream& os = *faceZonesIntegrationFilePtr_(fieldName);
+ OFstream& os = *filePtr_(fieldName);
os << obr_.time().value();
@@ -242,7 +238,8 @@ void Foam::faceZonesIntegration::write()
if (log_)
{
Info<< "faceZonesIntegration output:" << nl
- << " Integration" << integralVals[setI] << endl;
+ << " Integration[" << setI << "] "
+ << integralVals[setI] << endl;
}
}
@@ -253,45 +250,47 @@ void Foam::faceZonesIntegration::write()
}
-Foam::scalar Foam::faceZonesIntegration::calcFaceZonesIntegral
+Foam::scalar Foam::faceZonesIntegration::calcIntegral
(
- const surfaceScalarField& fD,
- const faceZone& fz
+ const surfaceScalarField& sField,
+ const faceZone& fZone
) const
{
- scalar dm = 0.0;
- const fvMesh& mesh = fD.mesh();
+ scalar sum = 0.0;
+ const fvMesh& mesh = sField.mesh();
- forAll (fz, i)
+ forAll (fZone, i)
{
- label faceI = fz[i];
+ label faceI = fZone[i];
if (mesh.isInternalFace(faceI))
{
- if (fz.flipMap()[i])
+ if (fZone.flipMap()[i])
{
- dm -= fD[faceI];
+ sum -= sField[faceI];
}
else
{
- dm += fD[faceI];
+ sum += sField[faceI];
}
}
else
{
label patchI = mesh.boundaryMesh().whichPatch(faceI);
const polyPatch& pp = mesh.boundaryMesh()[patchI];
+ const fvsPatchScalarField& bField = sField.boundaryField()[patchI];
if (isA<processorPolyPatch>(pp))
{
if (refCast<const processorPolyPatch>(pp).owner())
{
- if (fz.flipMap()[i])
+ label patchFaceI = pp.whichFace(faceI);
+ if (fZone.flipMap()[i])
{
- dm -= fD.boundaryField()[patchI][pp.whichFace(faceI)];
+ sum -= bField[patchFaceI];
}
else
{
- dm += fD.boundaryField()[patchI][pp.whichFace(faceI)];
+ sum += bField[patchFaceI];
}
}
}
@@ -300,32 +299,32 @@ Foam::scalar Foam::faceZonesIntegration::calcFaceZonesIntegral
label patchFaceI = faceI - pp.start();
if (patchFaceI < pp.size()/2)
{
- if (fz.flipMap()[i])
+ if (fZone.flipMap()[i])
{
- dm -= fD.boundaryField()[patchI][patchFaceI];
+ sum -= bField[patchFaceI];
}
else
{
- dm += fD.boundaryField()[patchI][patchFaceI];
+ sum += bField[patchFaceI];
}
}
}
else if (!isA<emptyPolyPatch>(pp))
{
label patchFaceI = faceI - pp.start();
- if (fz.flipMap()[i])
+ if (fZone.flipMap()[i])
{
- dm -= fD.boundaryField()[patchI][patchFaceI];
+ sum -= bField[patchFaceI];
}
else
{
- dm += fD.boundaryField()[patchI][patchFaceI];
+ sum += bField[patchFaceI];
}
}
}
}
- return dm;
+ return sum;
}
diff --git a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
index 87659ac3406dc03dec4864001a88819d708729a6..c2f3ad9d4bf339288bfeea72b6a00767c0f1903e 100644
--- a/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
+++ b/src/postProcessing/functionObjects/zones/faceZoneIntegration/faceZonesIntegration.H
@@ -57,7 +57,7 @@ class dictionary;
class mapPolyMesh;
/*---------------------------------------------------------------------------*\
- Class faceZonesIntegration Declaration
+ Class faceZonesIntegration Declaration
\*---------------------------------------------------------------------------*/
class faceZonesIntegration
@@ -65,17 +65,18 @@ class faceZonesIntegration
protected:
- // Private data
+ // Protected data
//- Name of this set of face zone integration,
- // Also used as the name of the probes directory.
+ // Also used as the name of the output directory.
word name_;
const objectRegistry& obr_;
+
// Read from dictionary
- //- on/off switch
+ //- On/off switch
bool active_;
//- Switch to send output to Info as well as to file
@@ -89,19 +90,19 @@ protected:
//- Current open files
- HashPtrTable<OFstream> faceZonesIntegrationFilePtr_;
+ HashPtrTable<OFstream> filePtr_;
- // Private Member Functions
+ // Protected Member Functions
//- If the integration file has not been created create it
void makeFile();
- scalar calcFaceZonesIntegral
+ scalar calcIntegral
(
- const surfaceScalarField& fD,
- const faceZone& fz
+ const surfaceScalarField& sField,
+ const faceZone& fZone
) const;
@@ -134,9 +135,8 @@ public:
);
- // Destructor
-
- virtual ~faceZonesIntegration();
+ //- Destructor
+ virtual ~faceZonesIntegration();
// Member Functions
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
index 46eeed365ccbaff0e6a1182b93d2d2e7aa5b0014..ad6d28ea23033401ab88e2ddb4c82f7f73e20464 100644
--- a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
@@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Selection function for 'basic' density-based thermodynamics
-
\*---------------------------------------------------------------------------*/
#include "basicRhoThermo.H"
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
index cd7c7ab61653ee0d3863ac5eab9b278f2b106c52..9677a4bfc7952df883dd84b5a528b286eef24b81 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "liquidMixture.H"
diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
index d1b0ac261006c113e0e05ad56b5edb5986ed2ce9..6ceae42bcdbce6a2879ccb58c7a55570820cc511 100644
--- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
+++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
-------------------------------------------------------------------------------
*/
diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
index f3985234601a2e733a45cacba016299ffd5b0efd..1b327b07c4c4d6e81e9a0a7c82619fbcceb64298 100644
--- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
+++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "iC3H8O.H"
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
index ab79adedd75f996a151230b03738c4a65383b608..455d03263415760adcd7d79289f80ef960c7db25 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C
@@ -22,9 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Perfect gas equation of state.
-
\*---------------------------------------------------------------------------*/
#include "perfectGas.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
index 58e28a2bc18201f4cc61bd199fd32827017b4e30..7c896accb976392df7d3fcbb92b1b2b277ca2570 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "IrreversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
index fc639515bb3c0e0390be68f504cafe4c2ca7f9bd..6cc28a7c70189f5904f2a025eaeee5488c2eac82 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "NonEquilibriumReversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index ad5c2e1185ae63f0ad65758cb8aed50f6211b728..30124a58194f0a79eeafa8e54f544af4611cd226 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -22,10 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Simple extension of ReactionThermo to handle Reaction kinetics in addition
- to the equilibrium thermodynamics already handled.
-
\*---------------------------------------------------------------------------*/
#include "Reaction.H"
@@ -207,7 +203,7 @@ Reaction<ReactionThermo>::Reaction
setLRhs(is);
setThermo(thermoDatabase);
}
-
+
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
index 9bdfae43886a55598cebfc6426a68c64b3302fc9..a11368caaf0f5d4cc6580a0a3a90fe9b1a449aaf 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "ReversibleReaction.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
index 3756f2e3657a0b1a5dce610248a9250fcb1d02a5..2a67e3143d7a1aedcc920d11817e69c573fc08c3 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "reactionTypes.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
index 1789fe80fc4d513d6c0b3b7de485ba7f1fd2daf3..637581bb1f9115b9e39f4d0e318f39545b53af50 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeLangmuirHinshelwoodReactions.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "makeReactionThermo.H"
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
index 1a054b11249f50609912d1fd90f49f7a01376f4f..bc9fc47732dee1259ee8749f50acd9e828543e10 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "reactionTypes.H"
diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.C b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
index acb4f0a72c51c02a0c7d987b3eb5e9a41c33b55c..b2cb515e37d11b2391844d9242014aea52158ef3 100644
--- a/src/thermophysicalModels/specie/speciesTable/speciesTable.C
+++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "speciesTable.H"
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index cebe3765b6659db24503cf109ea18c9fd417f280..8735480807af7cd696014c09dc6a80543e3fedbe 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -22,10 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Constant properties Transport package. Templated ito a given
- thermodynamics package (needed for thermal conductivity).
-
\*---------------------------------------------------------------------------*/
#include "constTransport.H"
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
index df5fb2754b17b0e55c0ad69428584a9ac7489c29..d4afb4df2e58e9b0e31ea0773398d45f96a78165 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C
@@ -22,14 +22,9 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
- Basic species Transport type based on the use of a fitting
function for nu. All other properties are derived from
this primitive function.
- The nu function must be provided by the derived type,
- e.g. SutherlandTransport.
-
\*---------------------------------------------------------------------------*/
#include "speciesTransport.H"
diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
index 885e4bb2fd97351c1014f2b662ffea9513ed7f42..44d6f34b437ff55549ae81479b213bf6197ecdb8 100644
--- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
+++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.H
@@ -38,7 +38,6 @@ SourceFiles
speciesTransportI.H
speciesTransport.C
-
\*---------------------------------------------------------------------------*/
#ifndef speciesTransport_H
diff --git a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
index f936042653e58515a78b62d950fd53c938e67f1a..9bae498a498854b9ecfb8d296740b3012c3c3641 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include "NSRDSfunc4.H"
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index b54c9d1b62887b0032c64ebd35d5bfda131260f8..28b8c89101acfb9188e6a29a0075e4e2004888d0 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -147,7 +147,7 @@ public:
// I-O
//- Write
- void write(Ostream&) const;
+ virtual void write(Ostream&) const;
};
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index 7d1954f982c596483cf97314c49baabf79264766..4db7a49d65569b67ad3fc0e192bccae12dd38027 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -147,7 +147,7 @@ public:
// I-O
//- Write
- void write(Ostream&) const;
+ virtual void write(Ostream&) const;
};
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
index e7405e9146257ecaa34dbb634401d3e21501c627..ef9f2747f114c74d98cf1e059bff811123783500 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -147,7 +147,7 @@ public:
// I-O
//- Write
- void write(Ostream&) const;
+ virtual void write(Ostream&) const;
};