Commit a4ab3f61 authored by Henry Weller's avatar Henry Weller
Browse files

src/OpenFOAM: Update ...ErrorIn -> ...ErrorInFunction

Avoids the clutter and maintenance effort associated with providing the
function signature string.
parent 4b0c0a52
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -208,7 +208,7 @@ Foam::dynamicIndexedOctree<Type>::divide ...@@ -208,7 +208,7 @@ Foam::dynamicIndexedOctree<Type>::divide
|| bb.min()[2] >= bb.max()[2] || bb.min()[2] >= bb.max()[2]
) )
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::divide(..)") FatalErrorInFunction
<< "Badly formed bounding box:" << bb << "Badly formed bounding box:" << bb
<< abort(FatalError); << abort(FatalError);
} }
...@@ -436,11 +436,8 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType ...@@ -436,11 +436,8 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
{ {
// Empty node. Cannot have 'mixed' as its type since not divided // Empty node. Cannot have 'mixed' as its type since not divided
// up and has no items inside it. // up and has no items inside it.
FatalErrorIn FatalErrorInFunction
( << "Sample:" << sample << " node:" << nodeI
"dynamicIndexedOctree<Type>::getVolumeType"
"(const label, const point&)"
) << "Sample:" << sample << " node:" << nodeI
<< " with bb:" << nodes_[nodeI].bb_ << nl << " with bb:" << nodes_[nodeI].bb_ << nl
<< "Empty subnode has invalid volume type MIXED." << "Empty subnode has invalid volume type MIXED."
<< abort(FatalError); << abort(FatalError);
...@@ -450,11 +447,8 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType ...@@ -450,11 +447,8 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
} }
else else
{ {
FatalErrorIn FatalErrorInFunction
( << "Sample:" << sample << " at node:" << nodeI
"dynamicIndexedOctree<Type>::getVolumeType"
"(const label, const point&)"
) << "Sample:" << sample << " at node:" << nodeI
<< " octant:" << octant << " octant:" << octant
<< " with bb:" << nod.bb_.subBbox(octant) << nl << " with bb:" << nod.bb_.subBbox(octant) << nl
<< "Node has invalid volume type " << octantType << "Node has invalid volume type " << octantType
...@@ -708,7 +702,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint ...@@ -708,7 +702,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
{ {
if (pushInside != bb.contains(perturbedPt)) if (pushInside != bb.contains(perturbedPt))
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::pushPoint(..)") FatalErrorInFunction
<< "pushed point:" << pt << "pushed point:" << pt
<< " to:" << perturbedPt << " to:" << perturbedPt
<< " wanted side:" << pushInside << " wanted side:" << pushInside
...@@ -743,7 +737,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint ...@@ -743,7 +737,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
if (faceID == 0) if (faceID == 0)
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::pushPoint(..)") FatalErrorInFunction
<< abort(FatalError); << abort(FatalError);
} }
...@@ -820,7 +814,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint ...@@ -820,7 +814,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
{ {
if (pushInside != bb.contains(perturbedPt)) if (pushInside != bb.contains(perturbedPt))
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::pushPoint(..)") FatalErrorInFunction
<< "pushed point:" << pt << " on face:" << faceString(faceID) << "pushed point:" << pt << " on face:" << faceString(faceID)
<< " to:" << perturbedPt << " to:" << perturbedPt
<< " wanted side:" << pushInside << " wanted side:" << pushInside
...@@ -849,7 +843,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace ...@@ -849,7 +843,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
{ {
if (bb.posBits(pt) != 0) if (bb.posBits(pt) != 0)
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::pushPointIntoFace(..)") FatalErrorInFunction
<< " bb:" << bb << endl << " bb:" << bb << endl
<< "does not contain point " << pt << abort(FatalError); << "does not contain point " << pt << abort(FatalError);
} }
...@@ -971,7 +965,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace ...@@ -971,7 +965,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
{ {
if (faceID != bb.faceBits(facePoint)) if (faceID != bb.faceBits(facePoint))
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::pushPointIntoFace(..)") FatalErrorInFunction
<< "Pushed point from " << pt << "Pushed point from " << pt
<< " on face:" << ptFaceID << " of bb:" << bb << endl << " on face:" << ptFaceID << " of bb:" << bb << endl
<< "onto " << facePoint << "onto " << facePoint
...@@ -982,7 +976,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace ...@@ -982,7 +976,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
} }
if (bb.posBits(facePoint) != 0) if (bb.posBits(facePoint) != 0)
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::pushPointIntoFace(..)") FatalErrorInFunction
<< " bb:" << bb << endl << " bb:" << bb << endl
<< "does not contain perturbed point " << "does not contain perturbed point "
<< facePoint << abort(FatalError); << facePoint << abort(FatalError);
...@@ -1086,7 +1080,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace ...@@ -1086,7 +1080,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
// //
// if (nFaces == 0 || nFaces == 1 || nFaces > 3) // if (nFaces == 0 || nFaces == 1 || nFaces > 3)
// { // {
// FatalErrorIn("dynamicIndexedOctree<Type>::checkMultipleFaces(..)") // FatalErrorInFunction
// << "Problem : nFaces:" << nFaces << abort(FatalError); // << "Problem : nFaces:" << nFaces << abort(FatalError);
// } // }
// //
...@@ -1119,7 +1113,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace ...@@ -1119,7 +1113,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
// //
// if (maxIndex == -1) // if (maxIndex == -1)
// { // {
// FatalErrorIn("dynamicIndexedOctree<Type>::checkMultipleFaces(..)") // FatalErrorInFunction
// << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts // << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts
// << abort(FatalError); // << abort(FatalError);
// } // }
...@@ -1179,7 +1173,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace ...@@ -1179,7 +1173,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
// { // {
// if (faceID != bb.faceBits(faceHitInfo.rawPoint())) // if (faceID != bb.faceBits(faceHitInfo.rawPoint()))
// { // {
// FatalErrorIn("dynamicIndexedOctree<Type>::checkMultipleFaces(..)") // FatalErrorInFunction
// << "Pushed point from " << oldPoint // << "Pushed point from " << oldPoint
// << " on face:" << oldFaceID << " of bb:" << bb << endl // << " on face:" << oldFaceID << " of bb:" << bb << endl
// << "onto " << faceHitInfo.rawPoint() // << "onto " << faceHitInfo.rawPoint()
...@@ -1229,7 +1223,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToParent ...@@ -1229,7 +1223,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToParent
if (parentOctant == 255) if (parentOctant == 255)
{ {
FatalErrorIn("walkToParent(..)") FatalErrorInFunction
<< "Problem: no parent found for octant:" << octant << "Problem: no parent found for octant:" << octant
<< " node:" << nodeI << " node:" << nodeI
<< abort(FatalError); << abort(FatalError);
...@@ -1426,7 +1420,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour ...@@ -1426,7 +1420,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
if (!subBb.contains(facePoint)) if (!subBb.contains(facePoint))
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::walkToNeighbour(..)") FatalErrorInFunction
<< "When searching for " << facePoint << "When searching for " << facePoint
<< " ended up in node:" << nodeI << " ended up in node:" << nodeI
<< " octant:" << octant << " octant:" << octant
...@@ -1455,7 +1449,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour ...@@ -1455,7 +1449,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
if (nodeI == oldNodeI && octant == oldOctant) if (nodeI == oldNodeI && octant == oldOctant)
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::walkToNeighbour(..)") FatalErrorInFunction
<< "Did not go to neighbour when searching for " << facePoint << "Did not go to neighbour when searching for " << facePoint
<< endl << endl
<< " starting from face:" << faceString(faceID) << " starting from face:" << faceString(faceID)
...@@ -1467,7 +1461,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour ...@@ -1467,7 +1461,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
if (!subBb.contains(facePoint)) if (!subBb.contains(facePoint))
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::walkToNeighbour(..)") FatalErrorInFunction
<< "When searching for " << facePoint << "When searching for " << facePoint
<< " ended up in node:" << nodeI << " ended up in node:" << nodeI
<< " octant:" << octant << " octant:" << octant
...@@ -1555,7 +1549,7 @@ void Foam::dynamicIndexedOctree<Type>::traverseNode ...@@ -1555,7 +1549,7 @@ void Foam::dynamicIndexedOctree<Type>::traverseNode
if (octantBb.posBits(start) != 0) if (octantBb.posBits(start) != 0)
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::traverseNode(..)") FatalErrorInFunction
<< "Node:" << nodeI << " octant:" << octant << "Node:" << nodeI << " octant:" << octant
<< " bb:" << octantBb << endl << " bb:" << octantBb << endl
<< "does not contain point " << start << abort(FatalError); << "does not contain point " << start << abort(FatalError);
...@@ -1863,7 +1857,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine ...@@ -1863,7 +1857,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
} }
if (debug) if (debug)
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::findLine(..)") FatalErrorInFunction
<< "Got stuck in loop raytracing from:" << treeStart << "Got stuck in loop raytracing from:" << treeStart
<< " to:" << treeEnd << endl << " to:" << treeEnd << endl
<< "inside top box:" << subBbox(startNodeI, startOctant) << "inside top box:" << subBbox(startNodeI, startOctant)
...@@ -1871,7 +1865,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine ...@@ -1871,7 +1865,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
} }
else else
{ {
WarningIn("dynamicIndexedOctree<Type>::findLine(..)") WarningInFunction
<< "Got stuck in loop raytracing from:" << treeStart << "Got stuck in loop raytracing from:" << treeStart
<< " to:" << treeEnd << endl << " to:" << treeEnd << endl
<< "inside top box:" << subBbox(startNodeI, startOctant) << "inside top box:" << subBbox(startNodeI, startOctant)
...@@ -2493,7 +2487,7 @@ Foam::labelBits Foam::dynamicIndexedOctree<Type>::findNode ...@@ -2493,7 +2487,7 @@ Foam::labelBits Foam::dynamicIndexedOctree<Type>::findNode
{ {
if (!nod.bb_.contains(sample)) if (!nod.bb_.contains(sample))
{ {
FatalErrorIn("findNode(..)") FatalErrorInFunction
<< "Cannot find " << sample << " in node " << nodeI << "Cannot find " << sample << " in node " << nodeI
<< abort(FatalError); << abort(FatalError);
} }
...@@ -2627,7 +2621,7 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType ...@@ -2627,7 +2621,7 @@ Foam::volumeType Foam::dynamicIndexedOctree<Type>::getVolumeType
} }
else else
{ {
FatalErrorIn("getVolumeType") << abort(FatalError); FatalErrorInFunction << abort(FatalError);
} }
} }
......
...@@ -472,7 +472,7 @@ public: ...@@ -472,7 +472,7 @@ public:
{ {
if (nodes_.empty()) if (nodes_.empty())
{ {
FatalErrorIn("dynamicIndexedOctree<Type>::bb() const") FatalErrorInFunction
<< "Tree is empty" << abort(FatalError); << "Tree is empty" << abort(FatalError);
} }
return nodes_[0].bb_; return nodes_[0].bb_;
...@@ -500,7 +500,7 @@ public: ...@@ -500,7 +500,7 @@ public:
{ {
if (!isContent(i)) if (!isContent(i))
{ {
FatalErrorIn("getContent(const label)") FatalErrorInFunction
<< abort(FatalError); << abort(FatalError);
} }
return -i.val()-1; return -i.val()-1;
...@@ -510,7 +510,7 @@ public: ...@@ -510,7 +510,7 @@ public:
{ {
if (!isNode(i)) if (!isNode(i))
{ {
FatalErrorIn("getNode(const label)") FatalErrorInFunction
<< abort(FatalError); << abort(FatalError);
} }
return i.val() - 1; return i.val() - 1;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
...@@ -182,7 +182,7 @@ Foam::indexedOctree<Type>::divide ...@@ -182,7 +182,7 @@ Foam::indexedOctree<Type>::divide
|| bb.min()[2] >= bb.max()[2] || bb.min()[2] >= bb.max()[2]
) )
{ {
FatalErrorIn("indexedOctree<Type>::divide(..)") FatalErrorInFunction
<< "Badly formed bounding box:" << bb << "Badly formed bounding box:" << bb
<< abort(FatalError); << abort(FatalError);
} }
...@@ -456,11 +456,8 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType ...@@ -456,11 +456,8 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
{ {
// Empty node. Cannot have 'mixed' as its type since not divided // Empty node. Cannot have 'mixed' as its type since not divided
// up and has no items inside it. // up and has no items inside it.
FatalErrorIn FatalErrorInFunction
( << "Sample:" << sample << " node:" << nodeI
"indexedOctree<Type>::getVolumeType"
"(const label, const point&)"
) << "Sample:" << sample << " node:" << nodeI
<< " with bb:" << nodes_[nodeI].bb_ << nl << " with bb:" << nodes_[nodeI].bb_ << nl
<< "Empty subnode has invalid volume type MIXED." << "Empty subnode has invalid volume type MIXED."
<< abort(FatalError); << abort(FatalError);
...@@ -470,11 +467,8 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType ...@@ -470,11 +467,8 @@ Foam::volumeType Foam::indexedOctree<Type>::getVolumeType
} }
else else
{ {
FatalErrorIn FatalErrorInFunction
( << "Sample:" << sample << " at node:" << nodeI
"indexedOctree<Type>::getVolumeType"
"(const label, const point&)"
) << "Sample:" << sample << " at node:" << nodeI
<< " octant:" << octant << " octant:" << octant
<< " with bb:" << nod.bb_.subBbox(octant) << nl << " with bb:" << nod.bb_.subBbox(octant) << nl
<< "Node has invalid volume type " << octantType << "Node has invalid volume type " << octantType
...@@ -739,7 +733,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint ...@@ -739,7 +733,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
{ {
if (pushInside != bb.contains(perturbedPt)) if (pushInside != bb.contains(perturbedPt))
{ {
FatalErrorIn("indexedOctree<Type>::pushPoint(..)") FatalErrorInFunction
<< "pushed point:" << pt << "pushed point:" << pt
<< " to:" << perturbedPt << " to:" << perturbedPt
<< " wanted side:" << pushInside << " wanted side:" << pushInside
...@@ -774,7 +768,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint ...@@ -774,7 +768,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
if (faceID == 0) if (faceID == 0)
{ {
FatalErrorIn("indexedOctree<Type>::pushPoint(..)") FatalErrorInFunction
<< abort(FatalError); << abort(FatalError);
} }
...@@ -851,7 +845,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint ...@@ -851,7 +845,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
{ {
if (pushInside != bb.contains(perturbedPt)) if (pushInside != bb.contains(perturbedPt))
{ {
FatalErrorIn("indexedOctree<Type>::pushPoint(..)") FatalErrorInFunction
<< "pushed point:" << pt << " on face:" << faceString(faceID) << "pushed point:" << pt << " on face:" << faceString(faceID)
<< " to:" << perturbedPt << " to:" << perturbedPt
<< " wanted side:" << pushInside << " wanted side:" << pushInside
...@@ -880,7 +874,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace ...@@ -880,7 +874,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
{ {
if (bb.posBits(pt) != 0) if (bb.posBits(pt) != 0)
{ {
FatalErrorIn("indexedOctree<Type>::pushPointIntoFace(..)") FatalErrorInFunction
<< " bb:" << bb << endl << " bb:" << bb << endl
<< "does not contain point " << pt << abort(FatalError); << "does not contain point " << pt << abort(FatalError);
} }
...@@ -1002,7 +996,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace ...@@ -1002,7 +996,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
{ {
if (faceID != bb.faceBits(facePoint)) if (faceID != bb.faceBits(facePoint))
{ {
FatalErrorIn("indexedOctree<Type>::pushPointIntoFace(..)") FatalErrorInFunction
<< "Pushed point from " << pt << "Pushed point from " << pt
<< " on face:" << ptFaceID << " of bb:" << bb << endl << " on face:" << ptFaceID << " of bb:" << bb << endl
<< "onto " << facePoint << "onto " << facePoint
...@@ -1013,7 +1007,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace ...@@ -1013,7 +1007,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
} }
if (bb.posBits(facePoint) != 0) if (bb.posBits(facePoint) != 0)
{ {
FatalErrorIn("indexedOctree<Type>::pushPointIntoFace(..)") FatalErrorInFunction
<< " bb:" << bb << endl << " bb:" << bb << endl
<< "does not contain perturbed point " << "does not contain perturbed point "
<< facePoint << abort(FatalError); << facePoint << abort(FatalError);
...@@ -1117,7 +1111,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace ...@@ -1117,7 +1111,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
// //
// if (nFaces == 0 || nFaces == 1 || nFaces > 3) // if (nFaces == 0 || nFaces == 1 || nFaces > 3)
// { // {
// FatalErrorIn("indexedOctree<Type>::checkMultipleFaces(..)") // FatalErrorInFunction
// << "Problem : nFaces:" << nFaces << abort(FatalError); // << "Problem : nFaces:" << nFaces << abort(FatalError);
// } // }
// //
...@@ -1150,7 +1144,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace ...@@ -1150,7 +1144,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
// //
// if (maxIndex == -1) // if (maxIndex == -1)
// { // {
// FatalErrorIn("indexedOctree<Type>::checkMultipleFaces(..)") // FatalErrorInFunction
// << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts // << "Problem maxIndex:" << maxIndex << " inproducts:" << inproducts
// << abort(FatalError); // << abort(FatalError);
// } // }
...@@ -1210,7 +1204,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace ...@@ -1210,7 +1204,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
// { // {
// if (faceID != bb.faceBits(faceHitInfo.rawPoint())) // if (faceID != bb.faceBits(faceHitInfo.rawPoint()))
// { // {
// FatalErrorIn("indexedOctree<Type>::checkMultipleFaces(..)") // FatalErrorInFunction
// << "Pushed point from " << oldPoint // << "Pushed point from " << oldPoint
// << " on face:" << oldFaceID << " of bb:" << bb << endl // << " on face:" << oldFaceID << " of bb:" << bb << endl
// << "onto " << faceHitInfo.rawPoint() // << "onto " << faceHitInfo.rawPoint()
...@@ -1260,7 +1254,7 @@ bool Foam::indexedOctree<Type>::walkToParent ...@@ -1260,7 +1254,7 @@ bool Foam::indexedOctree<Type>::walkToParent
if (parentOctant == 255) if (parentOctant == 255)
{ {
FatalErrorIn("walkToParent(..)") FatalErrorInFunction
<< "Problem: no parent found for octant:" << octant << "Problem: no parent found for octant:" << octant
<< " node:" << nodeI << " node:" << nodeI
<< abort(FatalError); << abort(FatalError);
...@@ -1457,7 +1451,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour ...@@ -1457,7 +1451,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
if (!subBb.contains(facePoint)) if (!subBb.contains(facePoint))
{ {
FatalErrorIn("indexedOctree<Type>::walkToNeighbour(..)") FatalErrorInFunction
<< "When searching for " << facePoint << "When searching for " << facePoint
<< " ended up in node:" << nodeI << " ended up in node:" << nodeI
<< " octant:" << octant << " octant:" << octant
...@@ -1486,7 +1480,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour ...@@ -1486,7 +1480,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
if (nodeI == oldNodeI && octant == oldOctant) if (nodeI == oldNodeI && octant == oldOctant)
{ {
FatalErrorIn("indexedOctree<Type>::walkToNeighbour(..)") FatalErrorInFunction
<< "Did not go to neighbour when searching for " << facePoint << "Did not go to neighbour when searching for " << facePoint
<< endl << endl
<< " starting from face:" << faceString(faceID) << " starting from face:" << faceString(faceID)
...@@ -1498,7 +1492,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour ...@@ -1498,7 +1492,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
if (!subBb.contains(facePoint)) if (!subBb.contains(facePoint))
{ {
FatalErrorIn("indexedOctree<Type>::walkToNeighbour(..)") FatalErrorInFunction
<< "When searching for " << facePoint << "When searching for " << facePoint
<< " ended up in node:" << nodeI << " ended up in node:" << nodeI
<< " octant:" << octant << " octant:" << octant
...@@ -1589,7 +1583,7 @@ void Foam::indexedOctree<Type>::traverseNode ...@@ -1589,7 +1583,7 @@ void Foam::indexedOctree<Type>::traverseNode
if (octantBb.posBits(start) != 0) if (octantBb.posBits(start) != 0)
{ {
FatalErrorIn("indexedOctree<Type>::traverseNode(..)") FatalErrorInFunction
<< "Node:" << nodeI << " octant:" << octant << "Node:" << nodeI << " octant:" << octant
<< " bb:" << octantBb << endl << " bb:" << octantBb << endl
<< "does not contain point " << start << abort(FatalError); << "does not contain point " << start << abort(FatalError);
...@@ -1897,7 +1891,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine ...@@ -1897,7 +1891,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
} }
if (debug) if (debug)
{