Changes in src/tesselation.cpp [36166d:bdc91e]

File:

• src/tesselation.cpp (modified) (6 diffs)

src/tesselation.cpp

@@ -9 +9 @@
 
 #include <fstream>
-#include <iomanip>
 
 #include "helpers.hpp"
@@ -1649 +1648 @@
   bool AddFlag = false;
   LinkedCell *BoundaryPoints = NULL;
+  bool SuccessFlag = true;
 
   cloud->GoToFirst();
@@ -1662 +1662 @@
     // get the next triangle
     triangles = FindClosestTrianglesToVector(Walker->node, BoundaryPoints);
-    BTS = triangles->front();
-    if ((triangles == NULL) || (BTS->ContainsBoundaryPoint(Walker))) {
+    if (triangles != NULL)
+      BTS = triangles->front();
+    else
+      BTS = NULL;
+    delete triangles;
+    if ((BTS == NULL) || (BTS->ContainsBoundaryPoint(Walker))) {
       DoLog(0) && (Log() << Verbose(0) << "No triangles found, probably a tesselation point itself." << endl);
       cloud->GoToNext();
@@ -1733 +1737 @@
     } else { // something is wrong with FindClosestTriangleToPoint!
       DoeLog(1) && (eLog() << Verbose(1) << "The closest triangle did not produce an intersection!" << endl);
-      return false;
+      SuccessFlag = false;
+      break;
     }
     cloud->GoToNext();
@@ -1740 +1745 @@
   // exit
   delete (Center);
-  return true;
+  delete (BoundaryPoints);
+  return SuccessFlag;
 }
 ;
@@ -2243 +2249 @@
   for (int i = 0; i < NDIM; i++) { // each axis
     LC->n[i] = LC->N[i] - 1; // current axis is topmost cell
-    for (LC->n[(i + 1) % NDIM] = 0; LC->n[(i + 1) % NDIM] < LC->N[(i + 1) % NDIM]; LC->n[(i + 1) % NDIM]++)
-      for (LC->n[(i + 2) % NDIM] = 0; LC->n[(i + 2) % NDIM] < LC->N[(i + 2) % NDIM]; LC->n[(i + 2) % NDIM]++) {
+    const int map[NDIM] = {i, (i + 1) % NDIM, (i + 2) % NDIM};
+    for (LC->n[map[1]] = 0; LC->n[map[1]] < LC->N[map[1]]; LC->n[map[1]]++)
+      for (LC->n[map[2]] = 0; LC->n[map[2]] < LC->N[map[2]]; LC->n[map[2]]++) {
         const LinkedCell::LinkedNodes *List = LC->GetCurrentCell();
         //Log() << Verbose(1) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
         if (List != NULL) {
           for (LinkedCell::LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
-            if ((*Runner)->node->at(i) > maxCoordinate[i]) {
-              DoLog(1) && (Log() << Verbose(1) << "New maximal for axis " << i << " node is " << *(*Runner) << " at " << *(*Runner)->node << "." << endl);
-              maxCoordinate[i] = (*Runner)->node->at(i);
-              MaxPoint[i] = (*Runner);
+            if ((*Runner)->node->at(map[0]) > maxCoordinate[map[0]]) {
+              DoLog(1) && (Log() << Verbose(1) << "New maximal for axis " << map[0] << " node is " << *(*Runner) << " at " << *(*Runner)->node << "." << endl);
+              maxCoordinate[map[0]] = (*Runner)->node->at(map[0]);
+              MaxPoint[map[0]] = (*Runner);
             }
           }