Changes in / [0b2dd2:482373]

Files:

• src/Makefile.am (modified) (2 diffs)
• src/atom_bondedparticle.cpp (modified) (2 diffs)
• src/bondgraph.cpp (modified) (1 diff)
• src/boundary.cpp (modified) (43 diffs)
• src/boundary.hpp (modified) (2 diffs)
• src/builder.cpp (modified) (7 diffs)
• src/config.cpp (modified) (3 diffs)
• src/errorlogger.cpp (modified) (2 diffs)
• src/info.cpp (deleted)
• src/info.hpp (deleted)
• src/molecule.hpp (modified) (1 diff)
• src/molecule_pointcloud.cpp (modified) (1 diff)
• src/moleculelist.cpp (modified) (2 diffs)
• src/parser.cpp (modified) (1 diff)
• src/tesselation.cpp (modified) (206 diffs)
• src/tesselation.hpp (modified) (13 diffs)
• src/tesselationhelpers.cpp (modified) (42 diffs)
• src/tesselationhelpers.hpp (modified) (1 diff)
• src/unittests/Makefile.am (modified) (2 diffs)
• src/unittests/infounittest.cpp (deleted)
• src/unittests/infounittest.hpp (deleted)
• src/vector.cpp (modified) (1 diff)
• src/vector.hpp (modified) (1 diff)
• src/verbose.cpp (modified) (3 diffs)
• tests/Tesselations/1_2-dimethoxyethane/NonConvexEnvelope-1_2-dimethoxyethane.dat (modified) (1 diff)
• tests/Tesselations/1_2-dimethylbenzene/NonConvexEnvelope-1_2-dimethylbenzene.dat (modified) (1 diff)
• tests/Tesselations/2-methylcyclohexanone/NonConvexEnvelope-2-methylcyclohexanone.dat (modified) (1 diff)
• tests/Tesselations/C16_0-Torus/NonConvexEnvelope-C16_0-Torus.dat (modified) (1 diff)
• tests/Tesselations/Makefile.am (modified) (1 diff)
• tests/Tesselations/N_N-dimethylacetamide/NonConvexEnvelope-N_N-dimethylacetamide.dat (modified) (1 diff)
• tests/Tesselations/benzene.test (deleted)
• tests/Tesselations/benzene/NonConvexEnvelope-benzene.dat (deleted)
• tests/Tesselations/benzene/benzene.xyz (deleted)
• tests/Tesselations/cholesterol/NonConvexEnvelope-cholesterol.dat (modified) (1 diff)
• tests/Tesselations/cluster/NonConvexEnvelope-cluster.dat (modified) (1 diff)
• tests/Tesselations/cycloheptane/NonConvexEnvelope-cycloheptane.dat (modified) (1 diff)
• tests/Tesselations/defs.in (deleted)
• tests/Tesselations/dimethyl_bromomalonate/NonConvexEnvelope-dimethyl_bromomalonate.dat (modified) (1 diff)
• tests/Tesselations/glucose/NonConvexEnvelope-glucose.dat (modified) (1 diff)
• tests/Tesselations/heptan/NonConvexEnvelope-heptan.dat (modified) (1 diff)
• tests/Tesselations/isoleucine/NonConvexEnvelope-isoleucine.dat (modified) (1 diff)
• tests/Tesselations/neohexane/NonConvexEnvelope-neohexane.dat (modified) (1 diff)
• tests/Tesselations/proline/NonConvexEnvelope-proline.dat (modified) (1 diff)
• tests/Tesselations/putrescine/NonConvexEnvelope-putrescine.dat (modified) (1 diff)
• tests/Tesselations/round_cluster/NonConvexEnvelope-round_cluster.dat (modified) (1 diff)
• tests/Tesselations/tartaric_acid/NonConvexEnvelope-tartaric_acid.dat (modified) (1 diff)

src/Makefile.am

@@ -5 +5 @@
 ANALYSISHEADER = analysis_bonds.hpp analysis_correlation.hpp
 
-SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp info.cpp leastsquaremin.cpp linkedcell.cpp log.cpp logger.cpp memoryusageobserver.cpp moleculelist.cpp molecule.cpp molecule_dynamics.cpp molecule_fragmentation.cpp molecule_geometry.cpp molecule_graph.cpp molecule_pointcloud.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
-HEADER = ${ANALYSISHEADER} ${ATOMHEADER} bond.hpp bondgraph.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp errorlogger.hpp graph.hpp helpers.hpp info.hpp leastsquaremin.hpp linkedcell.hpp lists.hpp log.hpp logger.hpp memoryallocator.hpp memoryusageobserver.hpp molecule.hpp molecule_template.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
+SOURCE = ${ANALYSISSOURCE} ${ATOMSOURCE} bond.cpp bondgraph.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp errorlogger.cpp graph.cpp helpers.cpp leastsquaremin.cpp linkedcell.cpp log.cpp logger.cpp memoryusageobserver.cpp moleculelist.cpp molecule.cpp molecule_dynamics.cpp molecule_fragmentation.cpp molecule_geometry.cpp molecule_graph.cpp molecule_pointcloud.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
+HEADER = ${ANALYSISHEADER} ${ATOMHEADER} bond.hpp bondgraph.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp errorlogger.hpp graph.hpp helpers.hpp leastsquaremin.hpp linkedcell.hpp lists.hpp log.hpp logger.hpp memoryallocator.hpp memoryusageobserver.hpp molecule.hpp molecule_template.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
 
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB)
@@ -25 +25 @@
 
 #EXTRA_DIST = ${molecuilder_DATA}
-
-FORCE:
-$(srcdir)/.git-version: FORCE
-        @if (test -d $(top_srcdir)/../.git && cd $(srcdir) && git describe HEAD) > .git-version-t 2>/dev/null \
-          && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
-          mv -f .git-version-t $(srcdir)/.git-version; \
-        else \
-          rm -f .git-version-t; \
-        fi
-
-EXTRA_DIST = $(srcdir)/.git-version
-
-$(srcdir)/version.c: $(srcdir)/.git-version
-        echo "const char *ESPACKVersion = \"$(PACKAGE_NAME) -- git version: "`cat $(srcdir)/.git-version`"\";" > $@
-
-molecuilder_SOURCES += $(srcdir)/version.c

src/atom_bondedparticle.cpp

@@ -121 +121 @@
   bond *CandidateBond = NULL;
 
+  //Log() << Verbose(3) << "Walker " << *this << ": " << (int)this->type->NoValenceOrbitals << " > " << NoBonds << "?" << endl;
   NoBonds = CountBonds();
-  //Log() << Verbose(3) << "Walker " << *this << ": " << (int)this->type->NoValenceOrbitals << " > " << NoBonds << "?" << endl;
   if ((int)(type->NoValenceOrbitals) > NoBonds) { // we have a mismatch, check all bonding partners for mismatch
     for (BondList::const_iterator Runner = ListOfBonds.begin(); Runner != ListOfBonds.end(); (++Runner)) {
       OtherWalker = (*Runner)->GetOtherAtom(this);
       OtherNoBonds = OtherWalker->CountBonds();
-      //Log() << Verbose(3) << "OtherWalker " << *OtherWalker << ": " << (int)OtherWalker->type->NoValenceOrbitals << " > " << OtherNoBonds << "?" << endl;
-      if ((int)(OtherWalker->type->NoValenceOrbitals) > OtherNoBonds) { // check if possible candidate
+      //Log() << Verbose(3) << "OtherWalker " << *OtherWalker << ": " << (int)OtherWalker->type->NoValenceOrbitals << " > " << NoBonds << "?" << endl;
+      if ((int)(OtherWalker->type->NoValenceOrbitals) > NoBonds) { // check if possible candidate
         if ((CandidateBond == NULL) || (ListOfBonds.size() > OtherWalker->ListOfBonds.size())) { // pick the one with fewer number of bonds first
           CandidateBond = (*Runner);
@@ -137 +137 @@
     if ((CandidateBond != NULL)) {
       CandidateBond->BondDegree++;
-      //Log() << Verbose(2) << "Increased bond degree for bond " << *CandidateBond << "." << endl;
+      Log() << Verbose(2) << "Increased bond degree for bond " << *CandidateBond << "." << endl;
     } else {
-      eLog() << Verbose(2) << "Could not find correct degree for atom " << *this << "." << endl;
+      //Log() << Verbose(2) << "Could not find correct degree for atom " << *this << "." << endl;
       FalseBondDegree++;
     }

src/bondgraph.cpp

@@ -35 +35 @@
 /** Parses the bond lengths in a given file and puts them int a matrix form.
  * Allocates \a MatrixContainer for BondGraph::BondLengthMatrix, using MatrixContainer::ParseMatrix(),
- * but only if parsing is successful. Otherwise variable is left as NULL.
+ * but only if parsing is successfull. Otherwise variable is left as NULL.
  * \param *out output stream for debugging
  * \param filename file with bond lengths to parse

src/boundary.cpp

@@ -10 +10 @@
 #include "element.hpp"
 #include "helpers.hpp"
-#include "info.hpp"
 #include "linkedcell.hpp"
 #include "log.hpp"
@@ -34 +33 @@
 double *GetDiametersOfCluster(const Boundaries *BoundaryPtr, const molecule *mol, Tesselation *&TesselStruct, const bool IsAngstroem)
 {
-        Info FunctionInfo(__func__);
   // get points on boundary of NULL was given as parameter
   bool BoundaryFreeFlag = false;
@@ -55 +53 @@
   } else {
     BoundaryPoints = BoundaryPtr;
-    Log() << Verbose(0) << "Using given boundary points set." << endl;
+    Log() << Verbose(1) << "Using given boundary points set." << endl;
   }
   // determine biggest "diameter" of cluster for each axis
@@ -69 +67 @@
           //Log() << Verbose(1) << "Current component is " << component << ", Othercomponent is " << Othercomponent << "." << endl;
           for (Boundaries::const_iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
-              //Log() << Verbose(1) << "Current runner is " << *(runner->second.second) << "." << endl;
+              //Log() << Verbose(2) << "Current runner is " << *(runner->second.second) << "." << endl;
               // seek for the neighbours pair where the Othercomponent sign flips
               Neighbour = runner;
@@ -84 +82 @@
                   DistanceVector.CopyVector(&runner->second.second->x);
                   DistanceVector.SubtractVector(&Neighbour->second.second->x);
-                  //Log() << Verbose(2) << "OldComponent is " << OldComponent << ", new one is " << DistanceVector.x[Othercomponent] << "." << endl;
+                  //Log() << Verbose(3) << "OldComponent is " << OldComponent << ", new one is " << DistanceVector.x[Othercomponent] << "." << endl;
                 } while ((runner != Neighbour) && (fabs(OldComponent / fabs(
                   OldComponent) - DistanceVector.x[Othercomponent] / fabs(
@@ -93 +91 @@
                     OtherNeighbour = BoundaryPoints[axis].end();
                   OtherNeighbour--;
-                  //Log() << Verbose(1) << "The pair, where the sign of OtherComponent flips, is: " << *(Neighbour->second.second) << " and " << *(OtherNeighbour->second.second) << "." << endl;
+                  //Log() << Verbose(2) << "The pair, where the sign of OtherComponent flips, is: " << *(Neighbour->second.second) << " and " << *(OtherNeighbour->second.second) << "." << endl;
                   // now we have found the pair: Neighbour and OtherNeighbour
                   OtherVector.CopyVector(&runner->second.second->x);
                   OtherVector.SubtractVector(&OtherNeighbour->second.second->x);
-                  //Log() << Verbose(1) << "Distances to Neighbour and OtherNeighbour are " << DistanceVector.x[component] << " and " << OtherVector.x[component] << "." << endl;
-                  //Log() << Verbose(1) << "OtherComponents to Neighbour and OtherNeighbour are " << DistanceVector.x[Othercomponent] << " and " << OtherVector.x[Othercomponent] << "." << endl;
+                  //Log() << Verbose(2) << "Distances to Neighbour and OtherNeighbour are " << DistanceVector.x[component] << " and " << OtherVector.x[component] << "." << endl;
+                  //Log() << Verbose(2) << "OtherComponents to Neighbour and OtherNeighbour are " << DistanceVector.x[Othercomponent] << " and " << OtherVector.x[Othercomponent] << "." << endl;
                   // do linear interpolation between points (is exact) to extract exact intersection between Neighbour and OtherNeighbour
                   w1 = fabs(OtherVector.x[Othercomponent]);
@@ -105 +103 @@
                       * OtherVector.x[component]) / (w1 + w2));
                   // mark if it has greater diameter
-                  //Log() << Verbose(1) << "Comparing current greatest " << GreatestDiameter[component] << " to new " << tmp << "." << endl;
+                  //Log() << Verbose(2) << "Comparing current greatest " << GreatestDiameter[component] << " to new " << tmp << "." << endl;
                   GreatestDiameter[component] = (GreatestDiameter[component]
                       > tmp) ? GreatestDiameter[component] : tmp;
                 } //else
-              //Log() << Verbose(1) << "Saw no sign flip, probably top or bottom node." << endl;
+              //Log() << Verbose(2) << "Saw no sign flip, probably top or bottom node." << endl;
             }
         }
@@ -137 +135 @@
 Boundaries *GetBoundaryPoints(const molecule *mol, Tesselation *&TesselStruct)
 {
-        Info FunctionInfo(__func__);
   atom *Walker = NULL;
   PointMap PointsOnBoundary;
@@ -152 +149 @@
   double angle = 0.;
 
+  Log() << Verbose(1) << "Finding all boundary points." << endl;
   // 3a. Go through every axis
   for (int axis = 0; axis < NDIM; axis++) {
@@ -178 +176 @@
         angle = 0.; // otherwise it's a vector in Axis Direction and unimportant for boundary issues
 
-      //Log() << Verbose(1) << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
+      //Log() << Verbose(2) << "Checking sign in quadrant : " << ProjectedVector.Projection(&AngleReferenceNormalVector) << "." << endl;
       if (ProjectedVector.ScalarProduct(&AngleReferenceNormalVector) > 0) {
         angle = 2. * M_PI - angle;
       }
-      Log() << Verbose(1) << "Inserting " << *Walker << ": (r, alpha) = (" << radius << "," << angle << "): " << ProjectedVector << endl;
+      Log() << Verbose(2) << "Inserting " << *Walker << ": (r, alpha) = (" << radius << "," << angle << "): " << ProjectedVector << endl;
       BoundaryTestPair = BoundaryPoints[axis].insert(BoundariesPair(angle, DistancePair (radius, Walker)));
       if (!BoundaryTestPair.second) { // same point exists, check first r, then distance of original vectors to center of gravity
@@ -212 +210 @@
     // printing all inserted for debugging
     //    {
-    //      Log() << Verbose(1) << "Printing list of candidates for axis " << axis << " which we have inserted so far." << endl;
+    //      Log() << Verbose(2) << "Printing list of candidates for axis " << axis << " which we have inserted so far." << endl;
     //      int i=0;
     //      for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
     //        if (runner != BoundaryPoints[axis].begin())
-    //          Log() << Verbose(0) << ", " << i << ": " << *runner->second.second;
+    //          Log() << Verbose(2) << ", " << i << ": " << *runner->second.second;
     //        else
-    //          Log() << Verbose(0) << i << ": " << *runner->second.second;
+    //          Log() << Verbose(2) << i << ": " << *runner->second.second;
     //        i++;
     //      }
-    //      Log() << Verbose(0) << endl;
+    //      Log() << Verbose(2) << endl;
     //    }
     // 3c. throw out points whose distance is less than the mean of left and right neighbours
@@ -251 +249 @@
           SideA.SubtractVector(MolCenter);
           SideA.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(1) << "SideA: " << SideA << endl;
+          //          Log() << Verbose(0) << "SideA: " << SideA << endl;
 
           SideB.CopyVector(&right->second.second->x);
           SideB.SubtractVector(MolCenter);
           SideB.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(1) << "SideB: " << SideB << endl;
+          //          Log() << Verbose(0) << "SideB: " << SideB << endl;
 
           SideC.CopyVector(&left->second.second->x);
           SideC.SubtractVector(&right->second.second->x);
           SideC.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(1) << "SideC: " << SideC << endl;
+          //          Log() << Verbose(0) << "SideC: " << SideC << endl;
 
           SideH.CopyVector(&runner->second.second->x);
           SideH.SubtractVector(MolCenter);
           SideH.ProjectOntoPlane(&AxisVector);
-          //          Log() << Verbose(1) << "SideH: " << SideH << endl;
+          //          Log() << Verbose(0) << "SideH: " << SideH << endl;
 
           // calculate each length
@@ -279 +277 @@
           const double delta = SideC.Angle(&SideH);
           const double MinDistance = a * sin(beta) / (sin(delta)) * (((alpha < M_PI / 2.) || (gamma < M_PI / 2.)) ? 1. : -1.);
-          //Log() << Verbose(1) << " I calculated: a = " << a << ", h = " << h << ", beta(" << left->second.second->Name << "," << left->second.second->Name << "-" << right->second.second->Name << ") = " << beta << ", delta(" << left->second.second->Name << "," << runner->second.second->Name << ") = " << delta << ", Min = " << MinDistance << "." << endl;
+          //Log() << Verbose(2) << " I calculated: a = " << a << ", h = " << h << ", beta(" << left->second.second->Name << "," << left->second.second->Name << "-" << right->second.second->Name << ") = " << beta << ", delta(" << left->second.second->Name << "," << runner->second.second->Name << ") = " << delta << ", Min = " << MinDistance << "." << endl;
           Log() << Verbose(1) << "Checking CoG distance of runner " << *runner->second.second << " " << h << " against triangle's side length spanned by (" << *left->second.second << "," << *right->second.second << ") of " << MinDistance << "." << endl;
           if ((fabs(h / fabs(h) - MinDistance / fabs(MinDistance)) < MYEPSILON) && ((h - MinDistance)) < -MYEPSILON) {
@@ -305 +303 @@
 void FindConvexBorder(const molecule* mol, Tesselation *&TesselStruct, const LinkedCell *LCList, const char *filename)
 {
-        Info FunctionInfo(__func__);
   bool BoundaryFreeFlag = false;
   Boundaries *BoundaryPoints = NULL;
+
+  Log() << Verbose(1) << "Begin of FindConvexBorder" << endl;
 
   if (TesselStruct != NULL) // free if allocated
@@ -318 +317 @@
       BoundaryPoints = GetBoundaryPoints(mol, TesselStruct);
   } else {
-      Log() << Verbose(0) << "Using given boundary points set." << endl;
+      Log() << Verbose(1) << "Using given boundary points set." << endl;
   }
 
@@ -324 +323 @@
   for (int axis=0; axis < NDIM; axis++)
     {
-      Log() << Verbose(1) << "Printing list of candidates for axis " << axis << " which we have inserted so far." << endl;
+      Log() << Verbose(2) << "Printing list of candidates for axis " << axis << " which we have inserted so far." << endl;
       int i=0;
       for(Boundaries::iterator runner = BoundaryPoints[axis].begin(); runner != BoundaryPoints[axis].end(); runner++) {
         if (runner != BoundaryPoints[axis].begin())
-          Log() << Verbose(0) << ", " << i << ": " << *runner->second.second;
+          Log() << Verbose(2) << ", " << i << ": " << *runner->second.second;
         else
-          Log() << Verbose(0) << i << ": " << *runner->second.second;
+          Log() << Verbose(2) << i << ": " << *runner->second.second;
         i++;
       }
-      Log() << Verbose(0) << endl;
+      Log() << Verbose(2) << endl;
     }
 
@@ -342 +341 @@
           eLog() << Verbose(2) << "Point " << *(runner->second.second) << " is already present!" << endl;
 
-  Log() << Verbose(0) << "I found " << TesselStruct->PointsOnBoundaryCount << " points on the convex boundary." << endl;
+  Log() << Verbose(2) << "I found " << TesselStruct->PointsOnBoundaryCount << " points on the convex boundary." << endl;
   // now we have the whole set of edge points in the BoundaryList
 
@@ -348 +347 @@
   //  Log() << Verbose(1) << "Listing PointsOnBoundary:";
   //  for(PointMap::iterator runner = PointsOnBoundary.begin(); runner != PointsOnBoundary.end(); runner++) {
-  //    Log() << Verbose(0) << " " << *runner->second;
+  //    Log() << Verbose(1) << " " << *runner->second;
   //  }
-  //  Log() << Verbose(0) << endl;
+  //  Log() << Verbose(1) << endl;
 
   // 3a. guess starting triangle
@@ -360 +359 @@
   // 3c. check whether all atoms lay inside the boundary, if not, add to boundary points, segment triangle into three with the new point
   if (!TesselStruct->InsertStraddlingPoints(mol, LCList))
-    eLog() << Verbose(1) << "Insertion of straddling points failed!" << endl;
-
-  Log() << Verbose(0) << "I created " << TesselStruct->TrianglesOnBoundary.size() << " intermediate triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points." << endl;
+    Log() << Verbose(1) << "Insertion of straddling points failed!" << endl;
+
+  Log() << Verbose(2) << "I created " << TesselStruct->TrianglesOnBoundary.size() << " intermediate triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points." << endl;
 
   // 4. Store triangles in tecplot file
@@ -412 +411 @@
 //    Log() << Verbose(1) << "Correction of concave tesselpoints failed!" << endl;
 
-  Log() << Verbose(0) << "I created " << TesselStruct->TrianglesOnBoundary.size() << " triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points." << endl;
+  Log() << Verbose(2) << "I created " << TesselStruct->TrianglesOnBoundary.size() << " triangles with " << TesselStruct->LinesOnBoundary.size() << " lines and " << TesselStruct->PointsOnBoundary.size() << " points." << endl;
 
   // 4. Store triangles in tecplot file
@@ -438 +437 @@
   if (BoundaryFreeFlag)
     delete[] (BoundaryPoints);
+
+  Log() << Verbose(1) << "End of FindConvexBorder" << endl;
 };
 
@@ -449 +450 @@
 bool RemoveAllBoundaryPoints(class Tesselation *&TesselStruct, const molecule * const mol, const char * const filename)
 {
-        Info FunctionInfo(__func__);
   int i=0;
   char number[MAXSTRINGSIZE];
@@ -460 +460 @@
   PointMap::iterator PointRunner;
   while (!TesselStruct->PointsOnBoundary.empty()) {
-    Log() << Verbose(1) << "Remaining points are: ";
+    Log() << Verbose(2) << "Remaining points are: ";
     for (PointMap::iterator PointSprinter = TesselStruct->PointsOnBoundary.begin(); PointSprinter != TesselStruct->PointsOnBoundary.end(); PointSprinter++)
-      Log() << Verbose(0) << *(PointSprinter->second) << "\t";
-    Log() << Verbose(0) << endl;
+      Log() << Verbose(2) << *(PointSprinter->second) << "\t";
+    Log() << Verbose(2) << endl;
 
     PointRunner = TesselStruct->PointsOnBoundary.begin();
@@ -503 +503 @@
 double ConvexizeNonconvexEnvelope(class Tesselation *&TesselStruct, const molecule * const mol, const char * const filename)
 {
-        Info FunctionInfo(__func__);
   double volume = 0;
   class BoundaryPointSet *point = NULL;
@@ -517 +516 @@
   int run = 0;
 
+  Log() << Verbose(0) << "Begin of ConvexizeNonconvexEnvelope" << endl;
+
   // check whether there is something to work on
   if (TesselStruct == NULL) {
@@ -538 +539 @@
       for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
         line = LineRunner->second;
-        Log() << Verbose(1) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
+        Log() << Verbose(2) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
         if (!line->CheckConvexityCriterion()) {
           // remove the point if needed
@@ -603 +604 @@
 
   // end
-  Log() << Verbose(0) << "Volume is " << volume << "." << endl;
+  Log() << Verbose(1) << "Volume is " << volume << "." << endl;
+  Log() << Verbose(0) << "End of ConvexizeNonconvexEnvelope" << endl;
   return volume;
 };
@@ -617 +619 @@
 double VolumeOfConvexEnvelope(class Tesselation *TesselStruct, class config *configuration)
 {
-        Info FunctionInfo(__func__);
   bool IsAngstroem = configuration->GetIsAngstroem();
   double volume = 0.;
@@ -624 +625 @@
 
   // 6a. Every triangle forms a pyramid with the center of gravity as its peak, sum up the volumes
+  Log() << Verbose(1)
+      << "Calculating the volume of the pyramids formed out of triangles and center of gravity."
+      << endl;
   for (TriangleMap::iterator runner = TesselStruct->TrianglesOnBoundary.begin(); runner != TesselStruct->TrianglesOnBoundary.end(); runner++)
     { // go through every triangle, calculate volume of its pyramid with CoG as peak
@@ -638 +642 @@
       const double h = x.Norm(); // distance of CoG to triangle
       const double PyramidVolume = (1. / 3.) * G * h; // this formula holds for _all_ pyramids (independent of n-edge base or (not) centered peak)
-      Log() << Verbose(1) << "Area of triangle is " << setprecision(10) << G << " "
+      Log() << Verbose(2) << "Area of triangle is " << setprecision(10) << G << " "
           << (IsAngstroem ? "angstrom" : "atomiclength") << "^2, height is "
           << h << " and the volume is " << PyramidVolume << " "
@@ -660 +664 @@
 void StoreTrianglesinFile(const molecule * const mol, const Tesselation *&TesselStruct, const char *filename, const char *extraSuffix)
 {
-        Info FunctionInfo(__func__);
   // 4. Store triangles in tecplot file
   if (filename != NULL) {
@@ -668 +671 @@
       OutputName.append(TecplotSuffix);
       ofstream *tecplot = new ofstream(OutputName.c_str());
-      WriteTecplotFile(tecplot, TesselStruct, mol, -1);
+      WriteTecplotFile(tecplot, TesselStruct, mol, 0);
       tecplot->close();
       delete(tecplot);
@@ -695 +698 @@
 void PrepareClustersinWater(config *configuration, molecule *mol, double ClusterVolume, double celldensity)
 {
-        Info FunctionInfo(__func__);
   bool IsAngstroem = true;
   double *GreatestDiameter = NULL;
@@ -796 +798 @@
 molecule * FillBoxWithMolecule(MoleculeListClass *List, molecule *filler, config &configuration, double distance[NDIM], double RandomAtomDisplacement, double RandomMolDisplacement, bool DoRandomRotation)
 {
-        Info FunctionInfo(__func__);
   molecule *Filling = new molecule(filler->elemente);
   Vector CurrentPosition;
@@ -813 +814 @@
   double phi[NDIM];
   class Tesselation *TesselStruct[List->ListOfMolecules.size()];
+
+  Log() << Verbose(0) << "Begin of FillBoxWithMolecule" << endl;
 
   i=0;
@@ -874 +877 @@
           for (int i=0;i<NDIM;i++)
             FillerTranslations.x[i] = RandomMolDisplacement*(rand()/(RAND_MAX/2.) - 1.);
-          Log() << Verbose(2) << "INFO: Translating this filler by " << FillerTranslations << "." << endl;
+          Log() << Verbose(3) << "INFO: Translating this filler by " << FillerTranslations << "." << endl;
 
           // go through all atoms
@@ -935 +938 @@
         delete(TesselStruct[i]);
   }
+  Log() << Verbose(0) << "End of FillBoxWithMolecule" << endl;
+
   return Filling;
 };
@@ -946 +951 @@
  * \param RADIUS radius of the virtual sphere
  * \param *filename filename prefix for output of vertex data
- * \return true - tesselation successful, false - tesselation failed
- */
-bool FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LCList, const double RADIUS, const char *filename = NULL)
+ */
+void FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LCList, const double RADIUS, const char *filename = NULL)
 {
-        Info FunctionInfo(__func__);
   bool freeLC = false;
-  bool status = false;
-  CandidateForTesselation *baseline;
+  LineMap::iterator baseline;
   LineMap::iterator testline;
-  bool OneLoopWithoutSuccessFlag = true;  // marks whether we went once through all baselines without finding any without two triangles
+  bool OneLoopWithoutSuccessFlag = false;  // marks whether we went once through all baselines without finding any without two triangles
   bool TesselationFailFlag = false;
-  BoundaryTriangleSet *T = NULL;
-
+
+  Log() << Verbose(1) << "Entering search for non convex hull. " << endl;
   if (TesselStruct == NULL) {
     Log() << Verbose(1) << "Allocating Tesselation struct ..." << endl;
@@ -968 +970 @@
   }
 
+  Log() << Verbose(0) << "Begin of FindNonConvexBorder\n";
+
   // initialise Linked Cell
   if (LCList == NULL) {
@@ -978 +982 @@
 
   // 2. expand from there
-  while ((!TesselStruct->OpenLines.empty()) && (OneLoopWithoutSuccessFlag)) {
-    // 2a. fill all new OpenLines
-    Log() << Verbose(1) << "There are " << TesselStruct->OpenLines.size() << " open lines to scan for candidates:" << endl;
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
-      Log() << Verbose(2) << *(Runner->second) << endl;
-
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
-      baseline = Runner->second;
-      if (baseline->pointlist.empty()) {
-        T = (((baseline->BaseLine->triangles.begin()))->second);
-        Log() << Verbose(1) << "Finding best candidate for open line " << *baseline->BaseLine << " of triangle " << *T << endl;
-        TesselationFailFlag = TesselStruct->FindNextSuitableTriangle(*baseline, *T, RADIUS, LCList); //the line is there, so there is a triangle, but only one.
+  baseline = TesselStruct->LinesOnBoundary.begin();
+  baseline++; // skip first line
+  while ((baseline != TesselStruct->LinesOnBoundary.end()) || (OneLoopWithoutSuccessFlag)) {
+    if (baseline->second->triangles.size() == 1) {
+      CheckListOfBaselines(TesselStruct);
+      // 3. find next triangle
+      TesselationFailFlag = TesselStruct->FindNextSuitableTriangle(*(baseline->second), *(((baseline->second->triangles.begin()))->second), RADIUS, LCList); //the line is there, so there is a triangle, but only one.
+      OneLoopWithoutSuccessFlag = OneLoopWithoutSuccessFlag || TesselationFailFlag;
+      if (!TesselationFailFlag)
+        eLog() << Verbose(2) << "FindNextSuitableTriangle failed." << endl;
+
+      // write temporary envelope
+      if (filename != NULL) {
+        if ((DoSingleStepOutput && ((TesselStruct->TrianglesOnBoundary.size() % SingleStepWidth == 0)))) { // if we have a new triangle and want to output each new triangle configuration
+          TesselStruct->Output(filename, mol);
+        }
       }
-    }
-
-    // 2b. search for smallest ShortestAngle among all candidates
-    double ShortestAngle = 4.*M_PI;
-    Log() << Verbose(1) << "There are " << TesselStruct->OpenLines.size() << " open lines to scan for the best candidates:" << endl;
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++)
-      Log() << Verbose(2) << *(Runner->second) << endl;
-
-    for (CandidateMap::iterator Runner = TesselStruct->OpenLines.begin(); Runner != TesselStruct->OpenLines.end(); Runner++) {
-      if (Runner->second->ShortestAngle < ShortestAngle) {
-        baseline = Runner->second;
-        ShortestAngle = baseline->ShortestAngle;
-        //Log() << Verbose(1) << "New best candidate is " << *baseline->BaseLine << " with point " << *baseline->point << " and angle " << baseline->ShortestAngle << endl;
+      if (TesselationFailFlag) {
+        baseline = TesselStruct->LinesOnBoundary.begin();
+        OneLoopWithoutSuccessFlag = false;
+        Log() << Verbose(2) << "Baseline set to begin." << endl;
       }
-    }
-    if ((ShortestAngle == 4.*M_PI) || (baseline->pointlist.empty()))
+    } else {
+      //Log() << Verbose(1) << "Line " << *baseline->second << " has " << baseline->second->triangles.size() << " triangles adjacent" << endl;
+      if (baseline->second->triangles.size() != 2) {
+        eLog() << Verbose(0) << "TESSELATION FINISHED WITH INVALID TRIANGLE COUNT!" << endl;
+        performCriticalExit();
+      }
+    }
+
+    if ((baseline == TesselStruct->LinesOnBoundary.end()) && (OneLoopWithoutSuccessFlag)) {
+      baseline = TesselStruct->LinesOnBoundary.begin();   // restart if we reach end due to newly inserted lines
       OneLoopWithoutSuccessFlag = false;
-    else {
-      TesselStruct->AddCandidateTriangle(*baseline);
-    }
-
-    // write temporary envelope
-    if (filename != NULL) {
-      if ((DoSingleStepOutput && ((TesselStruct->TrianglesOnBoundary.size() % SingleStepWidth == 0)))) { // if we have a new triangle and want to output each new triangle configuration
-        TesselStruct->Output(filename, mol);
-      }
-    }
-  }
-//  // check envelope for consistency
-//  status = CheckListOfBaselines(TesselStruct);
-//
-//  // look whether all points are inside of the convex envelope, otherwise add them via degenerated triangles
-//  //->InsertStraddlingPoints(mol, LCList);
+    }
+    baseline++;
+  }
+  // check envelope for consistency
+  CheckListOfBaselines(TesselStruct);
+
+  // look whether all points are inside of the convex envelope, otherwise add them via degenerated triangles
+  //->InsertStraddlingPoints(mol, LCList);
 //  mol->GoToFirst();
 //  class TesselPoint *Runner = NULL;
@@ -1038 +1037 @@
 //  }
 
-//  // Purges surplus triangles.
-//  TesselStruct->RemoveDegeneratedTriangles();
+  // Purges surplus triangles.
+  TesselStruct->RemoveDegeneratedTriangles();
 
   // check envelope for consistency
-  status = CheckListOfBaselines(TesselStruct);
-
-  // store before correction
-  StoreTrianglesinFile(mol, (const Tesselation *&)TesselStruct, filename, "");
-
-  // correct degenerated polygons
-  TesselStruct->CorrectAllDegeneratedPolygons();
-
-  // check envelope for consistency
-  status = CheckListOfBaselines(TesselStruct);
+  CheckListOfBaselines(TesselStruct);
 
   // write final envelope
@@ -1059 +1049 @@
   if (freeLC)
     delete(LCList);
-
-  return status;
+  Log() << Verbose(0) << "End of FindNonConvexBorder\n";
 };
 
@@ -1072 +1061 @@
 Vector* FindEmbeddingHole(MoleculeListClass *mols, molecule *srcmol)
 {
-        Info FunctionInfo(__func__);
   Vector *Center = new Vector;
   Center->Zero();

src/boundary.hpp

@@ -35 +35 @@
 
 #define DEBUG 1
-#define DoSingleStepOutput 0
-#define SingleStepWidth 10
+#define DoSingleStepOutput 1
+#define SingleStepWidth 1
 
 #define DistancePair pair < double, atom* >
@@ -53 +53 @@
 Vector* FindEmbeddingHole(MoleculeListClass *mols, molecule *srcmol);
 void FindNextSuitablePoint(class BoundaryTriangleSet *BaseTriangle, class BoundaryLineSet *BaseLine, atom*& OptCandidate, Vector *OptCandidateCenter, double *ShortestAngle, const double RADIUS, LinkedCell *LC);
-bool FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LC, const double RADIUS, const char *tempbasename);
+void FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LC, const double RADIUS, const char *tempbasename);
 Boundaries *GetBoundaryPoints(const molecule *mol, Tesselation *&TesselStruct);
 double * GetDiametersOfCluster(const Boundaries *BoundaryPtr, const molecule *mol, Tesselation *&TesselStruct, const bool IsAngstroem);

src/builder.cpp

@@ -65 +65 @@
 #include "molecule.hpp"
 #include "periodentafel.hpp"
-#include "version.h"
 
 /********************************************* Subsubmenu routine ************************************/
@@ -1248 +1247 @@
   ofstream output;
   molecule *mol = new molecule(periode);
-  mol->SetNameFromFilename(ConfigFileName);
 
   if (!strcmp(configuration->configpath, configuration->GetDefaultPath())) {
@@ -1387 +1385 @@
   int argptr;
   molecule *mol = NULL;
-  string BondGraphFileName("\n");
+  string BondGraphFileName("");
   int verbosity = 0;
   strncpy(configuration.databasepath, LocalPath, MAXSTRINGSIZE-1);
@@ -1541 +1539 @@
        mol = new molecule(periode);
        mol->ActiveFlag = true;
-       if (ConfigFileName != NULL)
-         mol->SetNameFromFilename(ConfigFileName);
        molecules->insert(mol);
-     }
-     if (configuration.BG == NULL) {
-       configuration.BG = new BondGraph(configuration.GetIsAngstroem());
-       if ((BondGraphFileName.empty()) && (configuration.BG->LoadBondLengthTable(BondGraphFileName))) {
-         Log() << Verbose(0) << "Bond length table loaded successfully." << endl;
-       } else {
-         eLog() << Verbose(1) << "Bond length table loading failed." << endl;
-       }
      }
 
@@ -1575 +1563 @@
                 else {
                   Log() << Verbose(2) << "File found and parsed." << endl;
-                  // @TODO rather do the dissection afterwards
-//                  mol->SetNameFromFilename(argv[argptr]);
-//                  molecules->ListOfMolecules.remove(mol);
-//                  molecules->DissectMoleculeIntoConnectedSubgraphs(mol,&configuration);
-//                  delete(mol);
-//                  if (molecules->ListOfMolecules.size() != 0) {
-//                    for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
-//                      if ((*ListRunner)->ActiveFlag) {
-//                        mol = *ListRunner;
-//                        break;
-//                      }
-//                  }
                   configPresent = present;
                 }
@@ -1805 +1781 @@
                 start = clock();
                 LCList = new LinkedCell(Boundary, atof(argv[argptr])*2.);
-                if (!FindNonConvexBorder(Boundary, T, LCList, atof(argv[argptr]), argv[argptr+1]))
-                  ExitFlag = 255;
+                FindNonConvexBorder(Boundary, T, LCList, atof(argv[argptr]), argv[argptr+1]);
                 //FindDistributionOfEllipsoids(T, &LCList, N, number, filename.c_str());
                 end = clock();
                 Log() << Verbose(0) << "Clocks for this operation: " << (end-start) << ", time: " << ((double)(end-start)/CLOCKS_PER_SEC) << "s." << endl;
                 delete(LCList);
-                delete(T);
                 argptr+=2;
               }
@@ -2223 +2197 @@
   int j;
 
-  cout << ESPACKVersion << endl;
-
   setVerbosity(0);
 

src/config.cpp

@@ -140 +140 @@
 void ConfigFileBuffer::MapIonTypesInBuffer(const int NoAtoms)
 {
-  map<const char *, int, IonTypeCompare> IonTypeLineMap;
+  map<const char *, int, IonTypeCompare> LineList;
   if (LineMapping == NULL) {
     eLog() << Verbose(0) << "map pointer is NULL: " << LineMapping << endl;
@@ -149 +149 @@
   // put all into hashed map
   for (int i=0; i<NoAtoms; ++i) {
-    IonTypeLineMap.insert(pair<const char *, int> (buffer[CurrentLine+i], CurrentLine+i));
+    LineList.insert(pair<const char *, int> (buffer[CurrentLine+i], CurrentLine+i));
   }
 
   // fill map
   int nr=0;
-  for (map<const char *, int, IonTypeCompare>::iterator runner = IonTypeLineMap.begin(); runner != IonTypeLineMap.end(); ++runner) {
+  for (map<const char *, int, IonTypeCompare>::iterator runner = LineList.begin(); runner != LineList.end(); ++runner) {
     if (CurrentLine+nr < NoLines)
       LineMapping[CurrentLine+(nr++)] = runner->second;
@@ -1056 +1056 @@
 
   // 2. parse the bond graph file if given
-  if (BG == NULL) {
-    BG = new BondGraph(IsAngstroem);
-    if (BG->LoadBondLengthTable(BondGraphFileName)) {
-      Log() << Verbose(0) << "Bond length table loaded successfully." << endl;
-    } else {
-      eLog() << Verbose(1) << "Bond length table loading failed." << endl;
-    }
+  BG = new BondGraph(IsAngstroem);
+  if (BG->LoadBondLengthTable(BondGraphFileName)) {
+    Log() << Verbose(0) << "Bond length table loaded successfully." << endl;
+  } else {
+    Log() << Verbose(0) << "Bond length table loading failed." << endl;
   }
 
   // 3. parse the molecule in
   LoadMolecule(mol, FileBuffer, periode, FastParsing);
-  mol->SetNameFromFilename(filename);
   mol->ActiveFlag = true;
-  MolList->insert(mol);
 
   // 4. dissect the molecule into connected subgraphs
-  // don't do this here ...
-  //MolList->DissectMoleculeIntoConnectedSubgraphs(mol,this);
-  //delete(mol);
-
+  MolList->DissectMoleculeIntoConnectedSubgraphs(mol,this);
+
+  delete(mol);
   delete(FileBuffer);
 };

src/errorlogger.cpp

@@ -82 +82 @@
   l.nix->clear();
   if (v.DoOutput(verbosityLevel)) {
+    v.print(cout);
     switch(v.Verbosity) {
       case 0:
-        cerr << "CRITICAL: ";
+        cout << "CRITICAL: ";
         break;
       case 1:
-        cerr << "ERROR: ";
+        cout << "ERROR: ";
         break;
       case 2:
-        cerr << "WARNING: ";
+        cout << "WARNING: ";
         break;
       default:
         break;
     }
-    v.print(cerr);
     return cerr;
   } else
@@ -105 +105 @@
   l->nix->clear();
   if (v.DoOutput(verbosityLevel)) {
+    v.print(cout);
     switch(v.Verbosity) {
       case 0:
-        cerr << "CRITICAL: ";
+        cout << "CRITICAL: ";
         break;
       case 1:
-        cerr << "ERROR: ";
+        cout << "ERROR: ";
         break;
       case 2:
-        cerr << "WARNING: ";
+        cout << "WARNING: ";
         break;
       default:
         break;
     }
-    v.print(cerr);
     return cerr;
   } else

src/molecule.hpp

@@ -106 +106 @@
 
   // re-definition of virtual functions from PointCloud
-  const char * const GetName() const;
   Vector *GetCenter() const ;
   TesselPoint *GetPoint() const ;

src/molecule_pointcloud.cpp

@@ -13 +13 @@
 /************************************* Functions for class molecule *********************************/
 
-/** Returns a name for this point cloud, here the molecule's name.
- * \return name of point cloud
- */
-const char * const molecule::GetName() const
-{
-  return name;
-};
 
 /** Determine center of all atoms.

src/moleculelist.cpp

@@ -759 +759 @@
   // 4a. create array of molecules to fill
   const int MolCount = Subgraphs->next->Count();
-  char number[MAXSTRINGSIZE];
   molecule **molecules = Malloc<molecule *>(MolCount, "config::Load() - **molecules");
   for (int i=0;i<MolCount;i++) {
     molecules[i] = (molecule*) new molecule(mol->elemente);
     molecules[i]->ActiveFlag = true;
-    strncpy(molecules[i]->name, mol->name, MAXSTRINGSIZE);
-    if (MolCount > 1) {
-      sprintf(number, "-%d", i+1);
-      strncat(molecules[i]->name, number, MAXSTRINGSIZE - strlen(mol->name) - 1);
-    }
-    cout << "MolName is " << molecules[i]->name << endl;
     insert(molecules[i]);
   }
@@ -806 +799 @@
     }
   }
-  // 4d. we don't need to redo bonds, as they are connected subgraphs and still maintain their ListOfBonds, but we have to remove them from first..last list
+  // 4d. we don't need to redo bonds, as they are connected subgraphs and still maintained their ListOfBonds, but we have to remove them from first..last list
   bond *Binder = mol->first;
   while (mol->first->next != mol->last) {

src/parser.cpp

@@ -158 +158 @@
   //Log() << Verbose(0) << "Opening " << name << " ... "  << input << endl;
   if (input == NULL) {
-    eLog() << Verbose(1) << endl << "Unable to open " << name << ", is the directory correct?" << endl;
-    //performCriticalExit();
+    eLog() << Verbose(0) << endl << "Unable to open " << name << ", is the directory correct?" << endl;
+    performCriticalExit();
     return false;
   }

src/tesselation.cpp

@@ -9 +9 @@
 
 #include "helpers.hpp"
-#include "info.hpp"
 #include "linkedcell.hpp"
 #include "log.hpp"
@@ -23 +22 @@
 /** Constructor of BoundaryPointSet.
  */
-BoundaryPointSet::BoundaryPointSet() :
-    LinesCount(0),
-    value(0.),
-    Nr(-1)
-{
-        Info FunctionInfo(__func__);
-        Log() << Verbose(1) << "Adding noname." << endl;
+BoundaryPointSet::BoundaryPointSet()
+{
+  LinesCount = 0;
+  Nr = -1;
+  value = 0.;
 };
 
@@ -35 +32 @@
  * \param *Walker TesselPoint this boundary point represents
  */
-BoundaryPointSet::BoundaryPointSet(TesselPoint * Walker) :
-  LinesCount(0),
-  node(Walker),
-  value(0.),
-  Nr(Walker->nr)
-{
-        Info FunctionInfo(__func__);
-  Log() << Verbose(1) << "Adding Node " << *Walker << endl;
+BoundaryPointSet::BoundaryPointSet(TesselPoint * Walker)
+{
+  node = Walker;
+  LinesCount = 0;
+  Nr = Walker->nr;
+  value = 0.;
 };
 
@@ -51 +46 @@
 BoundaryPointSet::~BoundaryPointSet()
 {
-        Info FunctionInfo(__func__);
-  //Log() << Verbose(0) << "Erasing point nr. " << Nr << "." << endl;
+  //Log() << Verbose(5) << "Erasing point nr. " << Nr << "." << endl;
   if (!lines.empty())
     eLog() << Verbose(2) << "Memory Leak! I " << *this << " am still connected to some lines." << endl;
@@ -63 +57 @@
 void BoundaryPointSet::AddLine(class BoundaryLineSet *line)
 {
-        Info FunctionInfo(__func__);
-  Log() << Verbose(1) << "Adding " << *this << " to line " << *line << "."
+  Log() << Verbose(6) << "Adding " << *this << " to line " << *line << "."
       << endl;
   if (line->endpoints[0] == this)
@@ -92 +85 @@
 /** Constructor of BoundaryLineSet.
  */
-BoundaryLineSet::BoundaryLineSet() :
-    Nr(-1)
-{
-        Info FunctionInfo(__func__);
+BoundaryLineSet::BoundaryLineSet()
+{
   for (int i = 0; i < 2; i++)
     endpoints[i] = NULL;
+  Nr = -1;
 };
 
@@ -107 +99 @@
 BoundaryLineSet::BoundaryLineSet(class BoundaryPointSet *Point[2], const int number)
 {
-        Info FunctionInfo(__func__);
   // set number
   Nr = number;
@@ -115 +106 @@
   Point[0]->AddLine(this); //Taken out, to check whether we can avoid unwanted double adding.
   Point[1]->AddLine(this); //
-  // set skipped to false
-  skipped = false;
   // clear triangles list
-  Log() << Verbose(0) << "New Line with endpoints " << *this << "." << endl;
+  Log() << Verbose(5) << "New Line with endpoints " << *this << "." << endl;
 };
 
@@ -127 +116 @@
 BoundaryLineSet::~BoundaryLineSet()
 {
-        Info FunctionInfo(__func__);
   int Numbers[2];
 
@@ -146 +134 @@
         for (LineMap::iterator Runner = erasor.first; Runner != erasor.second; Runner++)
           if ((*Runner).second == this) {
-            //Log() << Verbose(0) << "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << "." << endl;
+            //Log() << Verbose(5) << "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << "." << endl;
             endpoints[i]->lines.erase(Runner);
             break;
@@ -152 +140 @@
       } else { // there's just a single line left
         if (endpoints[i]->lines.erase(Nr)) {
-          //Log() << Verbose(0) << "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << "." << endl;
+          //Log() << Verbose(5) << "Removing Line Nr. " << Nr << " in boundary point " << *endpoints[i] << "." << endl;
         }
       }
       if (endpoints[i]->lines.empty()) {
-        //Log() << Verbose(0) << *endpoints[i] << " has no more lines it's attached to, erasing." << endl;
+        //Log() << Verbose(5) << *endpoints[i] << " has no more lines it's attached to, erasing." << endl;
         if (endpoints[i] != NULL) {
           delete(endpoints[i]);
@@ -173 +161 @@
 void BoundaryLineSet::AddTriangle(class BoundaryTriangleSet *triangle)
 {
-        Info FunctionInfo(__func__);
-  Log() << Verbose(0) << "Add " << triangle->Nr << " to line " << *this << "." << endl;
+  Log() << Verbose(6) << "Add " << triangle->Nr << " to line " << *this << "." << endl;
   triangles.insert(TrianglePair(triangle->Nr, triangle));
 };
@@ -184 +171 @@
 bool BoundaryLineSet::IsConnectedTo(class BoundaryLineSet *line)
 {
-        Info FunctionInfo(__func__);
   if ((endpoints[0] == line->endpoints[0]) || (endpoints[1] == line->endpoints[0]) || (endpoints[0] == line->endpoints[1]) || (endpoints[1] == line->endpoints[1]))
     return true;
@@ -199 +185 @@
 bool BoundaryLineSet::CheckConvexityCriterion()
 {
-        Info FunctionInfo(__func__);
   Vector BaseLineCenter, BaseLineNormal, BaseLine, helper[2], NormalCheck;
   // get the two triangles
   if (triangles.size() != 2) {
-    eLog() << Verbose(0) << "Baseline " << *this << " is connected to less than two triangles, Tesselation incomplete!" << endl;
+    eLog() << Verbose(1) << "Baseline " << *this << " is connected to less than two triangles, Tesselation incomplete!" << endl;
     return true;
   }
   // check normal vectors
   // have a normal vector on the base line pointing outwards
-  //Log() << Verbose(0) << "INFO: " << *this << " has vectors at " << *(endpoints[0]->node->node) << " and at " << *(endpoints[1]->node->node) << "." << endl;
+  //Log() << Verbose(3) << "INFO: " << *this << " has vectors at " << *(endpoints[0]->node->node) << " and at " << *(endpoints[1]->node->node) << "." << endl;
   BaseLineCenter.CopyVector(endpoints[0]->node->node);
   BaseLineCenter.AddVector(endpoints[1]->node->node);
@@ -214 +199 @@
   BaseLine.CopyVector(endpoints[0]->node->node);
   BaseLine.SubtractVector(endpoints[1]->node->node);
-  //Log() << Verbose(0) << "INFO: Baseline is " << BaseLine << " and its center is at " << BaseLineCenter << "." << endl;
+  //Log() << Verbose(3) << "INFO: Baseline is " << BaseLine << " and its center is at " << BaseLineCenter << "." << endl;
 
   BaseLineNormal.Zero();
@@ -222 +207 @@
   class BoundaryPointSet *node = NULL;
   for(TriangleMap::iterator runner = triangles.begin(); runner != triangles.end(); runner++) {
-    //Log() << Verbose(0) << "INFO: NormalVector of " << *(runner->second) << " is " << runner->second->NormalVector << "." << endl;
+    //Log() << Verbose(3) << "INFO: NormalVector of " << *(runner->second) << " is " << runner->second->NormalVector << "." << endl;
     NormalCheck.AddVector(&runner->second->NormalVector);
     NormalCheck.Scale(sign);
@@ -229 +214 @@
       BaseLineNormal.CopyVector(&runner->second->NormalVector);   // yes, copy second on top of first
     else {
-      eLog() << Verbose(0) << "Triangle " << *runner->second << " has zero normal vector!" << endl;
+      Log() << Verbose(1) << "CRITICAL: Triangle " << *runner->second << " has zero normal vector!" << endl;
+      exit(255);
     }
     node = runner->second->GetThirdEndpoint(this);
     if (node != NULL) {
-      //Log() << Verbose(0) << "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << "." << endl;
+      //Log() << Verbose(3) << "INFO: Third node for triangle " << *(runner->second) << " is " << *node << " at " << *(node->node->node) << "." << endl;
       helper[i].CopyVector(node->node->node);
       helper[i].SubtractVector(&BaseLineCenter);
       helper[i].MakeNormalVector(&BaseLine);  // we want to compare the triangle's heights' angles!
-      //Log() << Verbose(0) << "INFO: Height vector with respect to baseline is " << helper[i] << "." << endl;
+      //Log() << Verbose(4) << "INFO: Height vector with respect to baseline is " << helper[i] << "." << endl;
       i++;
     } else {
-      eLog() << Verbose(1) << "I cannot find third node in triangle, something's wrong." << endl;
+      //eLog() << Verbose(1) << "I cannot find third node in triangle, something's wrong." << endl;
       return true;
     }
   }
-  //Log() << Verbose(0) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
+  //Log() << Verbose(3) << "INFO: BaselineNormal is " << BaseLineNormal << "." << endl;
   if (NormalCheck.NormSquared() < MYEPSILON) {
-    Log() << Verbose(0) << "ACCEPT: Normalvectors of both triangles are the same: convex." << endl;
+    Log() << Verbose(3) << "ACCEPT: Normalvectors of both triangles are the same: convex." << endl;
     return true;
   }
@@ -252 +238 @@
   double angle = GetAngle(helper[0], helper[1], BaseLineNormal);
   if ((angle - M_PI) > -MYEPSILON) {
-    Log() << Verbose(0) << "ACCEPT: Angle is greater than pi: convex." << endl;
+    Log() << Verbose(3) << "ACCEPT: Angle is greater than pi: convex." << endl;
     return true;
   } else {
-    Log() << Verbose(0) << "REJECT: Angle is less than pi: concave." << endl;
+    Log() << Verbose(3) << "REJECT: Angle is less than pi: concave." << endl;
     return false;
   }
@@ -266 +252 @@
 bool BoundaryLineSet::ContainsBoundaryPoint(class BoundaryPointSet *point)
 {
-        Info FunctionInfo(__func__);
   for(int i=0;i<2;i++)
     if (point == endpoints[i])
@@ -279 +264 @@
 class BoundaryPointSet *BoundaryLineSet::GetOtherEndpoint(class BoundaryPointSet *point)
 {
-        Info FunctionInfo(__func__);
   if (endpoints[0] == point)
     return endpoints[1];
@@ -302 +286 @@
 /** Constructor for BoundaryTriangleSet.
  */
-BoundaryTriangleSet::BoundaryTriangleSet() :
-  Nr(-1)
-{
-        Info FunctionInfo(__func__);
+BoundaryTriangleSet::BoundaryTriangleSet()
+{
   for (int i = 0; i < 3; i++)
     {
@@ -311 +293 @@
       lines[i] = NULL;
     }
+  Nr = -1;
 };
 
@@ -317 +300 @@
  * \param number number of triangle
  */
-BoundaryTriangleSet::BoundaryTriangleSet(class BoundaryLineSet *line[3], int number) :
-  Nr(number)
-{
-        Info FunctionInfo(__func__);
+BoundaryTriangleSet::BoundaryTriangleSet(class BoundaryLineSet *line[3], int number)
+{
   // set number
+  Nr = number;
   // set lines
-  for (int i = 0; i < 3; i++) {
-    lines[i] = line[i];
-    lines[i]->AddTriangle(this);
-  }
+  Log() << Verbose(5) << "New triangle " << Nr << ":" << endl;
+  for (int i = 0; i < 3; i++)
+    {
+      lines[i] = line[i];
+      lines[i]->AddTriangle(this);
+    }
   // get ascending order of endpoints
-  PointMap OrderMap;
+  map<int, class BoundaryPointSet *> OrderMap;
   for (int i = 0; i < 3; i++)
     // for all three lines
-    for (int j = 0; j < 2; j++) { // for both endpoints
-      OrderMap.insert(pair<int, class BoundaryPointSet *> (
-          line[i]->endpoints[j]->Nr, line[i]->endpoints[j]));
-      // and we don't care whether insertion fails
-    }
+    for (int j = 0; j < 2; j++)
+      { // for both endpoints
+        OrderMap.insert(pair<int, class BoundaryPointSet *> (
+            line[i]->endpoints[j]->Nr, line[i]->endpoints[j]));
+        // and we don't care whether insertion fails
+      }
   // set endpoints
   int Counter = 0;
-  Log() << Verbose(0) << "New triangle " << Nr << " with end points: " << endl;
-  for (PointMap::iterator runner = OrderMap.begin(); runner != OrderMap.end(); runner++) {
-    endpoints[Counter] = runner->second;
-    Log() << Verbose(0) << " " << *endpoints[Counter] << endl;
-    Counter++;
-  }
-  if (Counter < 3) {
-    eLog() << Verbose(0) << "We have a triangle with only two distinct endpoints!" << endl;
-    performCriticalExit();
-  }
+  Log() << Verbose(6) << " with end points ";
+  for (map<int, class BoundaryPointSet *>::iterator runner = OrderMap.begin(); runner
+      != OrderMap.end(); runner++)
+    {
+      endpoints[Counter] = runner->second;
+      Log() << Verbose(0) << " " << *endpoints[Counter];
+      Counter++;
+    }
+  if (Counter < 3)
+    {
+      eLog() << Verbose(0) << "ERROR! We have a triangle with only two distinct endpoints!" << endl;
+      performCriticalExit();
+    }
+  Log() << Verbose(0) << "." << endl;
 };
 
@@ -356 +345 @@
 BoundaryTriangleSet::~BoundaryTriangleSet()
 {
-        Info FunctionInfo(__func__);
   for (int i = 0; i < 3; i++) {
     if (lines[i] != NULL) {
       if (lines[i]->triangles.erase(Nr)) {
-        //Log() << Verbose(0) << "Triangle Nr." << Nr << " erased in line " << *lines[i] << "." << endl;
+        //Log() << Verbose(5) << "Triangle Nr." << Nr << " erased in line " << *lines[i] << "." << endl;
       }
       if (lines[i]->triangles.empty()) {
-          //Log() << Verbose(0) << *lines[i] << " is no more attached to any triangle, erasing." << endl;
+          //Log() << Verbose(5) << *lines[i] << " is no more attached to any triangle, erasing." << endl;
           delete (lines[i]);
           lines[i] = NULL;
@@ -369 +357 @@
     }
   }
-  //Log() << Verbose(0) << "Erasing triangle Nr." << Nr << " itself." << endl;
+  //Log() << Verbose(5) << "Erasing triangle Nr." << Nr << " itself." << endl;
 };
 
@@ -378 +366 @@
 void BoundaryTriangleSet::GetNormalVector(Vector &OtherVector)
 {
-        Info FunctionInfo(__func__);
   // get normal vector
   NormalVector.MakeNormalVector(endpoints[0]->node->node, endpoints[1]->node->node, endpoints[2]->node->node);
@@ -385 +372 @@
   if (NormalVector.ScalarProduct(&OtherVector) > 0.)
     NormalVector.Scale(-1.);
-  Log() << Verbose(1) << "Normal Vector is " << NormalVector << "." << endl;
 };
 
@@ -402 +388 @@
 bool BoundaryTriangleSet::GetIntersectionInsideTriangle(Vector *MolCenter, Vector *x, Vector *Intersection)
 {
-        Info FunctionInfo(__func__);
   Vector CrossPoint;
   Vector helper;
 
   if (!Intersection->GetIntersectionWithPlane(&NormalVector, endpoints[0]->node->node, MolCenter, x)) {
-    eLog() << Verbose(1) << "Alas! Intersection with plane failed - at least numerically - the intersection is not on the plane!" << endl;
+    Log() << Verbose(1) << "Alas! Intersection with plane failed - at least numerically - the intersection is not on the plane!" << endl;
     return false;
   }
@@ -423 +408 @@
   } while (CrossPoint.NormSquared() < MYEPSILON);
   if (i==3) {
-    eLog() << Verbose(0) << "Could not find any cross points, something's utterly wrong here!" << endl;
+    eLog() << Verbose(1) << "Could not find any cross points, something's utterly wrong here!" << endl;
+    exit(255);
   }
   CrossPoint.SubtractVector(endpoints[i%3]->node->node);  // cross point was returned as absolute vector
@@ -442 +428 @@
 bool BoundaryTriangleSet::ContainsBoundaryLine(class BoundaryLineSet *line)
 {
-        Info FunctionInfo(__func__);
   for(int i=0;i<3;i++)
     if (line == lines[i])
@@ -455 +440 @@
 bool BoundaryTriangleSet::ContainsBoundaryPoint(class BoundaryPointSet *point)
 {
-        Info FunctionInfo(__func__);
   for(int i=0;i<3;i++)
     if (point == endpoints[i])
@@ -468 +452 @@
 bool BoundaryTriangleSet::ContainsBoundaryPoint(class TesselPoint *point)
 {
-        Info FunctionInfo(__func__);
   for(int i=0;i<3;i++)
     if (point == endpoints[i]->node)
@@ -481 +464 @@
 bool BoundaryTriangleSet::IsPresentTupel(class BoundaryPointSet *Points[3])
 {
-        Info FunctionInfo(__func__);
   return (((endpoints[0] == Points[0])
             || (endpoints[0] == Points[1])
@@ -503 +485 @@
 bool BoundaryTriangleSet::IsPresentTupel(class BoundaryTriangleSet *T)
 {
-        Info FunctionInfo(__func__);
   return (((endpoints[0] == T->endpoints[0])
             || (endpoints[0] == T->endpoints[1])
@@ -525 +506 @@
 class BoundaryPointSet *BoundaryTriangleSet::GetThirdEndpoint(class BoundaryLineSet *line)
 {
-        Info FunctionInfo(__func__);
   // sanity check
   if (!ContainsBoundaryLine(line))
@@ -542 +522 @@
 void BoundaryTriangleSet::GetCenter(Vector *center)
 {
-        Info FunctionInfo(__func__);
   center->Zero();
   for(int i=0;i<3;i++)
@@ -555 +534 @@
 ostream &operator <<(ostream &ost, const BoundaryTriangleSet &a)
 {
-  ost << "[" << a.Nr << "|" << a.endpoints[0]->node->Name << "," << a.endpoints[1]->node->Name << "," << a.endpoints[2]->node->Name << "]";
-//  ost << "[" << a.Nr << "|" << a.endpoints[0]->node->Name << " at " << *a.endpoints[0]->node->node << ","
-//      << a.endpoints[1]->node->Name << " at " << *a.endpoints[1]->node->node << "," << a.endpoints[2]->node->Name << " at " << *a.endpoints[2]->node->node << "]";
+  ost << "[" << a.Nr << "|" << a.endpoints[0]->node->Name << " at " << *a.endpoints[0]->node->node << ","
+      << a.endpoints[1]->node->Name << " at " << *a.endpoints[1]->node->node << "," << a.endpoints[2]->node->Name << " at " << *a.endpoints[2]->node->node << "]";
   return ost;
 };
 
-// ======================================== Polygons on Boundary =================================
-
-/** Constructor for BoundaryPolygonSet.
- */
-BoundaryPolygonSet::BoundaryPolygonSet() :
-  Nr(-1)
-{
-  Info FunctionInfo(__func__);
-};
-
-/** Destructor of BoundaryPolygonSet.
- * Just clears endpoints.
- * \note When removing triangles from a class Tesselation, use RemoveTesselationTriangle()
- */
-BoundaryPolygonSet::~BoundaryPolygonSet()
-{
-  Info FunctionInfo(__func__);
-  endpoints.clear();
-  Log() << Verbose(1) << "Erasing polygon Nr." << Nr << " itself." << endl;
-};
-
-/** Calculates the normal vector for this triangle.
- * Is made unique by comparison with \a OtherVector to point in the other direction.
- * \param &OtherVector direction vector to make normal vector unique.
- * \return allocated vector in normal direction
- */
-Vector * BoundaryPolygonSet::GetNormalVector(const Vector &OtherVector) const
-{
-  Info FunctionInfo(__func__);
-  // get normal vector
-  Vector TemporaryNormal;
-  Vector *TotalNormal = new Vector;
-  PointSet::const_iterator Runner[3];
-  for (int i=0;i<3; i++) {
-    Runner[i] = endpoints.begin();
-    for (int j = 0; j<i; j++) { // go as much further
-      Runner[i]++;
-      if (Runner[i] == endpoints.end()) {
-        eLog() << Verbose(0) << "There are less than three endpoints in the polygon!" << endl;
-        performCriticalExit();
-      }
-    }
-  }
-  TotalNormal->Zero();
-  int counter=0;
-  for (; Runner[2] != endpoints.end(); ) {
-    TemporaryNormal.MakeNormalVector((*Runner[0])->node->node, (*Runner[1])->node->node, (*Runner[2])->node->node);
-    for (int i=0;i<3;i++) // increase each of them
-      Runner[i]++;
-    TotalNormal->AddVector(&TemporaryNormal);
-  }
-  TotalNormal->Scale(1./(double)counter);
-
-  // make it always point inward (any offset vector onto plane projected onto normal vector suffices)
-  if (TotalNormal->ScalarProduct(&OtherVector) > 0.)
-    TotalNormal->Scale(-1.);
-  Log() << Verbose(1) << "Normal Vector is " << *TotalNormal << "." << endl;
-
-  return TotalNormal;
-};
-
-/** Calculates the center point of the triangle.
- * Is third of the sum of all endpoints.
- * \param *center central point on return.
- */
-void BoundaryPolygonSet::GetCenter(Vector * const center) const
-{
-  Info FunctionInfo(__func__);
-  center->Zero();
-  int counter = 0;
-  for(PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    center->AddVector((*Runner)->node->node);
-    counter++;
-  }
-  center->Scale(1./(double)counter);
-  Log() << Verbose(1) << "Center is at " << *center << "." << endl;
-}
-
-/** Checks whether the polygons contains all three endpoints of the triangle.
- * \param *triangle triangle to test
- * \return true - triangle is contained polygon, false - is not
- */
-bool BoundaryPolygonSet::ContainsBoundaryTriangle(const BoundaryTriangleSet * const triangle) const
-{
-  Info FunctionInfo(__func__);
-  return ContainsPresentTupel(triangle->endpoints, 3);
-};
-
-/** Checks whether the polygons contains both endpoints of the line.
- * \param *line line to test
- * \return true - line is of the triangle, false - is not
- */
-bool BoundaryPolygonSet::ContainsBoundaryLine(const BoundaryLineSet * const line) const
-{
-  Info FunctionInfo(__func__);
-  return ContainsPresentTupel(line->endpoints, 2);
-};
-
-/** Checks whether point is any of the three endpoints this triangle contains.
- * \param *point point to test
- * \return true - point is of the triangle, false - is not
- */
-bool BoundaryPolygonSet::ContainsBoundaryPoint(const BoundaryPointSet * const point) const
-{
-  Info FunctionInfo(__func__);
-  for(PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    Log() << Verbose(0) << "Checking against " << **Runner << endl;
-    if (point == (*Runner)) {
-      Log() << Verbose(0) << " Contained." << endl;
-      return true;
-    }
-  }
-  Log() << Verbose(0) << " Not contained." << endl;
-  return false;
-};
-
-/** Checks whether point is any of the three endpoints this triangle contains.
- * \param *point TesselPoint to test
- * \return true - point is of the triangle, false - is not
- */
-bool BoundaryPolygonSet::ContainsBoundaryPoint(const TesselPoint * const point) const
-{
-  Info FunctionInfo(__func__);
-  for(PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++)
-    if (point == (*Runner)->node) {
-      Log() << Verbose(0) << " Contained." << endl;
-      return true;
-    }
-  Log() << Verbose(0) << " Not contained." << endl;
-  return false;
-};
-
-/** Checks whether given array of \a *Points coincide with polygons's endpoints.
- * \param **Points pointer to an array of BoundaryPointSet
- * \param dim dimension of array
- * \return true - set of points is contained in polygon, false - is not
- */
-bool BoundaryPolygonSet::ContainsPresentTupel(const BoundaryPointSet * const * Points, const int dim) const
-{
-  Info FunctionInfo(__func__);
-  int counter = 0;
-  Log() << Verbose(1) << "Polygon is " << *this << endl;
-  for(int i=0;i<dim;i++) {
-    Log() << Verbose(1) << " Testing endpoint " << *Points[i] << endl;
-    if (ContainsBoundaryPoint(Points[i])) {
-      counter++;
-    }
-  }
-
-  if (counter == dim)
-    return true;
-  else
-    return false;
-};
-
-/** Checks whether given PointList coincide with polygons's endpoints.
- * \param &endpoints PointList
- * \return true - set of points is contained in polygon, false - is not
- */
-bool BoundaryPolygonSet::ContainsPresentTupel(const PointSet &endpoints) const
-{
-  Info FunctionInfo(__func__);
-  size_t counter = 0;
-  Log() << Verbose(1) << "Polygon is " << *this << endl;
-  for(PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++) {
-    Log() << Verbose(1) << " Testing endpoint " << **Runner << endl;
-    if (ContainsBoundaryPoint(*Runner))
-      counter++;
-  }
-
-  if (counter == endpoints.size())
-    return true;
-  else
-    return false;
-};
-
-/** Checks whether given set of \a *Points coincide with polygons's endpoints.
- * \param *P pointer to BoundaryPolygonSet
- * \return true - is the very triangle, false - is not
- */
-bool BoundaryPolygonSet::ContainsPresentTupel(const BoundaryPolygonSet * const P) const
-{
-  return ContainsPresentTupel((const PointSet)P->endpoints);
-};
-
-/** Gathers all the endpoints' triangles in a unique set.
- * \return set of all triangles
- */
-TriangleSet * BoundaryPolygonSet::GetAllContainedTrianglesFromEndpoints() const
-{
-  Info FunctionInfo(__func__);
-  pair <TriangleSet::iterator, bool> Tester;
-  TriangleSet *triangles = new TriangleSet;
-
-  for(PointSet::const_iterator Runner = endpoints.begin(); Runner != endpoints.end(); Runner++)
-    for(LineMap::const_iterator Walker = (*Runner)->lines.begin(); Walker != (*Runner)->lines.end(); Walker++)
-      for(TriangleMap::const_iterator Sprinter = (Walker->second)->triangles.begin(); Sprinter != (Walker->second)->triangles.end(); Sprinter++) {
-        //Log() << Verbose(0) << " Testing triangle " << *(Sprinter->second) << endl;
-        if (ContainsBoundaryTriangle(Sprinter->second)) {
-          Tester = triangles->insert(Sprinter->second);
-          if (Tester.second)
-            Log() << Verbose(0) << "Adding triangle " << *(Sprinter->second) << endl;
-        }
-      }
-
-  Log() << Verbose(1) << "The Polygon of " << endpoints.size() << " endpoints has " << triangles->size() << " unique triangles in total." << endl;
-  return triangles;
-};
-
-/** Fills the endpoints of this polygon from the triangles attached to \a *line.
- * \param *line lines with triangles attached
- * \return true - polygon contains endpoints, false - line was NULL
- */
-bool BoundaryPolygonSet::FillPolygonFromTrianglesOfLine(const BoundaryLineSet * const line)
-{
-  Info FunctionInfo(__func__);
-  pair <PointSet::iterator, bool> Tester;
-  if (line == NULL)
-    return false;
-  Log() << Verbose(1) << "Filling polygon from line " << *line << endl;
-  for(TriangleMap::const_iterator Runner = line->triangles.begin(); Runner != line->triangles.end(); Runner++) {
-    for (int i=0;i<3;i++) {
-      Tester = endpoints.insert((Runner->second)->endpoints[i]);
-      if (Tester.second)
-        Log() << Verbose(1) << "  Inserting endpoint " << *((Runner->second)->endpoints[i]) << endl;
-    }
-  }
-
-  return true;
-};
-
-/** output operator for BoundaryPolygonSet.
- * \param &ost output stream
- * \param &a boundary polygon
- */
-ostream &operator <<(ostream &ost, const BoundaryPolygonSet &a)
-{
-  ost << "[" << a.Nr << "|";
-  for(PointSet::const_iterator Runner = a.endpoints.begin(); Runner != a.endpoints.end();) {
-   ost << (*Runner)->node->Name;
-   Runner++;
-   if (Runner != a.endpoints.end())
-     ost << ",";
-  }
-  ost<< "]";
-  return ost;
-};
-
 // =========================================================== class TESSELPOINT ===========================================
 
@@ -815 +545 @@
 TesselPoint::TesselPoint()
 {
-  Info FunctionInfo(__func__);
   node = NULL;
   nr = -1;
@@ -825 +554 @@
 TesselPoint::~TesselPoint()
 {
-  Info FunctionInfo(__func__);
 };
 
@@ -840 +568 @@
 ostream & TesselPoint::operator << (ostream &ost)
 {
-        Info FunctionInfo(__func__);
-  ost << "[" << (nr) << "|" << this << "]";
+  ost << "[" << (Name) << "|" << this << "]";
   return ost;
 };
@@ -852 +579 @@
 PointCloud::PointCloud()
 {
-        Info FunctionInfo(__func__);
+
 };
 
@@ -859 +586 @@
 PointCloud::~PointCloud()
 {
-        Info FunctionInfo(__func__);
+
 };
 
@@ -866 +593 @@
 /** Constructor of class CandidateForTesselation.
  */
-CandidateForTesselation::CandidateForTesselation (BoundaryLineSet* line) :
-  BaseLine(line),
-  ShortestAngle(2.*M_PI),
-  OtherShortestAngle(2.*M_PI)
-{
-        Info FunctionInfo(__func__);
-};
-
-
-/** Constructor of class CandidateForTesselation.
- */
-CandidateForTesselation::CandidateForTesselation (TesselPoint *candidate, BoundaryLineSet* line, Vector OptCandidateCenter, Vector OtherOptCandidateCenter) :
-    BaseLine(line),
-    IsDegenerated(false),
-    ShortestAngle(2.*M_PI),
-    OtherShortestAngle(2.*M_PI)
-{
-        Info FunctionInfo(__func__);
+CandidateForTesselation::CandidateForTesselation(TesselPoint *candidate, BoundaryLineSet* line, Vector OptCandidateCenter, Vector OtherOptCandidateCenter) {
+  point = candidate;
+  BaseLine = line;
   OptCenter.CopyVector(&OptCandidateCenter);
   OtherOptCenter.CopyVector(&OtherOptCandidateCenter);
@@ -891 +603 @@
  */
 CandidateForTesselation::~CandidateForTesselation() {
+  point = NULL;
   BaseLine = NULL;
 };
 
-/** output operator for CandidateForTesselation.
- * \param &ost output stream
- * \param &a boundary line
- */
-ostream & operator <<(ostream &ost, const  CandidateForTesselation &a)
-{
-  ost << "[" << a.BaseLine->Nr << "|" << a.BaseLine->endpoints[0]->node->Name << "," << a.BaseLine->endpoints[1]->node->Name << "] with ";
-  if (a.pointlist.empty())
-    ost << "no candidate.";
-  else {
-    ost << "candidate";
-    if (a.pointlist.size() != 1)
-      ost << "s ";
-    else
-      ost << " ";
-    for (TesselPointList::const_iterator Runner = a.pointlist.begin(); Runner != a.pointlist.end(); Runner++)
-      ost << *(*Runner) << " ";
-    ost << " at angle " << (a.ShortestAngle)<< ".";
-  }
-
-  return ost;
-};
-
-
 // =========================================================== class TESSELATION ===========================================
 
 /** Constructor of class Tesselation.
  */
-Tesselation::Tesselation() :
-  PointsOnBoundaryCount(0),
-  LinesOnBoundaryCount(0),
-  TrianglesOnBoundaryCount(0),
-  LastTriangle(NULL),
-  TriangleFilesWritten(0),
-  InternalPointer(PointsOnBoundary.begin())
-{
-        Info FunctionInfo(__func__);
+Tesselation::Tesselation()
+{
+  PointsOnBoundaryCount = 0;
+  LinesOnBoundaryCount = 0;
+  TrianglesOnBoundaryCount = 0;
+  InternalPointer = PointsOnBoundary.begin();
+  LastTriangle = NULL;
+  TriangleFilesWritten = 0;
 }
 ;
@@ -939 +627 @@
 Tesselation::~Tesselation()
 {
-        Info FunctionInfo(__func__);
-  Log() << Verbose(0) << "Free'ing TesselStruct ... " << endl;
+  Log() << Verbose(1) << "Free'ing TesselStruct ... " << endl;
   for (TriangleMap::iterator runner = TrianglesOnBoundary.begin(); runner != TrianglesOnBoundary.end(); runner++) {
     if (runner->second != NULL) {
@@ -948 +635 @@
       eLog() << Verbose(1) << "The triangle " << runner->first << " has already been free'd." << endl;
   }
-  Log() << Verbose(0) << "This envelope was written to file " << TriangleFilesWritten << " times(s)." << endl;
+  Log() << Verbose(1) << "This envelope was written to file " << TriangleFilesWritten << " times(s)." << endl;
 }
 ;
@@ -957 +644 @@
 Vector * Tesselation::GetCenter(ofstream *out) const
 {
-        Info FunctionInfo(__func__);
   Vector *Center = new Vector(0.,0.,0.);
   int num=0;
@@ -973 +659 @@
 TesselPoint * Tesselation::GetPoint() const
 {
-        Info FunctionInfo(__func__);
   return (InternalPointer->second->node);
 };
@@ -982 +667 @@
 TesselPoint * Tesselation::GetTerminalPoint() const
 {
-        Info FunctionInfo(__func__);
   PointMap::const_iterator Runner = PointsOnBoundary.end();
   Runner--;
@@ -993 +677 @@
 void Tesselation::GoToNext() const
 {
-        Info FunctionInfo(__func__);
   if (InternalPointer != PointsOnBoundary.end())
     InternalPointer++;
@@ -1003 +686 @@
 void Tesselation::GoToPrevious() const
 {
-        Info FunctionInfo(__func__);
   if (InternalPointer != PointsOnBoundary.begin())
     InternalPointer--;
@@ -1013 +695 @@
 void Tesselation::GoToFirst() const
 {
-        Info FunctionInfo(__func__);
   InternalPointer = PointsOnBoundary.begin();
 };
@@ -1022 +703 @@
 void Tesselation::GoToLast() const
 {
-        Info FunctionInfo(__func__);
   InternalPointer = PointsOnBoundary.end();
   InternalPointer--;
@@ -1032 +712 @@
 bool Tesselation::IsEmpty() const
 {
-        Info FunctionInfo(__func__);
   return (PointsOnBoundary.empty());
 };
@@ -1041 +720 @@
 bool Tesselation::IsEnd() const
 {
-        Info FunctionInfo(__func__);
   return (InternalPointer == PointsOnBoundary.end());
 };
@@ -1054 +732 @@
 Tesselation::GuessStartingTriangle()
 {
-        Info FunctionInfo(__func__);
   // 4b. create a starting triangle
   // 4b1. create all distances
@@ -1101 +778 @@
           baseline->second.first->second->node->node,
           baseline->second.second->second->node->node);
-      Log() << Verbose(2) << "Plane vector of candidate triangle is " << PlaneVector << endl;
+      Log() << Verbose(2) << "Plane vector of candidate triangle is ";
+      PlaneVector.Output();
+      Log() << Verbose(0) << endl;
       // 4. loop over all points
       double sign = 0.;
@@ -1117 +796 @@
           if (fabs(distance) < 1e-4) // we need to have a small epsilon around 0 which is still ok
             continue;
-          Log() << Verbose(2) << "Projection of " << checker->second->node->Name << " yields distance of " << distance << "." << endl;
+          Log() << Verbose(3) << "Projection of " << checker->second->node->Name
+              << " yields distance of " << distance << "." << endl;
           tmp = distance / fabs(distance);
           // 4b. Any have different sign to than before? (i.e. would lie outside convex hull with this starting triangle)
@@ -1170 +850 @@
       if (checker == PointsOnBoundary.end())
         {
-          Log() << Verbose(2) << "Looks like we have a candidate!" << endl;
+          Log() << Verbose(0) << "Looks like we have a candidate!" << endl;
           break;
         }
@@ -1200 +880 @@
   else
     {
-      eLog() << Verbose(0) << "No starting triangle found." << endl;
+      Log() << Verbose(1) << "No starting triangle found." << endl;
+      exit(255);
     }
 }
@@ -1220 +901 @@
 void Tesselation::TesselateOnBoundary(const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   bool flag;
   PointMap::iterator winner;
@@ -1239 +919 @@
         // get peak point with respect to this base line's only triangle
         BTS = baseline->second->triangles.begin()->second; // there is only one triangle so far
-        Log() << Verbose(0) << "Current baseline is between " << *(baseline->second) << "." << endl;
+        Log() << Verbose(2) << "Current baseline is between " << *(baseline->second) << "." << endl;
         for (int i = 0; i < 3; i++)
           if ((BTS->endpoints[i] != baseline->second->endpoints[0]) && (BTS->endpoints[i] != baseline->second->endpoints[1]))
             peak = BTS->endpoints[i];
-        Log() << Verbose(1) << " and has peak " << *peak << "." << endl;
+        Log() << Verbose(3) << " and has peak " << *peak << "." << endl;
 
         // prepare some auxiliary vectors
@@ -1258 +938 @@
           CenterVector.AddVector(BTS->endpoints[i]->node->node);
         CenterVector.Scale(1. / 3.);
-        Log() << Verbose(2) << "CenterVector of base triangle is " << CenterVector << endl;
+        Log() << Verbose(4) << "CenterVector of base triangle is " << CenterVector << endl;
 
         // normal vector of triangle
@@ -1265 +945 @@
         BTS->GetNormalVector(NormalVector);
         NormalVector.CopyVector(&BTS->NormalVector);
-        Log() << Verbose(2) << "NormalVector of base triangle is " << NormalVector << endl;
+        Log() << Verbose(4) << "NormalVector of base triangle is " << NormalVector << endl;
 
         // vector in propagation direction (out of triangle)
@@ -1272 +952 @@
         TempVector.CopyVector(&CenterVector);
         TempVector.SubtractVector(baseline->second->endpoints[0]->node->node); // TempVector is vector on triangle plane pointing from one baseline egde towards center!
-        //Log() << Verbose(0) << "Projection of propagation onto temp: " << PropagationVector.Projection(&TempVector) << "." << endl;
+        //Log() << Verbose(2) << "Projection of propagation onto temp: " << PropagationVector.Projection(&TempVector) << "." << endl;
         if (PropagationVector.ScalarProduct(&TempVector) > 0) // make sure normal propagation vector points outward from baseline
           PropagationVector.Scale(-1.);
-        Log() << Verbose(2) << "PropagationVector of base triangle is " << PropagationVector << endl;
+        Log() << Verbose(4) << "PropagationVector of base triangle is " << PropagationVector << endl;
         winner = PointsOnBoundary.end();
 
@@ -1281 +961 @@
         for (PointMap::iterator target = PointsOnBoundary.begin(); target != PointsOnBoundary.end(); target++) {
           if ((target->second != baseline->second->endpoints[0]) && (target->second != baseline->second->endpoints[1])) { // don't take the same endpoints
-            Log() << Verbose(1) << "Target point is " << *(target->second) << ":" << endl;
+            Log() << Verbose(3) << "Target point is " << *(target->second) << ":" << endl;
 
             // first check direction, so that triangles don't intersect
@@ -1288 +968 @@
             VirtualNormalVector.ProjectOntoPlane(&NormalVector);
             TempAngle = VirtualNormalVector.Angle(&PropagationVector);
-            Log() << Verbose(2) << "VirtualNormalVector is " << VirtualNormalVector << " and PropagationVector is " << PropagationVector << "." << endl;
+            Log() << Verbose(4) << "VirtualNormalVector is " << VirtualNormalVector << " and PropagationVector is " << PropagationVector << "." << endl;
             if (TempAngle > (M_PI/2.)) { // no bends bigger than Pi/2 (90 degrees)
-              Log() << Verbose(2) << "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", bad direction!" << endl;
+              Log() << Verbose(4) << "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", bad direction!" << endl;
               continue;
             } else
-              Log() << Verbose(2) << "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", good direction!" << endl;
+              Log() << Verbose(4) << "Angle on triangle plane between propagation direction and base line to " << *(target->second) << " is " << TempAngle << ", good direction!" << endl;
 
             // check first and second endpoint (if any connecting line goes to target has at least not more than 1 triangle)
@@ -1299 +979 @@
             LineChecker[1] = baseline->second->endpoints[1]->lines.find(target->first);
             if (((LineChecker[0] != baseline->second->endpoints[0]->lines.end()) && (LineChecker[0]->second->triangles.size() == 2))) {
-              Log() << Verbose(2) << *(baseline->second->endpoints[0]) << " has line " << *(LineChecker[0]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[0]->second->triangles.size() << " triangles." << endl;
+              Log() << Verbose(4) << *(baseline->second->endpoints[0]) << " has line " << *(LineChecker[0]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[0]->second->triangles.size() << " triangles." << endl;
               continue;
             }
             if (((LineChecker[1] != baseline->second->endpoints[1]->lines.end()) && (LineChecker[1]->second->triangles.size() == 2))) {
-              Log() << Verbose(2) << *(baseline->second->endpoints[1]) << " has line " << *(LineChecker[1]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[1]->second->triangles.size() << " triangles." << endl;
+              Log() << Verbose(4) << *(baseline->second->endpoints[1]) << " has line " << *(LineChecker[1]->second) << " to " << *(target->second) << " as endpoint with " << LineChecker[1]->second->triangles.size() << " triangles." << endl;
               continue;
             }
@@ -1320 +1000 @@
             helper.ProjectOntoPlane(&TempVector);
             if (fabs(helper.NormSquared()) < MYEPSILON) {
-              Log() << Verbose(2) << "Chosen set of vectors is linear dependent." << endl;
+              Log() << Verbose(4) << "Chosen set of vectors is linear dependent." << endl;
               continue;
             }
@@ -1337 +1017 @@
             // calculate angle
             TempAngle = NormalVector.Angle(&VirtualNormalVector);
-            Log() << Verbose(2) << "NormalVector is " << VirtualNormalVector << " and the angle is " << TempAngle << "." << endl;
+            Log() << Verbose(4) << "NormalVector is " << VirtualNormalVector << " and the angle is " << TempAngle << "." << endl;
             if ((SmallestAngle - TempAngle) > MYEPSILON) { // set to new possible winner
               SmallestAngle = TempAngle;
               winner = target;
-              Log() << Verbose(2) << "New winner " << *winner->second->node << " due to smaller angle between normal vectors." << endl;
+              Log() << Verbose(4) << "New winner " << *winner->second->node << " due to smaller angle between normal vectors." << endl;
             } else if (fabs(SmallestAngle - TempAngle) < MYEPSILON) { // check the angle to propagation, both possible targets are in one plane! (their normals have same angle)
               // hence, check the angles to some normal direction from our base line but in this common plane of both targets...
@@ -1359 +1039 @@
                 SmallestAngle = TempAngle;
                 winner = target;
-                Log() << Verbose(2) << "New winner " << *winner->second->node << " due to smaller angle " << TempAngle << " to propagation direction." << endl;
+                Log() << Verbose(4) << "New winner " << *winner->second->node << " due to smaller angle " << TempAngle << " to propagation direction." << endl;
               } else
-                Log() << Verbose(2) << "Keeping old winner " << *winner->second->node << " due to smaller angle to propagation direction." << endl;
+                Log() << Verbose(4) << "Keeping old winner " << *winner->second->node << " due to smaller angle to propagation direction." << endl;
             } else
-              Log() << Verbose(2) << "Keeping old winner " << *winner->second->node << " due to smaller angle between normal vectors." << endl;
+              Log() << Verbose(4) << "Keeping old winner " << *winner->second->node << " due to smaller angle between normal vectors." << endl;
           }
         } // end of loop over all boundary points
@@ -1369 +1049 @@
         // 5b. The point of the above whose triangle has the greatest angle with the triangle the current line belongs to (it only belongs to one, remember!): New triangle
         if (winner != PointsOnBoundary.end()) {
-          Log() << Verbose(0) << "Winning target point is " << *(winner->second) << " with angle " << SmallestAngle << "." << endl;
+          Log() << Verbose(2) << "Winning target point is " << *(winner->second) << " with angle " << SmallestAngle << "." << endl;
           // create the lins of not yet present
           BLS[0] = baseline->second;
@@ -1399 +1079 @@
           TrianglesOnBoundaryCount++;
         } else {
-          eLog() << Verbose(2) << "I could not determine a winner for this baseline " << *(baseline->second) << "." << endl;
+          Log() << Verbose(1) << "I could not determine a winner for this baseline " << *(baseline->second) << "." << endl;
         }
 
         // 5d. If the set of lines is not yet empty, go to 5. and continue
       } else
-        Log() << Verbose(0) << "Baseline candidate " << *(baseline->second) << " has a triangle count of " << baseline->second->triangles.size() << "." << endl;
+        Log() << Verbose(2) << "Baseline candidate " << *(baseline->second) << " has a triangle count of " << baseline->second->triangles.size() << "." << endl;
   } while (flag);
 
@@ -1419 +1099 @@
 bool Tesselation::InsertStraddlingPoints(const PointCloud *cloud, const LinkedCell *LC)
 {
-        Info FunctionInfo(__func__);
   Vector Intersection, Normal;
   TesselPoint *Walker = NULL;
@@ -1426 +1105 @@
   bool AddFlag = false;
   LinkedCell *BoundaryPoints = NULL;
+
+  Log() << Verbose(1) << "Begin of InsertStraddlingPoints" << endl;
 
   cloud->GoToFirst();
@@ -1436 +1117 @@
     }
     Walker = cloud->GetPoint();
-    Log() << Verbose(0) << "Current point is " << *Walker << "." << endl;
+    Log() << Verbose(2) << "Current point is " << *Walker << "." << endl;
     // get the next triangle
     triangles = FindClosestTrianglesToPoint(Walker->node, BoundaryPoints);
     BTS = triangles->front();
     if ((triangles == NULL) || (BTS->ContainsBoundaryPoint(Walker))) {
-      Log() << Verbose(0) << "No triangles found, probably a tesselation point itself." << endl;
+      Log() << Verbose(2) << "No triangles found, probably a tesselation point itself." << endl;
       cloud->GoToNext();
       continue;
     } else {
     }
-    Log() << Verbose(0) << "Closest triangle is " << *BTS << "." << endl;
+    Log() << Verbose(2) << "Closest triangle is " << *BTS << "." << endl;
     // get the intersection point
     if (BTS->GetIntersectionInsideTriangle(Center, Walker->node, &Intersection)) {
-      Log() << Verbose(0) << "We have an intersection at " << Intersection << "." << endl;
+      Log() << Verbose(2) << "We have an intersection at " << Intersection << "." << endl;
       // we have the intersection, check whether in- or outside of boundary
       if ((Center->DistanceSquared(Walker->node) - Center->DistanceSquared(&Intersection)) < -MYEPSILON) {
         // inside, next!
-        Log() << Verbose(0) << *Walker << " is inside wrt triangle " << *BTS << "." << endl;
+        Log() << Verbose(2) << *Walker << " is inside wrt triangle " << *BTS << "." << endl;
       } else {
         // outside!
-        Log() << Verbose(0) << *Walker << " is outside wrt triangle " << *BTS << "." << endl;
+        Log() << Verbose(2) << *Walker << " is outside wrt triangle " << *BTS << "." << endl;
         class BoundaryLineSet *OldLines[3], *NewLines[3];
         class BoundaryPointSet *OldPoints[3], *NewPoint;
@@ -1466 +1147 @@
         Normal.CopyVector(&BTS->NormalVector);
         // add Walker to boundary points
-        Log() << Verbose(0) << "Adding " << *Walker << " to BoundaryPoints." << endl;
+        Log() << Verbose(2) << "Adding " << *Walker << " to BoundaryPoints." << endl;
         AddFlag = true;
         if (AddBoundaryPoint(Walker,0))
@@ -1473 +1154 @@
           continue;
         // remove triangle
-        Log() << Verbose(0) << "Erasing triangle " << *BTS << "." << endl;
+        Log() << Verbose(2) << "Erasing triangle " << *BTS << "." << endl;
         TrianglesOnBoundary.erase(BTS->Nr);
         delete(BTS);
@@ -1481 +1162 @@
           BPS[1] = OldPoints[i];
           NewLines[i] = new class BoundaryLineSet(BPS, LinesOnBoundaryCount);
-          Log() << Verbose(1) << "Creating new line " << *NewLines[i] << "." << endl;
+          Log() << Verbose(3) << "Creating new line " << *NewLines[i] << "." << endl;
           LinesOnBoundary.insert(LinePair(LinesOnBoundaryCount, NewLines[i])); // no need for check for unique insertion as BPS[0] is definitely a new one
           LinesOnBoundaryCount++;
@@ -1492 +1173 @@
             if (NewLines[j]->IsConnectedTo(BLS[0])) {
               if (n>2) {
-                eLog() << Verbose(2) << BLS[0] << " connects to all of the new lines?!" << endl;
+                Log() << Verbose(1) << BLS[0] << " connects to all of the new lines?!" << endl;
                 return false;
               } else
@@ -1503 +1184 @@
           BTS->GetNormalVector(Normal);
           Normal.Scale(-1.);
-          Log() << Verbose(0) << "Created new triangle " << *BTS << "." << endl;
+          Log() << Verbose(2) << "Created new triangle " << *BTS << "." << endl;
           TrianglesOnBoundary.insert(TrianglePair(TrianglesOnBoundaryCount, BTS));
           TrianglesOnBoundaryCount++;
@@ -1517 +1198 @@
   // exit
   delete(Center);
+  Log() << Verbose(1) << "End of InsertStraddlingPoints" << endl;
   return true;
 };
@@ -1527 +1209 @@
 bool Tesselation::AddBoundaryPoint(TesselPoint * Walker, const int n)
 {
-        Info FunctionInfo(__func__);
   PointTestPair InsertUnique;
   BPS[n] = new class BoundaryPointSet(Walker);
@@ -1549 +1230 @@
 void Tesselation::AddTesselationPoint(TesselPoint* Candidate, const int n)
 {
-        Info FunctionInfo(__func__);
   PointTestPair InsertUnique;
   TPS[n] = new class BoundaryPointSet(Candidate);
@@ -1557 +1237 @@
   } else {
     delete TPS[n];
-    Log() << Verbose(0) << "Node " << *((InsertUnique.first)->second->node) << " is already present in PointsOnBoundary." << endl;
+    Log() << Verbose(4) << "Node " << *((InsertUnique.first)->second->node) << " is already present in PointsOnBoundary." << endl;
     TPS[n] = (InsertUnique.first)->second;
   }
@@ -1570 +1250 @@
 void Tesselation::SetTesselationPoint(TesselPoint* Candidate, const int n) const
 {
-        Info FunctionInfo(__func__);
   PointMap::const_iterator FindPoint = PointsOnBoundary.find(Candidate->nr);
   if (FindPoint != PointsOnBoundary.end())
@@ -1588 +1267 @@
   bool insertNewLine = true;
 
-  LineMap::iterator FindLine = a->lines.find(b->node->nr);
-  if (FindLine != a->lines.end()) {
-    Log() << Verbose(1) << "INFO: There is at least one line between " << *a << " and " << *b << ": " << *(FindLine->second) << "." << endl;
-
+  if (a->lines.find(b->node->nr) != a->lines.end()) {
+    LineMap::iterator FindLine = a->lines.find(b->node->nr);
     pair<LineMap::iterator,LineMap::iterator> FindPair;
     FindPair = a->lines.equal_range(b->node->nr);
+    Log() << Verbose(5) << "INFO: There is at least one line between " << *a << " and " << *b << ": " << *(FindLine->second) << "." << endl;
 
     for (FindLine = FindPair.first; FindLine != FindPair.second; FindLine++) {
@@ -1599 +1277 @@
       if (FindLine->second->triangles.size() < 2) {
         insertNewLine = false;
-        Log() << Verbose(0) << "Using existing line " << *FindLine->second << endl;
+        Log() << Verbose(4) << "Using existing line " << *FindLine->second << endl;
 
         BPS[0] = FindLine->second->endpoints[0];
         BPS[1] = FindLine->second->endpoints[1];
         BLS[n] = FindLine->second;
-
-        // remove existing line from OpenLines
-        CandidateMap::iterator CandidateLine = OpenLines.find(BLS[n]);
-        if (CandidateLine != OpenLines.end()) {
-          Log() << Verbose(1) << " Removing line from OpenLines." << endl;
-          delete(CandidateLine->second);
-          OpenLines.erase(CandidateLine);
-        } else {
-          eLog() << Verbose(1) << "Line exists and is attached to less than two triangles, but not in OpenLines!" << endl;
-        }
 
         break;
@@ -1636 +1304 @@
 void Tesselation::AlwaysAddTesselationTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, const int n)
 {
-        Info FunctionInfo(__func__);
-  Log() << Verbose(0) << "Adding open line [" << LinesOnBoundaryCount << "|" << *(a->node) << " and " << *(b->node) << "." << endl;
+  Log() << Verbose(4) << "Adding line [" << LinesOnBoundaryCount << "|" << *(a->node) << " and " << *(b->node) << "." << endl;
   BPS[0] = a;
   BPS[1] = b;
@@ -1645 +1312 @@
   // increase counter
   LinesOnBoundaryCount++;
-  // also add to open lines
-  CandidateForTesselation *CFT = new CandidateForTesselation(BLS[n]);
-  OpenLines.insert(pair< BoundaryLineSet *, CandidateForTesselation *> (BLS[n], CFT));
 };
 
@@ -1655 +1319 @@
 void Tesselation::AddTesselationTriangle()
 {
-        Info FunctionInfo(__func__);
   Log() << Verbose(1) << "Adding triangle to global TrianglesOnBoundary map." << endl;
 
@@ -1674 +1337 @@
 void Tesselation::AddTesselationTriangle(const int nr)
 {
-        Info FunctionInfo(__func__);
-  Log() << Verbose(0) << "Adding triangle to global TrianglesOnBoundary map." << endl;
+  Log() << Verbose(1) << "Adding triangle to global TrianglesOnBoundary map." << endl;
 
   // add triangle to global map
@@ -1693 +1355 @@
 void Tesselation::RemoveTesselationTriangle(class BoundaryTriangleSet *triangle)
 {
-        Info FunctionInfo(__func__);
   if (triangle == NULL)
     return;
   for (int i = 0; i < 3; i++) {
     if (triangle->lines[i] != NULL) {
-      Log() << Verbose(0) << "Removing triangle Nr." << triangle->Nr << " in line " << *triangle->lines[i] << "." << endl;
+      Log() << Verbose(5) << "Removing triangle Nr." << triangle->Nr << " in line " << *triangle->lines[i] << "." << endl;
       triangle->lines[i]->triangles.erase(triangle->Nr);
       if (triangle->lines[i]->triangles.empty()) {
-          Log() << Verbose(0) << *triangle->lines[i] << " is no more attached to any triangle, erasing." << endl;
+          Log() << Verbose(5) << *triangle->lines[i] << " is no more attached to any triangle, erasing." << endl;
           RemoveTesselationLine(triangle->lines[i]);
       } else {
-        Log() << Verbose(0) << *triangle->lines[i] << " is still attached to another triangle: ";
-        OpenLines.insert(pair< BoundaryLineSet *, CandidateForTesselation *> (triangle->lines[i], NULL));
+        Log() << Verbose(5) << *triangle->lines[i] << " is still attached to another triangle: ";
         for(TriangleMap::iterator TriangleRunner = triangle->lines[i]->triangles.begin(); TriangleRunner != triangle->lines[i]->triangles.end(); TriangleRunner++)
           Log() << Verbose(0) << "[" << (TriangleRunner->second)->Nr << "|" << *((TriangleRunner->second)->endpoints[0]) << ", " << *((TriangleRunner->second)->endpoints[1]) << ", " << *((TriangleRunner->second)->endpoints[2]) << "] \t";
         Log() << Verbose(0) << endl;
 //        for (int j=0;j<2;j++) {
-//          Log() << Verbose(0) << "Lines of endpoint " << *(triangle->lines[i]->endpoints[j]) << ": ";
+//          Log() << Verbose(5) << "Lines of endpoint " << *(triangle->lines[i]->endpoints[j]) << ": ";
 //          for(LineMap::iterator LineRunner = triangle->lines[i]->endpoints[j]->lines.begin(); LineRunner != triangle->lines[i]->endpoints[j]->lines.end(); LineRunner++)
 //            Log() << Verbose(0) << "[" << *(LineRunner->second) << "] \t";
@@ -1722 +1382 @@
 
   if (TrianglesOnBoundary.erase(triangle->Nr))
-    Log() << Verbose(0) << "Removing triangle Nr. " << triangle->Nr << "." << endl;
+    Log() << Verbose(5) << "Removing triangle Nr. " << triangle->Nr << "." << endl;
   delete(triangle);
 };
@@ -1732 +1392 @@
 void Tesselation::RemoveTesselationLine(class BoundaryLineSet *line)
 {
-        Info FunctionInfo(__func__);
   int Numbers[2];
 
@@ -1753 +1412 @@
         for (LineMap::iterator Runner = erasor.first; Runner != erasor.second; Runner++)
           if ((*Runner).second == line) {
-            Log() << Verbose(0) << "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << "." << endl;
+            Log() << Verbose(5) << "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << "." << endl;
             line->endpoints[i]->lines.erase(Runner);
             break;
@@ -1759 +1418 @@
       } else { // there's just a single line left
         if (line->endpoints[i]->lines.erase(line->Nr))
-          Log() << Verbose(0) << "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << "." << endl;
+          Log() << Verbose(5) << "Removing Line Nr. " << line->Nr << " in boundary point " << *line->endpoints[i] << "." << endl;
       }
       if (line->endpoints[i]->lines.empty()) {
-        Log() << Verbose(0) << *line->endpoints[i] << " has no more lines it's attached to, erasing." << endl;
+        Log() << Verbose(5) << *line->endpoints[i] << " has no more lines it's attached to, erasing." << endl;
         RemoveTesselationPoint(line->endpoints[i]);
       } else {
-        Log() << Verbose(0) << *line->endpoints[i] << " has still lines it's attached to: ";
+        Log() << Verbose(5) << *line->endpoints[i] << " has still lines it's attached to: ";
         for(LineMap::iterator LineRunner = line->endpoints[i]->lines.begin(); LineRunner != line->endpoints[i]->lines.end(); LineRunner++)
           Log() << Verbose(0) << "[" << *(LineRunner->second) << "] \t";
@@ -1778 +1437 @@
 
   if (LinesOnBoundary.erase(line->Nr))
-    Log() << Verbose(0) << "Removing line Nr. " << line->Nr << "." << endl;
+    Log() << Verbose(5) << "Removing line Nr. " << line->Nr << "." << endl;
   delete(line);
 };
@@ -1789 +1448 @@
 void Tesselation::RemoveTesselationPoint(class BoundaryPointSet *point)
 {
-        Info FunctionInfo(__func__);
   if (point == NULL)
     return;
   if (PointsOnBoundary.erase(point->Nr))
-    Log() << Verbose(0) << "Removing point Nr. " << point->Nr << "." << endl;
+    Log() << Verbose(5) << "Removing point Nr. " << point->Nr << "." << endl;
   delete(point);
 };
@@ -1808 +1466 @@
 int Tesselation::CheckPresenceOfTriangle(TesselPoint *Candidates[3]) const
 {
-        Info FunctionInfo(__func__);
   int adjacentTriangleCount = 0;
   class BoundaryPointSet *Points[3];
 
+  Log() << Verbose(2) << "Begin of CheckPresenceOfTriangle" << endl;
   // builds a triangle point set (Points) of the end points
   for (int i = 0; i < 3; i++) {
@@ -1830 +1488 @@
           for (; (FindLine != Points[i]->lines.end()) && (FindLine->first == Points[j]->node->nr); FindLine++) {
             TriangleMap *triangles = &FindLine->second->triangles;
-            Log() << Verbose(1) << "Current line is " << FindLine->first << ": " << *(FindLine->second) << " with triangles " << triangles << "." << endl;
+            Log() << Verbose(3) << "Current line is " << FindLine->first << ": " << *(FindLine->second) << " with triangles " << triangles << "." << endl;
             for (TriangleMap::const_iterator FindTriangle = triangles->begin(); FindTriangle != triangles->end(); FindTriangle++) {
               if (FindTriangle->second->IsPresentTupel(Points)) {
@@ -1836 +1494 @@
               }
             }
-            Log() << Verbose(1) << "end." << endl;
+            Log() << Verbose(3) << "end." << endl;
           }
           // Only one of the triangle lines must be considered for the triangle count.
-          //Log() << Verbose(0) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
+          //Log() << Verbose(2) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
           //return adjacentTriangleCount;
         }
@@ -1846 +1504 @@
   }
 
-  Log() << Verbose(0) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
+  Log() << Verbose(2) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
+  Log() << Verbose(2) << "End of CheckPresenceOfTriangle" << endl;
   return adjacentTriangleCount;
 };
@@ -1860 +1519 @@
 class BoundaryTriangleSet * Tesselation::GetPresentTriangle(TesselPoint *Candidates[3])
 {
-        Info FunctionInfo(__func__);
   class BoundaryTriangleSet *triangle = NULL;
   class BoundaryPointSet *Points[3];
@@ -1890 +1548 @@
           }
           // Only one of the triangle lines must be considered for the triangle count.
-          //Log() << Verbose(0) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
+          //Log() << Verbose(2) << "Found " << adjacentTriangleCount << " adjacent triangles for the point set." << endl;
           //return adjacentTriangleCount;
         }
@@ -1911 +1569 @@
 void Tesselation::FindStartingTriangle(const double RADIUS, const LinkedCell *LC)
 {
-        Info FunctionInfo(__func__);
+  Log() << Verbose(1) << "Begin of FindStartingTriangle\n";
   int i = 0;
+  TesselPoint* FirstPoint = NULL;
+  TesselPoint* SecondPoint = NULL;
   TesselPoint* MaxPoint[NDIM];
-  TesselPoint* Temporary;
   double maxCoordinate[NDIM];
-  BoundaryLineSet BaseLine;
+  Vector Oben;
   Vector helper;
   Vector Chord;
   Vector SearchDirection;
-  Vector CircleCenter;  // center of the circle, i.e. of the band of sphere's centers
-  Vector CirclePlaneNormal; // normal vector defining the plane this circle lives in
-  Vector SphereCenter;
-  Vector NormalVector;
-
-  NormalVector.Zero();
+
+  Oben.Zero();
 
   for (i = 0; i < 3; i++) {
@@ -1938 +1593 @@
       for (LC->n[(i+2)%NDIM]=0;LC->n[(i+2)%NDIM]<LC->N[(i+2)%NDIM];LC->n[(i+2)%NDIM]++) {
         const LinkedNodes *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
+        //Log() << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
         if (List != NULL) {
           for (LinkedNodes::const_iterator Runner = List->begin();Runner != List->end();Runner++) {
             if ((*Runner)->node->x[i] > maxCoordinate[i]) {
-              Log() << Verbose(1) << "New maximal for axis " << i << " node is " << *(*Runner) << " at " << *(*Runner)->node << "." << endl;
+              Log() << Verbose(2) << "New maximal for axis " << i << " node is " << *(*Runner) << " at " << *(*Runner)->node << "." << endl;
               maxCoordinate[i] = (*Runner)->node->x[i];
               MaxPoint[i] = (*Runner);
@@ -1953 +1608 @@
   }
 
-  Log() << Verbose(1) << "Found maximum coordinates: ";
+  Log() << Verbose(2) << "Found maximum coordinates: ";
   for (int i=0;i<NDIM;i++)
     Log() << Verbose(0) << i << ": " << *MaxPoint[i] << "\t";
@@ -1959 +1614 @@
 
   BTS = NULL;
+  CandidateList *OptCandidates = new CandidateList();
   for (int k=0;k<NDIM;k++) {
-    NormalVector.Zero();
-    NormalVector.x[k] = 1.;
-    BaseLine.endpoints[0] = new BoundaryPointSet(MaxPoint[k]);
-    Log() << Verbose(0) << "Coordinates of start node at " << *BaseLine.endpoints[0]->node << "." << endl;
+    Oben.Zero();
+    Oben.x[k] = 1.;
+    FirstPoint = MaxPoint[k];
+    Log() << Verbose(1) << "Coordinates of start node at " << *FirstPoint->node << "." << endl;
 
     double ShortestAngle;
+    TesselPoint* OptCandidate = NULL;
     ShortestAngle = 999999.; // This will contain the angle, which will be always positive (when looking for second point), when looking for third point this will be the quadrant.
 
-    FindSecondPointForTesselation(BaseLine.endpoints[0]->node, NormalVector, Temporary, &ShortestAngle, RADIUS, LC); // we give same point as next candidate as its bonds are looked into in find_second_...
-    if (Temporary == NULL)  // have we found a second point?
+    FindSecondPointForTesselation(FirstPoint, Oben, OptCandidate, &ShortestAngle, RADIUS, LC); // we give same point as next candidate as its bonds are looked into in find_second_...
+    SecondPoint = OptCandidate;
+    if (SecondPoint == NULL)  // have we found a second point?
       continue;
-    BaseLine.endpoints[1] = new BoundaryPointSet(Temporary);
-
-    // construct center of circle
-    CircleCenter.CopyVector(BaseLine.endpoints[0]->node->node);
-    CircleCenter.AddVector(BaseLine.endpoints[1]->node->node);
-    CircleCenter.Scale(0.5);
-
-    // construct normal vector of circle
-    CirclePlaneNormal.CopyVector(BaseLine.endpoints[0]->node->node);
-    CirclePlaneNormal.SubtractVector(BaseLine.endpoints[1]->node->node);
-
-    double radius = CirclePlaneNormal.NormSquared();
+
+    helper.CopyVector(FirstPoint->node);
+    helper.SubtractVector(SecondPoint->node);
+    helper.Normalize();
+    Oben.ProjectOntoPlane(&helper);
+    Oben.Normalize();
+    helper.VectorProduct(&Oben);
+    ShortestAngle = 2.*M_PI; // This will indicate the quadrant.
+
+    Chord.CopyVector(FirstPoint->node); // bring into calling function
+    Chord.SubtractVector(SecondPoint->node);
+    double radius = Chord.ScalarProduct(&Chord);
     double CircleRadius = sqrt(RADIUS*RADIUS - radius/4.);
-
-    NormalVector.ProjectOntoPlane(&CirclePlaneNormal);
-    NormalVector.Normalize();
-    ShortestAngle = 2.*M_PI; // This will indicate the quadrant.
-
-    SphereCenter.CopyVector(&NormalVector);
-    SphereCenter.Scale(CircleRadius);
-    SphereCenter.AddVector(&CircleCenter);
-    // Now, NormalVector and SphereCenter are two orthonormalized vectors in the plane defined by CirclePlaneNormal (not normalized)
+    helper.CopyVector(&Oben);
+    helper.Scale(CircleRadius);
+    // Now, oben and helper are two orthonormalized vectors in the plane defined by Chord (not normalized)
 
     // look in one direction of baseline for initial candidate
-    SearchDirection.MakeNormalVector(&CirclePlaneNormal, &NormalVector);  // whether we look "left" first or "right" first is not important ...
+    SearchDirection.MakeNormalVector(&Chord, &Oben);  // whether we look "left" first or "right" first is not important ...
 
     // adding point 1 and point 2 and add the line between them
-    Log() << Verbose(0) << "Coordinates of start node at " << *BaseLine.endpoints[0]->node << "." << endl;
-    Log() << Verbose(0) << "Found second point is at " << *BaseLine.endpoints[1]->node << ".\n";
-
-    //Log() << Verbose(1) << "INFO: OldSphereCenter is at " << helper << ".\n";
-    CandidateForTesselation OptCandidates(&BaseLine);
-    FindThirdPointForTesselation(NormalVector, SearchDirection, SphereCenter, OptCandidates, NULL, RADIUS, LC);
-    Log() << Verbose(0) << "List of third Points is:" << endl;
-    for (TesselPointList::iterator it = OptCandidates.pointlist.begin(); it != OptCandidates.pointlist.end(); it++) {
-        Log() << Verbose(0) << " " << *(*it) << endl;
-    }
-
-    BTS = NULL;
-    AddCandidateTriangle(OptCandidates);
-//    delete(BaseLine.endpoints[0]);
-//    delete(BaseLine.endpoints[1]);
-
+    Log() << Verbose(1) << "Coordinates of start node at " << *FirstPoint->node << "." << endl;
+    AddTesselationPoint(FirstPoint, 0);
+    Log() << Verbose(1) << "Found second point is at " << *SecondPoint->node << ".\n";
+    AddTesselationPoint(SecondPoint, 1);
+    AddTesselationLine(TPS[0], TPS[1], 0);
+
+    //Log() << Verbose(2) << "INFO: OldSphereCenter is at " << helper << ".\n";
+    FindThirdPointForTesselation(Oben, SearchDirection, helper, BLS[0], NULL, *&OptCandidates, &ShortestAngle, RADIUS, LC);
+    Log() << Verbose(1) << "List of third Points is ";
+    for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+        Log() << Verbose(0) << " " << *(*it)->point;
+    }
+    Log() << Verbose(0) << endl;
+
+    for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+      // add third triangle point
+      AddTesselationPoint((*it)->point, 2);
+      // add the second and third line
+      AddTesselationLine(TPS[1], TPS[2], 1);
+      AddTesselationLine(TPS[0], TPS[2], 2);
+      // ... and triangles to the Maps of the Tesselation class
+      BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
+      AddTesselationTriangle();
+      // ... and calculate its normal vector (with correct orientation)
+      (*it)->OptCenter.Scale(-1.);
+      Log() << Verbose(2) << "Anti-Oben is currently " << (*it)->OptCenter << "." << endl;
+      BTS->GetNormalVector((*it)->OptCenter);  // vector to compare with should point inwards
+      Log() << Verbose(0) << "==> Found starting triangle consists of " << *FirstPoint << ", " << *SecondPoint << " and "
+      << *(*it)->point << " with normal vector " << BTS->NormalVector << ".\n";
+
+      // if we do not reach the end with the next step of iteration, we need to setup a new first line
+      if (it != OptCandidates->end()--) {
+        FirstPoint = (*it)->BaseLine->endpoints[0]->node;
+        SecondPoint = (*it)->point;
+        // adding point 1 and point 2 and the line between them
+        AddTesselationPoint(FirstPoint, 0);
+        AddTesselationPoint(SecondPoint, 1);
+        AddTesselationLine(TPS[0], TPS[1], 0);
+      }
+      Log() << Verbose(2) << "Projection is " << BTS->NormalVector.ScalarProduct(&Oben) << "." << endl;
+    }
     if (BTS != NULL) // we have created one starting triangle
       break;
     else {
       // remove all candidates from the list and then the list itself
-      OptCandidates.pointlist.clear();
-    }
-  }
+      class CandidateForTesselation *remover = NULL;
+      for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+        remover = *it;
+        delete(remover);
+      }
+      OptCandidates->clear();
+    }
+  }
+
+  // remove all candidates from the list and then the list itself
+  class CandidateForTesselation *remover = NULL;
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+    remover = *it;
+    delete(remover);
+  }
+  delete(OptCandidates);
+  Log() << Verbose(1) << "End of FindStartingTriangle\n";
 };
 
 /** Checks for a given baseline and a third point candidate whether baselines of the found triangle don't have even better candidates.
  * This is supposed to prevent early closing of the tesselation.
- * \param CandidateLine CandidateForTesselation with baseline and shortestangle , i.e. not \a *OptCandidate
+ * \param *BaseRay baseline, i.e. not \a *OptCandidate
  * \param *ThirdNode third point in triangle, not in BoundaryLineSet::endpoints
+ * \param ShortestAngle path length on this circle band for the current \a *ThirdNode
  * \param RADIUS radius of sphere
  * \param *LC LinkedCell structure
  * \return true - there is a better candidate (smaller angle than \a ShortestAngle), false - no better TesselPoint candidate found
  */
-//bool Tesselation::HasOtherBaselineBetterCandidate(CandidateForTesselation &CandidateLine, const TesselPoint * const ThirdNode, double RADIUS, const LinkedCell * const LC) const
-//{
-//      Info FunctionInfo(__func__);
-//  bool result = false;
-//  Vector CircleCenter;
-//  Vector CirclePlaneNormal;
-//  Vector OldSphereCenter;
-//  Vector SearchDirection;
-//  Vector helper;
-//  TesselPoint *OtherOptCandidate = NULL;
-//  double OtherShortestAngle = 2.*M_PI; // This will indicate the quadrant.
-//  double radius, CircleRadius;
-//  BoundaryLineSet *Line = NULL;
-//  BoundaryTriangleSet *T = NULL;
-//
-//  // check both other lines
-//  PointMap::const_iterator FindPoint = PointsOnBoundary.find(ThirdNode->nr);
-//  if (FindPoint != PointsOnBoundary.end()) {
-//    for (int i=0;i<2;i++) {
-//      LineMap::const_iterator FindLine = (FindPoint->second)->lines.find(BaseRay->endpoints[0]->node->nr);
-//      if (FindLine != (FindPoint->second)->lines.end()) {
-//        Line = FindLine->second;
-//        Log() << Verbose(0) << "Found line " << *Line << "." << endl;
-//        if (Line->triangles.size() == 1) {
-//          T = Line->triangles.begin()->second;
-//          // construct center of circle
-//          CircleCenter.CopyVector(Line->endpoints[0]->node->node);
-//          CircleCenter.AddVector(Line->endpoints[1]->node->node);
-//          CircleCenter.Scale(0.5);
-//
-//          // construct normal vector of circle
-//          CirclePlaneNormal.CopyVector(Line->endpoints[0]->node->node);
-//          CirclePlaneNormal.SubtractVector(Line->endpoints[1]->node->node);
-//
-//          // calculate squared radius of circle
-//          radius = CirclePlaneNormal.ScalarProduct(&CirclePlaneNormal);
-//          if (radius/4. < RADIUS*RADIUS) {
-//            CircleRadius = RADIUS*RADIUS - radius/4.;
-//            CirclePlaneNormal.Normalize();
-//            //Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
-//
-//            // construct old center
-//            GetCenterofCircumcircle(&OldSphereCenter, *T->endpoints[0]->node->node, *T->endpoints[1]->node->node, *T->endpoints[2]->node->node);
-//            helper.CopyVector(&T->NormalVector);  // normal vector ensures that this is correct center of the two possible ones
-//            radius = Line->endpoints[0]->node->node->DistanceSquared(&OldSphereCenter);
-//            helper.Scale(sqrt(RADIUS*RADIUS - radius));
-//            OldSphereCenter.AddVector(&helper);
-//            OldSphereCenter.SubtractVector(&CircleCenter);
-//            //Log() << Verbose(1) << "INFO: OldSphereCenter is at " << OldSphereCenter << "." << endl;
-//
-//            // construct SearchDirection
-//            SearchDirection.MakeNormalVector(&T->NormalVector, &CirclePlaneNormal);
-//            helper.CopyVector(Line->endpoints[0]->node->node);
-//            helper.SubtractVector(ThirdNode->node);
-//            if (helper.ScalarProduct(&SearchDirection) < -HULLEPSILON)// ohoh, SearchDirection points inwards!
-//              SearchDirection.Scale(-1.);
-//            SearchDirection.ProjectOntoPlane(&OldSphereCenter);
-//            SearchDirection.Normalize();
-//            Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
-//            if (fabs(OldSphereCenter.ScalarProduct(&SearchDirection)) > HULLEPSILON) {
-//              // rotated the wrong way!
-//              eLog() << Verbose(1) << "SearchDirection and RelativeOldSphereCenter are still not orthogonal!" << endl;
-//            }
-//
-//            // add third point
-//            FindThirdPointForTesselation(T->NormalVector, SearchDirection, OldSphereCenter, OptCandidates, ThirdNode, RADIUS, LC);
-//            for (TesselPointList::iterator it = OptCandidates.pointlist.begin(); it != OptCandidates.pointlist.end(); ++it) {
-//              if (((*it) == BaseRay->endpoints[0]->node) || ((*it) == BaseRay->endpoints[1]->node)) // skip if it's the same triangle than suggested
-//                continue;
-//              Log() << Verbose(0) << " Third point candidate is " << (*it)
-//              << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
-//              Log() << Verbose(0) << " Baseline is " << *BaseRay << endl;
-//
-//              // check whether all edges of the new triangle still have space for one more triangle (i.e. TriangleCount <2)
-//              TesselPoint *PointCandidates[3];
-//              PointCandidates[0] = (*it);
-//              PointCandidates[1] = BaseRay->endpoints[0]->node;
-//              PointCandidates[2] = BaseRay->endpoints[1]->node;
-//              bool check=false;
-//              int existentTrianglesCount = CheckPresenceOfTriangle(PointCandidates);
-//              // If there is no triangle, add it regularly.
-//              if (existentTrianglesCount == 0) {
-//                SetTesselationPoint((*it), 0);
-//                SetTesselationPoint(BaseRay->endpoints[0]->node, 1);
-//                SetTesselationPoint(BaseRay->endpoints[1]->node, 2);
-//
-//                if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const )TPS)) {
-//                  OtherOptCandidate = (*it);
-//                  check = true;
-//                }
-//              } else if ((existentTrianglesCount >= 1) && (existentTrianglesCount <= 3)) { // If there is a planar region within the structure, we need this triangle a second time.
-//                SetTesselationPoint((*it), 0);
-//                SetTesselationPoint(BaseRay->endpoints[0]->node, 1);
-//                SetTesselationPoint(BaseRay->endpoints[1]->node, 2);
-//
-//                // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
-//                // i.e. at least one of the three lines must be present with TriangleCount <= 1
-//                if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const)TPS)) {
-//                  OtherOptCandidate = (*it);
-//                  check = true;
-//                }
-//              }
-//
-//              if (check) {
-//                if (ShortestAngle > OtherShortestAngle) {
-//                  Log() << Verbose(0) << "There is a better candidate than " << *ThirdNode << " with " << ShortestAngle << " from baseline " << *Line << ": " << *OtherOptCandidate << " with " << OtherShortestAngle << "." << endl;
-//                  result = true;
-//                  break;
-//                }
-//              }
-//            }
-//            delete(OptCandidates);
-//            if (result)
-//              break;
-//          } else {
-//            Log() << Verbose(0) << "Circumcircle for base line " << *Line << " and base triangle " << T << " is too big!" << endl;
-//          }
-//        } else {
-//          eLog() << Verbose(2) << "Baseline is connected to two triangles already?" << endl;
-//        }
-//      } else {
-//        Log() << Verbose(1) << "No present baseline between " << BaseRay->endpoints[0] << " and candidate " << *ThirdNode << "." << endl;
-//      }
-//    }
-//  } else {
-//    eLog() << Verbose(1) << "Could not find the TesselPoint " << *ThirdNode << "." << endl;
-//  }
-//
-//  return result;
-//};
+bool Tesselation::HasOtherBaselineBetterCandidate(const BoundaryLineSet * const BaseRay, const TesselPoint * const ThirdNode, double ShortestAngle, double RADIUS, const LinkedCell * const LC) const
+{
+  bool result = false;
+  Vector CircleCenter;
+  Vector CirclePlaneNormal;
+  Vector OldSphereCenter;
+  Vector SearchDirection;
+  Vector helper;
+  TesselPoint *OtherOptCandidate = NULL;
+  double OtherShortestAngle = 2.*M_PI; // This will indicate the quadrant.
+  double radius, CircleRadius;
+  BoundaryLineSet *Line = NULL;
+  BoundaryTriangleSet *T = NULL;
+
+  Log() << Verbose(1) << "Begin of HasOtherBaselineBetterCandidate" << endl;
+
+  // check both other lines
+  PointMap::const_iterator FindPoint = PointsOnBoundary.find(ThirdNode->nr);
+  if (FindPoint != PointsOnBoundary.end()) {
+    for (int i=0;i<2;i++) {
+      LineMap::const_iterator FindLine = (FindPoint->second)->lines.find(BaseRay->endpoints[0]->node->nr);
+      if (FindLine != (FindPoint->second)->lines.end()) {
+        Line = FindLine->second;
+        Log() << Verbose(1) << "Found line " << *Line << "." << endl;
+        if (Line->triangles.size() == 1) {
+          T = Line->triangles.begin()->second;
+          // construct center of circle
+          CircleCenter.CopyVector(Line->endpoints[0]->node->node);
+          CircleCenter.AddVector(Line->endpoints[1]->node->node);
+          CircleCenter.Scale(0.5);
+
+          // construct normal vector of circle
+          CirclePlaneNormal.CopyVector(Line->endpoints[0]->node->node);
+          CirclePlaneNormal.SubtractVector(Line->endpoints[1]->node->node);
+
+          // calculate squared radius of circle
+          radius = CirclePlaneNormal.ScalarProduct(&CirclePlaneNormal);
+          if (radius/4. < RADIUS*RADIUS) {
+            CircleRadius = RADIUS*RADIUS - radius/4.;
+            CirclePlaneNormal.Normalize();
+            //Log() << Verbose(2) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
+
+            // construct old center
+            GetCenterofCircumcircle(&OldSphereCenter, *T->endpoints[0]->node->node, *T->endpoints[1]->node->node, *T->endpoints[2]->node->node);
+            helper.CopyVector(&T->NormalVector);  // normal vector ensures that this is correct center of the two possible ones
+            radius = Line->endpoints[0]->node->node->DistanceSquared(&OldSphereCenter);
+            helper.Scale(sqrt(RADIUS*RADIUS - radius));
+            OldSphereCenter.AddVector(&helper);
+            OldSphereCenter.SubtractVector(&CircleCenter);
+            //Log() << Verbose(2) << "INFO: OldSphereCenter is at " << OldSphereCenter << "." << endl;
+
+            // construct SearchDirection
+            SearchDirection.MakeNormalVector(&T->NormalVector, &CirclePlaneNormal);
+            helper.CopyVector(Line->endpoints[0]->node->node);
+            helper.SubtractVector(ThirdNode->node);
+            if (helper.ScalarProduct(&SearchDirection) < -HULLEPSILON)// ohoh, SearchDirection points inwards!
+              SearchDirection.Scale(-1.);
+            SearchDirection.ProjectOntoPlane(&OldSphereCenter);
+            SearchDirection.Normalize();
+            Log() << Verbose(2) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
+            if (fabs(OldSphereCenter.ScalarProduct(&SearchDirection)) > HULLEPSILON) {
+              // rotated the wrong way!
+              eLog() << Verbose(1) << "SearchDirection and RelativeOldSphereCenter are still not orthogonal!" << endl;
+            }
+
+            // add third point
+            CandidateList *OptCandidates = new CandidateList();
+            FindThirdPointForTesselation(T->NormalVector, SearchDirection, OldSphereCenter, Line, ThirdNode, OptCandidates, &OtherShortestAngle, RADIUS, LC);
+            for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+              if (((*it)->point == BaseRay->endpoints[0]->node) || ((*it)->point == BaseRay->endpoints[1]->node)) // skip if it's the same triangle than suggested
+                continue;
+              Log() << Verbose(1) << " Third point candidate is " << *(*it)->point
+              << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
+              Log() << Verbose(1) << " Baseline is " << *BaseRay << endl;
+
+              // check whether all edges of the new triangle still have space for one more triangle (i.e. TriangleCount <2)
+              TesselPoint *PointCandidates[3];
+              PointCandidates[0] = (*it)->point;
+              PointCandidates[1] = BaseRay->endpoints[0]->node;
+              PointCandidates[2] = BaseRay->endpoints[1]->node;
+              bool check=false;
+              int existentTrianglesCount = CheckPresenceOfTriangle(PointCandidates);
+              // If there is no triangle, add it regularly.
+              if (existentTrianglesCount == 0) {
+                SetTesselationPoint((*it)->point, 0);
+                SetTesselationPoint(BaseRay->endpoints[0]->node, 1);
+                SetTesselationPoint(BaseRay->endpoints[1]->node, 2);
+
+                if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const )TPS)) {
+                  OtherOptCandidate = (*it)->point;
+                  check = true;
+                }
+              } else if ((existentTrianglesCount >= 1) && (existentTrianglesCount <= 3)) { // If there is a planar region within the structure, we need this triangle a second time.
+                SetTesselationPoint((*it)->point, 0);
+                SetTesselationPoint(BaseRay->endpoints[0]->node, 1);
+                SetTesselationPoint(BaseRay->endpoints[1]->node, 2);
+
+                // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
+                // i.e. at least one of the three lines must be present with TriangleCount <= 1
+                if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const)TPS)) {
+                  OtherOptCandidate = (*it)->point;
+                  check = true;
+                }
+              }
+
+              if (check) {
+                if (ShortestAngle > OtherShortestAngle) {
+                  Log() << Verbose(1) << "There is a better candidate than " << *ThirdNode << " with " << ShortestAngle << " from baseline " << *Line << ": " << *OtherOptCandidate << " with " << OtherShortestAngle << "." << endl;
+                  result = true;
+                  break;
+                }
+              }
+            }
+            delete(OptCandidates);
+            if (result)
+              break;
+          } else {
+            Log() << Verbose(1) << "Circumcircle for base line " << *Line << " and base triangle " << T << " is too big!" << endl;
+          }
+        } else {
+          eLog() << Verbose(2) << "Baseline is connected to two triangles already?" << endl;
+        }
+      } else {
+        Log() << Verbose(2) << "No present baseline between " << BaseRay->endpoints[0] << " and candidate " << *ThirdNode << "." << endl;
+      }
+    }
+  } else {
+    eLog() << Verbose(1) << "Could not find the TesselPoint " << *ThirdNode << "." << endl;
+  }
+
+  Log() << Verbose(1) << "End of HasOtherBaselineBetterCandidate" << endl;
+
+  return result;
+};
 
 /** This function finds a triangle to a line, adjacent to an existing one.
  * @param out output stream for debugging
- * @param CandidateLine current cadndiate baseline to search from
+ * @param Line current baseline to search from
  * @param T current triangle which \a Line is edge of
  * @param RADIUS radius of the rolling ball
@@ -2170 +1866 @@
  * @param *LC LinkedCell structure with neighbouring points
  */
-bool Tesselation::FindNextSuitableTriangle(CandidateForTesselation &CandidateLine, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC)
-{
-        Info FunctionInfo(__func__);
+bool Tesselation::FindNextSuitableTriangle(BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC)
+{
+  Log() << Verbose(0) << "Begin of FindNextSuitableTriangle\n";
   bool result = true;
+  CandidateList *OptCandidates = new CandidateList();
 
   Vector CircleCenter;
   Vector CirclePlaneNormal;
-  Vector RelativeSphereCenter;
+  Vector OldSphereCenter;
   Vector SearchDirection;
   Vector helper;
   TesselPoint *ThirdNode = NULL;
   LineMap::iterator testline;
+  double ShortestAngle = 2.*M_PI; // This will indicate the quadrant.
   double radius, CircleRadius;
 
+  Log() << Verbose(1) << "Current baseline is " << Line << " of triangle " << T << "." << endl;
   for (int i=0;i<3;i++)
-    if ((T.endpoints[i]->node != CandidateLine.BaseLine->endpoints[0]->node) && (T.endpoints[i]->node != CandidateLine.BaseLine->endpoints[1]->node)) {
+    if ((T.endpoints[i]->node != Line.endpoints[0]->node) && (T.endpoints[i]->node != Line.endpoints[1]->node))
       ThirdNode = T.endpoints[i]->node;
-      break;
-    }
-  Log() << Verbose(0) << "Current baseline is " << *CandidateLine.BaseLine << " with ThirdNode " << *ThirdNode << " of triangle " << T << "." << endl;
 
   // construct center of circle
-  CircleCenter.CopyVector(CandidateLine.BaseLine->endpoints[0]->node->node);
-  CircleCenter.AddVector(CandidateLine.BaseLine->endpoints[1]->node->node);
+  CircleCenter.CopyVector(Line.endpoints[0]->node->node);
+  CircleCenter.AddVector(Line.endpoints[1]->node->node);
   CircleCenter.Scale(0.5);
 
   // construct normal vector of circle
-  CirclePlaneNormal.CopyVector(CandidateLine.BaseLine->endpoints[0]->node->node);
-  CirclePlaneNormal.SubtractVector(CandidateLine.BaseLine->endpoints[1]->node->node);
+  CirclePlaneNormal.CopyVector(Line.endpoints[0]->node->node);
+  CirclePlaneNormal.SubtractVector(Line.endpoints[1]->node->node);
 
   // calculate squared radius of circle
   radius = CirclePlaneNormal.ScalarProduct(&CirclePlaneNormal);
   if (radius/4. < RADIUS*RADIUS) {
-    // construct relative sphere center with now known CircleCenter
-    RelativeSphereCenter.CopyVector(&T.SphereCenter);
-    RelativeSphereCenter.SubtractVector(&CircleCenter);
-
     CircleRadius = RADIUS*RADIUS - radius/4.;
     CirclePlaneNormal.Normalize();
-    Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
-
-    Log() << Verbose(1) << "INFO: OldSphereCenter is at " << T.SphereCenter << "." << endl;
-
-    // construct SearchDirection and an "outward pointer"
-    SearchDirection.MakeNormalVector(&RelativeSphereCenter, &CirclePlaneNormal);
-    helper.CopyVector(&CircleCenter);
+    //Log() << Verbose(2) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
+
+    // construct old center
+    GetCenterofCircumcircle(&OldSphereCenter, *T.endpoints[0]->node->node, *T.endpoints[1]->node->node, *T.endpoints[2]->node->node);
+    helper.CopyVector(&T.NormalVector);  // normal vector ensures that this is correct center of the two possible ones
+    radius = Line.endpoints[0]->node->node->DistanceSquared(&OldSphereCenter);
+    helper.Scale(sqrt(RADIUS*RADIUS - radius));
+    OldSphereCenter.AddVector(&helper);
+    OldSphereCenter.SubtractVector(&CircleCenter);
+    //Log() << Verbose(2) << "INFO: OldSphereCenter is at " << OldSphereCenter << "." << endl;
+
+    // construct SearchDirection
+    SearchDirection.MakeNormalVector(&T.NormalVector, &CirclePlaneNormal);
+    helper.CopyVector(Line.endpoints[0]->node->node);
     helper.SubtractVector(ThirdNode->node);
     if (helper.ScalarProduct(&SearchDirection) < -HULLEPSILON)// ohoh, SearchDirection points inwards!
       SearchDirection.Scale(-1.);
-    Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
-    if (fabs(RelativeSphereCenter.ScalarProduct(&SearchDirection)) > HULLEPSILON) {
+    SearchDirection.ProjectOntoPlane(&OldSphereCenter);
+    SearchDirection.Normalize();
+    Log() << Verbose(2) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
+    if (fabs(OldSphereCenter.ScalarProduct(&SearchDirection)) > HULLEPSILON) {
       // rotated the wrong way!
       eLog() << Verbose(1) << "SearchDirection and RelativeOldSphereCenter are still not orthogonal!" << endl;
@@ -2226 +1927 @@
 
     // add third point
-    FindThirdPointForTesselation(T.NormalVector, SearchDirection, T.SphereCenter, CandidateLine, ThirdNode, RADIUS, LC);
+    FindThirdPointForTesselation(T.NormalVector, SearchDirection, OldSphereCenter, &Line, ThirdNode, OptCandidates, &ShortestAngle, RADIUS, LC);
 
   } else {
-    Log() << Verbose(0) << "Circumcircle for base line " << *CandidateLine.BaseLine << " and base triangle " << T << " is too big!" << endl;
-  }
-
-  if (CandidateLine.pointlist.empty()) {
+    Log() << Verbose(1) << "Circumcircle for base line " << Line << " and base triangle " << T << " is too big!" << endl;
+  }
+
+  if (OptCandidates->begin() == OptCandidates->end()) {
     eLog() << Verbose(2) << "Could not find a suitable candidate." << endl;
     return false;
   }
-  Log() << Verbose(0) << "Third Points are: " << endl;
-  for (TesselPointList::iterator it = CandidateLine.pointlist.begin(); it != CandidateLine.pointlist.end(); ++it) {
-    Log() << Verbose(0) << " " << *(*it) << endl;
-  }
-
-  return true;
-
-//  BoundaryLineSet *BaseRay = CandidateLine.BaseLine;
-//  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
-//    Log() << Verbose(0) << "Third point candidate is " << *(*it)->point
-//    << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
-//    Log() << Verbose(0) << "Baseline is " << *BaseRay << endl;
-//
-//    // check whether all edges of the new triangle still have space for one more triangle (i.e. TriangleCount <2)
-//    TesselPoint *PointCandidates[3];
-//    PointCandidates[0] = (*it)->point;
-//    PointCandidates[1] = BaseRay->endpoints[0]->node;
-//    PointCandidates[2] = BaseRay->endpoints[1]->node;
-//    int existentTrianglesCount = CheckPresenceOfTriangle(PointCandidates);
-//
-//    BTS = NULL;
-//    // check for present edges and whether we reach better candidates from them
-//    //if (HasOtherBaselineBetterCandidate(BaseRay, (*it)->point, ShortestAngle, RADIUS, LC) ) {
-//    if (0) {
-//      result = false;
-//      break;
-//    } else {
-//      // If there is no triangle, add it regularly.
-//      if (existentTrianglesCount == 0) {
-//        AddTesselationPoint((*it)->point, 0);
-//        AddTesselationPoint(BaseRay->endpoints[0]->node, 1);
-//        AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
-//
-//        if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const )TPS)) {
-//          CandidateLine.point = (*it)->point;
-//          CandidateLine.OptCenter.CopyVector(&((*it)->OptCenter));
-//          CandidateLine.OtherOptCenter.CopyVector(&((*it)->OtherOptCenter));
-//          CandidateLine.ShortestAngle = ShortestAngle;
-//        } else {
-////          eLog() << Verbose(1) << "This triangle consisting of ";
-////          Log() << Verbose(0) << *(*it)->point << ", ";
-////          Log() << Verbose(0) << *BaseRay->endpoints[0]->node << " and ";
-////          Log() << Verbose(0) << *BaseRay->endpoints[1]->node << " ";
-////          Log() << Verbose(0) << "exists and is not added, as it 0x80000000006fc150(does not seem helpful!" << endl;
-//          result = false;
-//        }
-//      } else if ((existentTrianglesCount >= 1) && (existentTrianglesCount <= 3)) { // If there is a planar region within the structure, we need this triangle a second time.
-//          AddTesselationPoint((*it)->point, 0);
-//          AddTesselationPoint(BaseRay->endpoints[0]->node, 1);
-//          AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
-//
-//          // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
-//          // i.e. at least one of the three lines must be present with TriangleCount <= 1
-//          if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const)TPS) || CandidateLine.BaseLine->skipped) {
-//            CandidateLine.point = (*it)->point;
-//            CandidateLine.OptCenter.CopyVector(&(*it)->OptCenter);
-//            CandidateLine.OtherOptCenter.CopyVector(&(*it)->OtherOptCenter);
-//            CandidateLine.ShortestAngle = ShortestAngle+2.*M_PI;
-//
-//          } else {
-////            eLog() << Verbose(1) << "This triangle consisting of " << *(*it)->point << ", " << *BaseRay->endpoints[0]->node << " and " << *BaseRay->endpoints[1]->node << " " << "exists and is not added, as it does not seem helpful!" << endl;
-//            result = false;
-//          }
-//      } else {
-////        Log() << Verbose(1) << "This triangle consisting of ";
-////        Log() << Verbose(0) << *(*it)->point << ", ";
-////        Log() << Verbose(0) << *BaseRay->endpoints[0]->node << " and ";
-////        Log() << Verbose(0) << *BaseRay->endpoints[1]->node << " ";
-////        Log() << Verbose(0) << "is invalid!" << endl;
-//        result = false;
-//      }
-//    }
-//
-//    // set baseline to new ray from ref point (here endpoints[0]->node) to current candidate (here (*it)->point))
-//    BaseRay = BLS[0];
-//    if ((BTS != NULL) && (BTS->NormalVector.NormSquared() < MYEPSILON)) {
-//      eLog() << Verbose(1) << "Triangle " << *BTS << " has zero normal vector!" << endl;
-//      exit(255);
-//    }
-//
-//  }
-//
-//  // remove all candidates from the list and then the list itself
-//  class CandidateForTesselation *remover = NULL;
-//  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
-//    remover = *it;
-//    delete(remover);
-//  }
-//  delete(OptCandidates);
+  Log() << Verbose(1) << "Third Points are ";
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+    Log() << Verbose(1) << " " << *(*it)->point << endl;
+  }
+
+  BoundaryLineSet *BaseRay = &Line;
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+    Log() << Verbose(1) << " Third point candidate is " << *(*it)->point
+    << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
+    Log() << Verbose(1) << " Baseline is " << *BaseRay << endl;
+
+    // check whether all edges of the new triangle still have space for one more triangle (i.e. TriangleCount <2)
+    TesselPoint *PointCandidates[3];
+    PointCandidates[0] = (*it)->point;
+    PointCandidates[1] = BaseRay->endpoints[0]->node;
+    PointCandidates[2] = BaseRay->endpoints[1]->node;
+    int existentTrianglesCount = CheckPresenceOfTriangle(PointCandidates);
+
+    BTS = NULL;
+    // check for present edges and whether we reach better candidates from them
+    if (HasOtherBaselineBetterCandidate(BaseRay, (*it)->point, ShortestAngle, RADIUS, LC) ) {
+      result = false;
+      break;
+    } else {
+      // If there is no triangle, add it regularly.
+      if (existentTrianglesCount == 0) {
+        AddTesselationPoint((*it)->point, 0);
+        AddTesselationPoint(BaseRay->endpoints[0]->node, 1);
+        AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
+
+        if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const )TPS)) {
+          AddTesselationLine(TPS[0], TPS[1], 0);
+          AddTesselationLine(TPS[0], TPS[2], 1);
+          AddTesselationLine(TPS[1], TPS[2], 2);
+
+          BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
+          AddTesselationTriangle();
+          (*it)->OptCenter.Scale(-1.);
+          BTS->GetNormalVector((*it)->OptCenter);
+          (*it)->OptCenter.Scale(-1.);
+
+          Log() << Verbose(0) << "--> New triangle with " << *BTS << " and normal vector " << BTS->NormalVector
+            << " for this triangle ... " << endl;
+        //Log() << Verbose(1) << "We have "<< TrianglesOnBoundaryCount << " for line " << *BaseRay << "." << endl;
+        } else {
+          eLog() << Verbose(2) << "This triangle consisting of ";
+          Log() << Verbose(0) << *(*it)->point << ", ";
+          Log() << Verbose(0) << *BaseRay->endpoints[0]->node << " and ";
+          Log() << Verbose(0) << *BaseRay->endpoints[1]->node << " ";
+          Log() << Verbose(0) << "exists and is not added, as it does not seem helpful!" << endl;
+          result = false;
+        }
+      } else if ((existentTrianglesCount >= 1) && (existentTrianglesCount <= 3)) { // If there is a planar region within the structure, we need this triangle a second time.
+          AddTesselationPoint((*it)->point, 0);
+          AddTesselationPoint(BaseRay->endpoints[0]->node, 1);
+          AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
+
+          // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
+          // i.e. at least one of the three lines must be present with TriangleCount <= 1
+          if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet ** const)TPS)) {
+            AddTesselationLine(TPS[0], TPS[1], 0);
+            AddTesselationLine(TPS[0], TPS[2], 1);
+            AddTesselationLine(TPS[1], TPS[2], 2);
+
+            BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
+            AddTesselationTriangle();  // add to global map
+
+            (*it)->OtherOptCenter.Scale(-1.);
+            BTS->GetNormalVector((*it)->OtherOptCenter);
+            (*it)->OtherOptCenter.Scale(-1.);
+
+            eLog() << Verbose(2) << "--> WARNING: Special new triangle with " << *BTS << " and normal vector " << BTS->NormalVector << " for this triangle ... " << endl;
+            Log() << Verbose(1) << "We have "<< BaseRay->triangles.size() << " for line " << BaseRay << "." << endl;
+          } else {
+            eLog() << Verbose(2) << "This triangle consisting of " << *(*it)->point << ", " << *BaseRay->endpoints[0]->node << " and " << *BaseRay->endpoints[1]->node << " " << "exists and is not added, as it does not seem helpful!" << endl;
+            result = false;
+          }
+      } else {
+        Log() << Verbose(1) << "This triangle consisting of ";
+        Log() << Verbose(0) << *(*it)->point << ", ";
+        Log() << Verbose(0) << *BaseRay->endpoints[0]->node << " and ";
+        Log() << Verbose(0) << *BaseRay->endpoints[1]->node << " ";
+        Log() << Verbose(0) << "is invalid!" << endl;
+        result = false;
+      }
+    }
+
+    // set baseline to new ray from ref point (here endpoints[0]->node) to current candidate (here (*it)->point))
+    BaseRay = BLS[0];
+    if ((BTS != NULL) && (BTS->NormalVector.NormSquared() < MYEPSILON)) {
+      eLog() << Verbose(1) << "Triangle " << *BTS << " has zero normal vector!" << endl;
+      exit(255);
+    }
+
+  }
+
+  // remove all candidates from the list and then the list itself
+  class CandidateForTesselation *remover = NULL;
+  for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
+    remover = *it;
+    delete(remover);
+  }
+  delete(OptCandidates);
+  Log() << Verbose(0) << "End of FindNextSuitableTriangle\n";
   return result;
-};
-
-/** Adds the present line and candidate point from \a &CandidateLine to the Tesselation.
- * \param CandidateLine triangle to add
- * \NOTE we need the copy operator here as the original CandidateForTesselation is removed in AddTesselationLine()
- */
-void Tesselation::AddCandidateTriangle(CandidateForTesselation CandidateLine)
-{
-        Info FunctionInfo(__func__);
-  Vector Center;
-  TesselPoint * const TurningPoint = CandidateLine.BaseLine->endpoints[0]->node;
-
-  // fill the set of neighbours
-  Center.CopyVector(CandidateLine.BaseLine->endpoints[1]->node->node);
-  Center.SubtractVector(TurningPoint->node);
-  set<TesselPoint*> SetOfNeighbours;
-  SetOfNeighbours.insert(CandidateLine.BaseLine->endpoints[1]->node);
-  for (TesselPointList::iterator Runner = CandidateLine.pointlist.begin(); Runner != CandidateLine.pointlist.end(); Runner++)
-    SetOfNeighbours.insert(*Runner);
-  TesselPointList *connectedClosestPoints = GetCircleOfSetOfPoints(&SetOfNeighbours, TurningPoint, &Center);
-
-  // go through all angle-sorted candidates (in degenerate n-nodes case we may have to add multiple triangles)
-  TesselPointList::iterator Runner = connectedClosestPoints->begin();
-  TesselPointList::iterator Sprinter = Runner;
-  Sprinter++;
-  while(Sprinter != connectedClosestPoints->end()) {
-    // add the points
-    AddTesselationPoint(TurningPoint, 0);
-    AddTesselationPoint((*Runner), 1);
-    AddTesselationPoint((*Sprinter), 2);
-
-
-    // add the lines
-    AddTesselationLine(TPS[0], TPS[1], 0);
-    AddTesselationLine(TPS[0], TPS[2], 1);
-    AddTesselationLine(TPS[1], TPS[2], 2);
-
-    // add the triangles
-    BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
-    AddTesselationTriangle();
-    BTS->GetCenter(&Center);
-    Center.SubtractVector(&CandidateLine.OptCenter);
-    BTS->SphereCenter.CopyVector(&CandidateLine.OptCenter);
-    BTS->GetNormalVector(Center);
-
-    Log() << Verbose(0) << "--> New triangle with " << *BTS << " and normal vector " << BTS->NormalVector << "." << endl;
-    Runner = Sprinter;
-    Sprinter++;
-  }
-  delete(connectedClosestPoints);
 };
 
@@ -2387 +2053 @@
 class BoundaryPointSet *Tesselation::IsConvexRectangle(class BoundaryLineSet *Base)
 {
-        Info FunctionInfo(__func__);
   class BoundaryPointSet *Spot = NULL;
   class BoundaryLineSet *OtherBase;
@@ -2399 +2064 @@
   OtherBase = new class BoundaryLineSet(BPS,-1);
 
-  Log() << Verbose(1) << "INFO: Current base line is " << *Base << "." << endl;
-  Log() << Verbose(1) << "INFO: Other base line is " << *OtherBase << "." << endl;
+  Log() << Verbose(3) << "INFO: Current base line is " << *Base << "." << endl;
+  Log() << Verbose(3) << "INFO: Other base line is " << *OtherBase << "." << endl;
 
   // get the closest point on each line to the other line
@@ -2420 +2085 @@
   delete(ClosestPoint);
   if ((distance[0] * distance[1]) > 0)  { // have same sign?
-    Log() << Verbose(1) << "REJECT: Both SKPs have same sign: " << distance[0] << " and " << distance[1]  << ". " << *Base << "' rectangle is concave." << endl;
+    Log() << Verbose(3) << "REJECT: Both SKPs have same sign: " << distance[0] << " and " << distance[1]  << ". " << *Base << "' rectangle is concave." << endl;
     if (distance[0] < distance[1]) {
       Spot = Base->endpoints[0];
@@ -2428 +2093 @@
     return Spot;
   } else {  // different sign, i.e. we are in between
-    Log() << Verbose(0) << "ACCEPT: Rectangle of triangles of base line " << *Base << " is convex." << endl;
+    Log() << Verbose(3) << "ACCEPT: Rectangle of triangles of base line " << *Base << " is convex." << endl;
     return NULL;
   }
@@ -2436 +2101 @@
 void Tesselation::PrintAllBoundaryPoints(ofstream *out) const
 {
-        Info FunctionInfo(__func__);
   // print all lines
-  Log() << Verbose(0) << "Printing all boundary points for debugging:" << endl;
+  Log() << Verbose(1) << "Printing all boundary points for debugging:" << endl;
   for (PointMap::const_iterator PointRunner = PointsOnBoundary.begin();PointRunner != PointsOnBoundary.end(); PointRunner++)
-    Log() << Verbose(0) << *(PointRunner->second) << endl;
+    Log() << Verbose(2) << *(PointRunner->second) << endl;
 };
 
 void Tesselation::PrintAllBoundaryLines(ofstream *out) const
 {
-        Info FunctionInfo(__func__);
   // print all lines
-  Log() << Verbose(0) << "Printing all boundary lines for debugging:" << endl;
+  Log() << Verbose(1) << "Printing all boundary lines for debugging:" << endl;
   for (LineMap::const_iterator LineRunner = LinesOnBoundary.begin(); LineRunner != LinesOnBoundary.end(); LineRunner++)
-    Log() << Verbose(0) << *(LineRunner->second) << endl;
+    Log() << Verbose(2) << *(LineRunner->second) << endl;
 };
 
 void Tesselation::PrintAllBoundaryTriangles(ofstream *out) const
 {
-        Info FunctionInfo(__func__);
   // print all triangles
-  Log() << Verbose(0) << "Printing all boundary triangles for debugging:" << endl;
+  Log() << Verbose(1) << "Printing all boundary triangles for debugging:" << endl;
   for (TriangleMap::const_iterator TriangleRunner = TrianglesOnBoundary.begin(); TriangleRunner != TrianglesOnBoundary.end(); TriangleRunner++)
-    Log() << Verbose(0) << *(TriangleRunner->second) << endl;
+    Log() << Verbose(2) << *(TriangleRunner->second) << endl;
 };
 
@@ -2468 +2130 @@
 double Tesselation::PickFarthestofTwoBaselines(class BoundaryLineSet *Base)
 {
-        Info FunctionInfo(__func__);
   class BoundaryLineSet *OtherBase;
   Vector *ClosestPoint[2];
@@ -2480 +2141 @@
   OtherBase = new class BoundaryLineSet(BPS,-1);
 
-  Log() << Verbose(0) << "INFO: Current base line is " << *Base << "." << endl;
-  Log() << Verbose(0) << "INFO: Other base line is " << *OtherBase << "." << endl;
+  Log() << Verbose(3) << "INFO: Current base line is " << *Base << "." << endl;
+  Log() << Verbose(3) << "INFO: Other base line is " << *OtherBase << "." << endl;
 
   // get the closest point on each line to the other line
@@ -2501 +2162 @@
 
   if (Distance.NormSquared() < MYEPSILON) { // check for intersection
-    Log() << Verbose(0) << "REJECT: Both lines have an intersection: Nothing to do." << endl;
+    Log() << Verbose(3) << "REJECT: Both lines have an intersection: Nothing to do." << endl;
     return false;
   } else { // check for sign against BaseLineNormal
@@ -2511 +2172 @@
     }
     for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++) {
-      Log() << Verbose(1) << "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << "." << endl;
+      Log() << Verbose(4) << "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << "." << endl;
       BaseLineNormal.AddVector(&(runner->second->NormalVector));
     }
@@ -2517 +2178 @@
 
     if (Distance.ScalarProduct(&BaseLineNormal) > MYEPSILON) { // Distance points outwards, hence OtherBase higher than Base -> flip
-      Log() << Verbose(0) << "ACCEPT: Other base line would be higher: Flipping baseline." << endl;
+      Log() << Verbose(2) << "ACCEPT: Other base line would be higher: Flipping baseline." << endl;
       // calculate volume summand as a general tetraeder
       return volume;
     } else {  // Base higher than OtherBase -> do nothing
-      Log() << Verbose(0) << "REJECT: Base line is higher: Nothing to do." << endl;
+      Log() << Verbose(2) << "REJECT: Base line is higher: Nothing to do." << endl;
       return 0.;
     }
@@ -2536 +2197 @@
 class BoundaryLineSet * Tesselation::FlipBaseline(class BoundaryLineSet *Base)
 {
-        Info FunctionInfo(__func__);
   class BoundaryLineSet *OldLines[4], *NewLine;
   class BoundaryPointSet *OldPoints[2];
@@ -2543 +2203 @@
   int i,m;
 
+  Log() << Verbose(1) << "Begin of FlipBaseline" << endl;
+
   // calculate NormalVector for later use
   BaseLineNormal.Zero();
@@ -2550 +2212 @@
   }
   for (TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++) {
-    Log() << Verbose(1) << "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << "." << endl;
+    Log() << Verbose(4) << "INFO: Adding NormalVector " << runner->second->NormalVector << " of triangle " << *(runner->second) << "." << endl;
     BaseLineNormal.AddVector(&(runner->second->NormalVector));
   }
@@ -2563 +2225 @@
   i=0;
   m=0;
-  Log() << Verbose(0) << "The four old lines are: ";
+  Log() << Verbose(3) << "The four old lines are: ";
   for(TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++)
     for (int j=0;j<3;j++) // all of their endpoints and baselines
@@ -2571 +2233 @@
       }
   Log() << Verbose(0) << endl;
-  Log() << Verbose(0) << "The two old points are: ";
+  Log() << Verbose(3) << "The two old points are: ";
   for(TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++)
     for (int j=0;j<3;j++) // all of their endpoints and baselines
@@ -2597 +2259 @@
 
   // remove triangles and baseline removes itself
-  Log() << Verbose(0) << "INFO: Deleting baseline " << *Base << " from global list." << endl;
+  Log() << Verbose(3) << "INFO: Deleting baseline " << *Base << " from global list." << endl;
   OldBaseLineNr = Base->Nr;
   m=0;
   for(TriangleMap::iterator runner = Base->triangles.begin(); runner != Base->triangles.end(); runner++) {
-    Log() << Verbose(0) << "INFO: Deleting triangle " << *(runner->second) << "." << endl;
+    Log() << Verbose(3) << "INFO: Deleting triangle " << *(runner->second) << "." << endl;
     OldTriangleNrs[m++] = runner->second->Nr;
     RemoveTesselationTriangle(runner->second);
@@ -2611 +2273 @@
   NewLine = new class BoundaryLineSet(BPS, OldBaseLineNr);
   LinesOnBoundary.insert(LinePair(OldBaseLineNr, NewLine)); // no need for check for unique insertion as NewLine is definitely a new one
-  Log() << Verbose(0) << "INFO: Created new baseline " << *NewLine << "." << endl;
+  Log() << Verbose(3) << "INFO: Created new baseline " << *NewLine << "." << endl;
 
   // construct new triangles with flipped baseline
@@ -2626 +2288 @@
     BTS->GetNormalVector(BaseLineNormal);
     AddTesselationTriangle(OldTriangleNrs[0]);
-    Log() << Verbose(0) << "INFO: Created new triangle " << *BTS << "." << endl;
+    Log() << Verbose(3) << "INFO: Created new triangle " << *BTS << "." << endl;
 
     BLS[0] = (i==2 ? OldLines[3] : OldLines[2]);
@@ -2634 +2296 @@
     BTS->GetNormalVector(BaseLineNormal);
     AddTesselationTriangle(OldTriangleNrs[1]);
-    Log() << Verbose(0) << "INFO: Created new triangle " << *BTS << "." << endl;
+    Log() << Verbose(3) << "INFO: Created new triangle " << *BTS << "." << endl;
   } else {
-    eLog() << Verbose(0) << "The four old lines do not connect, something's utterly wrong here!" << endl;
+    Log() << Verbose(1) << "The four old lines do not connect, something's utterly wrong here!" << endl;
     return NULL;
   }
 
+  Log() << Verbose(1) << "End of FlipBaseline" << endl;
   return NewLine;
 };
@@ -2654 +2317 @@
 void Tesselation::FindSecondPointForTesselation(TesselPoint* a, Vector Oben, TesselPoint*& OptCandidate, double Storage[3], double RADIUS, const LinkedCell *LC)
 {
-        Info FunctionInfo(__func__);
+  Log() << Verbose(2) << "Begin of FindSecondPointForTesselation" << endl;
   Vector AngleCheck;
   class TesselPoint* Candidate = NULL;
@@ -2675 +2338 @@
     Nupper[i] = ((N[i]+1) < LC->N[i]) ? N[i]+1 : LC->N[i]-1;
   }
-  Log() << Verbose(0) << "LC Intervals from [" << N[0] << "<->" << LC->N[0] << ", " << N[1] << "<->" << LC->N[1] << ", " << N[2] << "<->" << LC->N[2] << "] :"
+  Log() << Verbose(3) << "LC Intervals from [" << N[0] << "<->" << LC->N[0] << ", " << N[1] << "<->" << LC->N[1] << ", " << N[2] << "<->" << LC->N[2] << "] :"
     << " [" << Nlower[0] << "," << Nupper[0] << "], " << " [" << Nlower[1] << "," << Nupper[1] << "], " << " [" << Nlower[2] << "," << Nupper[2] << "], " << endl;
 
@@ -2682 +2345 @@
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
         const LinkedNodes *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
+        //Log() << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
         if (List != NULL) {
           for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -2713 +2376 @@
                 angle = AngleCheck.Angle(&Oben);
                 if (angle < Storage[0]) {
-                  //Log() << Verbose(1) << "Old values of Storage: %lf %lf \n", Storage[0], Storage[1]);
-                  Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Is a better candidate with distance " << norm << " and angle " << angle << " to oben " << Oben << ".\n";
+                  //Log() << Verbose(3) << "Old values of Storage: %lf %lf \n", Storage[0], Storage[1]);
+                  Log() << Verbose(3) << "Current candidate is " << *Candidate << ": Is a better candidate with distance " << norm << " and angle " << angle << " to oben " << Oben << ".\n";
                   OptCandidate = Candidate;
                   Storage[0] = angle;
-                  //Log() << Verbose(1) << "Changing something in Storage: %lf %lf. \n", Storage[0], Storage[2]);
+                  //Log() << Verbose(3) << "Changing something in Storage: %lf %lf. \n", Storage[0], Storage[2]);
                 } else {
-                  //Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *OptCandidate << endl;
+                  //Log() << Verbose(3) << "Current candidate is " << *Candidate << ": Looses with angle " << angle << " to a better candidate " << *OptCandidate << endl;
                 }
               } else {
-                //Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Refused due to Radius " << norm << endl;
+                //Log() << Verbose(3) << "Current candidate is " << *Candidate << ": Refused due to Radius " << norm << endl;
               }
             } else {
-              //Log() << Verbose(1) << "Current candidate is " << *Candidate << ": Candidate is equal to first endpoint." << *a << "." << endl;
+              //Log() << Verbose(3) << "Current candidate is " << *Candidate << ": Candidate is equal to first endpoint." << *a << "." << endl;
             }
           }
         } else {
-          Log() << Verbose(0) << "Linked cell list is empty." << endl;
+          Log() << Verbose(3) << "Linked cell list is empty." << endl;
         }
       }
+  Log() << Verbose(2) << "End of FindSecondPointForTesselation" << endl;
 };
 
@@ -2760 +2424 @@
  * @param SearchDirection general direction where to search for the next point, relative to center of BaseLine
  * @param OldSphereCenter center of sphere for base triangle, relative to center of BaseLine, giving null angle for the parameter circle
- * @param CandidateLine CandidateForTesselation with the current base line and list of candidates and ShortestAngle
+ * @param BaseLine BoundaryLineSet with the current base line
  * @param ThirdNode third point to avoid in search
+ * @param candidates list of equally good candidates to return
+ * @param ShortestAngle the current path length on this circle band for the current OptCandidate
  * @param RADIUS radius of sphere
  * @param *LC LinkedCell structure with neighbouring points
  */
-void Tesselation::FindThirdPointForTesselation(Vector &NormalVector, Vector &SearchDirection, Vector &OldSphereCenter, CandidateForTesselation &CandidateLine, const class TesselPoint  * const ThirdNode, const double RADIUS, const LinkedCell *LC) const
-{
-        Info FunctionInfo(__func__);
+void Tesselation::FindThirdPointForTesselation(Vector &NormalVector, Vector &SearchDirection, Vector &OldSphereCenter, class BoundaryLineSet *BaseLine, const class TesselPoint  * const ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, const LinkedCell *LC) const
+{
   Vector CircleCenter;  // center of the circle, i.e. of the band of sphere's centers
   Vector CirclePlaneNormal; // normal vector defining the plane this circle lives in
@@ -2775 +2440 @@
   Vector NewNormalVector;   // normal vector of the Candidate's triangle
   Vector helper, OptCandidateCenter, OtherOptCandidateCenter;
-  Vector RelativeOldSphereCenter;
-  Vector NewPlaneCenter;
   double CircleRadius; // radius of this circle
   double radius;
-  double otherradius;
   double alpha, Otheralpha; // angles (i.e. parameter for the circle).
-  bool IsDegenerated;
   int N[NDIM], Nlower[NDIM], Nupper[NDIM];
   TesselPoint *Candidate = NULL;
-  TesselPoint *CandidateTriangle[3];
-
-  Log() << Verbose(1) << "INFO: NormalVector of BaseTriangle is " << NormalVector << "." << endl;
+  CandidateForTesselation *optCandidate = NULL;
+
+  Log() << Verbose(1) << "Begin of FindThirdPointForTesselation" << endl;
+
+  Log() << Verbose(2) << "INFO: NormalVector of BaseTriangle is " << NormalVector << "." << endl;
 
   // construct center of circle
-  CircleCenter.CopyVector(CandidateLine.BaseLine->endpoints[0]->node->node);
-  CircleCenter.AddVector(CandidateLine.BaseLine->endpoints[1]->node->node);
+  CircleCenter.CopyVector(BaseLine->endpoints[0]->node->node);
+  CircleCenter.AddVector(BaseLine->endpoints[1]->node->node);
   CircleCenter.Scale(0.5);
 
   // construct normal vector of circle
-  CirclePlaneNormal.CopyVector(CandidateLine.BaseLine->endpoints[0]->node->node);
-  CirclePlaneNormal.SubtractVector(CandidateLine.BaseLine->endpoints[1]->node->node);
-
-  RelativeOldSphereCenter.CopyVector(&OldSphereCenter);
-  RelativeOldSphereCenter.SubtractVector(&CircleCenter);
-
-  CandidateTriangle[0] = CandidateLine.BaseLine->endpoints[0]->node;
-  CandidateTriangle[1] = CandidateLine.BaseLine->endpoints[1]->node;
+  CirclePlaneNormal.CopyVector(BaseLine->endpoints[0]->node->node);
+  CirclePlaneNormal.SubtractVector(BaseLine->endpoints[1]->node->node);
 
   // calculate squared radius TesselPoint *ThirdNode,f circle
-  radius = CirclePlaneNormal.NormSquared()/4.;
-  if (radius < RADIUS*RADIUS) {
-    CircleRadius = RADIUS*RADIUS - radius;
+  radius = CirclePlaneNormal.ScalarProduct(&CirclePlaneNormal);
+  if (radius/4. < RADIUS*RADIUS) {
+    CircleRadius = RADIUS*RADIUS - radius/4.;
     CirclePlaneNormal.Normalize();
-    Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
+    //Log() << Verbose(2) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
 
     // test whether old center is on the band's plane
-    if (fabs(RelativeOldSphereCenter.ScalarProduct(&CirclePlaneNormal)) > HULLEPSILON) {
-      eLog() << Verbose(1) << "Something's very wrong here: RelativeOldSphereCenter is not on the band's plane as desired by " << fabs(RelativeOldSphereCenter.ScalarProduct(&CirclePlaneNormal)) << "!" << endl;
-      RelativeOldSphereCenter.ProjectOntoPlane(&CirclePlaneNormal);
-    }
-    radius = RelativeOldSphereCenter.NormSquared();
+    if (fabs(OldSphereCenter.ScalarProduct(&CirclePlaneNormal)) > HULLEPSILON) {
+      eLog() << Verbose(1) << "Something's very wrong here: OldSphereCenter is not on the band's plane as desired by " << fabs(OldSphereCenter.ScalarProduct(&CirclePlaneNormal)) << "!" << endl;
+      OldSphereCenter.ProjectOntoPlane(&CirclePlaneNormal);
+    }
+    radius = OldSphereCenter.ScalarProduct(&OldSphereCenter);
     if (fabs(radius - CircleRadius) < HULLEPSILON) {
-      Log() << Verbose(1) << "INFO: RelativeOldSphereCenter is at " << RelativeOldSphereCenter << "." << endl;
+      //Log() << Verbose(2) << "INFO: OldSphereCenter is at " << OldSphereCenter << "." << endl;
 
       // check SearchDirection
-      Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
-      if (fabs(RelativeOldSphereCenter.ScalarProduct(&SearchDirection)) > HULLEPSILON) {  // rotated the wrong way!
+      //Log() << Verbose(2) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
+      if (fabs(OldSphereCenter.ScalarProduct(&SearchDirection)) > HULLEPSILON) {  // rotated the wrong way!
         eLog() << Verbose(1) << "SearchDirection and RelativeOldSphereCenter are not orthogonal!" << endl;
       }
@@ -2829 +2486 @@
         for(int i=0;i<NDIM;i++) // store indices of this cell
         N[i] = LC->n[i];
-        //Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
+        //Log() << Verbose(2) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
       } else {
         eLog() << Verbose(1) << "Vector " << CircleCenter << " is outside of LinkedCell's bounding box." << endl;
@@ -2835 +2492 @@
       }
       // then go through the current and all neighbouring cells and check the contained points for possible candidates
-      //Log() << Verbose(1) << "LC Intervals:";
+      //Log() << Verbose(2) << "LC Intervals:";
       for (int i=0;i<NDIM;i++) {
         Nlower[i] = ((N[i]-1) >= 0) ? N[i]-1 : 0;
@@ -2846 +2503 @@
           for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
             const LinkedNodes *List = LC->GetCurrentCell();
-            //Log() << Verbose(1) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
+            //Log() << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
             if (List != NULL) {
               for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -2852 +2509 @@
 
                 // check for three unique points
-                Log() << Verbose(2) << "INFO: Current Candidate is " << *Candidate << " for BaseLine " << *CandidateLine.BaseLine << " with OldSphereCenter " << OldSphereCenter << "." << endl;
-                if ((Candidate != CandidateLine.BaseLine->endpoints[0]->node) && (Candidate != CandidateLine.BaseLine->endpoints[1]->node) ){
-
-                  // find center on the plane
-                  GetCenterofCircumcircle(&NewPlaneCenter, *CandidateLine.BaseLine->endpoints[0]->node->node, *CandidateLine.BaseLine->endpoints[1]->node->node, *Candidate->node);
-                  Log() << Verbose(1) << "INFO: NewPlaneCenter is " << NewPlaneCenter << "." << endl;
-
-                  if ((NewNormalVector.MakeNormalVector(CandidateLine.BaseLine->endpoints[0]->node->node, CandidateLine.BaseLine->endpoints[1]->node->node, Candidate->node))
-                  && (fabs(NewNormalVector.NormSquared()) > HULLEPSILON)
+                //Log() << Verbose(2) << "INFO: Current Candidate is " << *Candidate << " at " << Candidate->node << "." << endl;
+                if ((Candidate != BaseLine->endpoints[0]->node) && (Candidate != BaseLine->endpoints[1]->node) ){
+
+                  // construct both new centers
+                  GetCenterofCircumcircle(&NewSphereCenter, *BaseLine->endpoints[0]->node->node, *BaseLine->endpoints[1]->node->node, *Candidate->node);
+                  OtherNewSphereCenter.CopyVector(&NewSphereCenter);
+
+                  if ((NewNormalVector.MakeNormalVector(BaseLine->endpoints[0]->node->node, BaseLine->endpoints[1]->node->node, Candidate->node))
+                  && (fabs(NewNormalVector.ScalarProduct(&NewNormalVector)) > HULLEPSILON)
                   ) {
-                    Log() << Verbose(1) << "INFO: NewNormalVector is " << NewNormalVector << "." << endl;
-                    radius = CandidateLine.BaseLine->endpoints[0]->node->node->DistanceSquared(&NewPlaneCenter);
-                    Log() << Verbose(1) << "INFO: CircleCenter is at " << CircleCenter << ", CirclePlaneNormal is " << CirclePlaneNormal << " with circle radius " << sqrt(CircleRadius) << "." << endl;
-                    Log() << Verbose(1) << "INFO: SearchDirection is " << SearchDirection << "." << endl;
-                    Log() << Verbose(1) << "INFO: Radius of CircumCenterCircle is " << radius << "." << endl;
+                    helper.CopyVector(&NewNormalVector);
+                    //Log() << Verbose(2) << "INFO: NewNormalVector is " << NewNormalVector << "." << endl;
+                    radius = BaseLine->endpoints[0]->node->node->DistanceSquared(&NewSphereCenter);
                     if (radius < RADIUS*RADIUS) {
-                      otherradius = CandidateLine.BaseLine->endpoints[1]->node->node->DistanceSquared(&NewPlaneCenter);
-                      if (fabs(radius - otherradius) > HULLEPSILON) {
-                        eLog() << Verbose(1) << "Distance to center of circumcircle is not the same from each corner of the triangle: " << fabs(radius-otherradius) << endl;
-                      }
-                      // construct both new centers
-                      NewSphereCenter.CopyVector(&NewPlaneCenter);
-                      OtherNewSphereCenter.CopyVector(&NewPlaneCenter);
-                      helper.CopyVector(&NewNormalVector);
                       helper.Scale(sqrt(RADIUS*RADIUS - radius));
-                      Log() << Verbose(2) << "INFO: Distance of NewPlaneCenter " << NewPlaneCenter << " to either NewSphereCenter is " << helper.Norm() << " of vector " << helper << " with sphere radius " << RADIUS << "." << endl;
+                      //Log() << Verbose(2) << "INFO: Distance of NewCircleCenter to NewSphereCenter is " << helper.Norm() << " with sphere radius " << RADIUS << "." << endl;
                       NewSphereCenter.AddVector(&helper);
-                      Log() << Verbose(2) << "INFO: NewSphereCenter is at " << NewSphereCenter << "." << endl;
+                      NewSphereCenter.SubtractVector(&CircleCenter);
+                      //Log() << Verbose(2) << "INFO: NewSphereCenter is at " << NewSphereCenter << "." << endl;
+
                       // OtherNewSphereCenter is created by the same vector just in the other direction
                       helper.Scale(-1.);
                       OtherNewSphereCenter.AddVector(&helper);
-                      Log() << Verbose(2) << "INFO: OtherNewSphereCenter is at " << OtherNewSphereCenter << "." << endl;
+                      OtherNewSphereCenter.SubtractVector(&CircleCenter);
+                      //Log() << Verbose(2) << "INFO: OtherNewSphereCenter is at " << OtherNewSphereCenter << "." << endl;
 
                       alpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, NewSphereCenter, OldSphereCenter, NormalVector, SearchDirection);
                       Otheralpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, OtherNewSphereCenter, OldSphereCenter, NormalVector, SearchDirection);
                       alpha = min(alpha, Otheralpha);
-
-                      CandidateTriangle[2] = Candidate;
-                      // the idea of the IsDegenerated flag is not to put a penalty on degenerated triangles, but to push them to the
-                      // very end of the Tesselation::OpenLines list.
-                      IsDegenerated = (CheckPresenceOfTriangle(CandidateTriangle) >= 3);
-                      if (!IsDegenerated && CandidateLine.IsDegenerated) {  // if current is not, but old one was, comparison would be unfair
-                        // if there is a better candidate, drop the current list and add the new candidate
-                        // otherwise ignore the new candidate and keep the list
-                        if (CandidateLine.ShortestAngle-2.*M_PI > (alpha - HULLEPSILON)) {
-                          if (fabs(alpha - Otheralpha) > MYEPSILON) {
-                            CandidateLine.OptCenter.CopyVector(&NewSphereCenter);
-                            CandidateLine.OtherOptCenter.CopyVector(&OtherNewSphereCenter);
-                          } else {
-                            CandidateLine.OptCenter.CopyVector(&OtherNewSphereCenter);
-                            CandidateLine.OtherOptCenter.CopyVector(&NewSphereCenter);
+                      // if there is a better candidate, drop the current list and add the new candidate
+                      // otherwise ignore the new candidate and keep the list
+                      if (*ShortestAngle > (alpha - HULLEPSILON)) {
+                        optCandidate = new CandidateForTesselation(Candidate, BaseLine, OptCandidateCenter, OtherOptCandidateCenter);
+                        if (fabs(alpha - Otheralpha) > MYEPSILON) {
+                          optCandidate->OptCenter.CopyVector(&NewSphereCenter);
+                          optCandidate->OtherOptCenter.CopyVector(&OtherNewSphereCenter);
+                        } else {
+                          optCandidate->OptCenter.CopyVector(&OtherNewSphereCenter);
+                          optCandidate->OtherOptCenter.CopyVector(&NewSphereCenter);
+                        }
+                        // if there is an equal candidate, add it to the list without clearing the list
+                        if ((*ShortestAngle - HULLEPSILON) < alpha) {
+                          candidates->push_back(optCandidate);
+                          Log() << Verbose(2) << "ACCEPT: We have found an equally good candidate: " << *(optCandidate->point) << " with "
+                            << alpha << " and circumsphere's center at " << optCandidate->OptCenter << "." << endl;
+                        } else {
+                          // remove all candidates from the list and then the list itself
+                          class CandidateForTesselation *remover = NULL;
+                          for (CandidateList::iterator it = candidates->begin(); it != candidates->end(); ++it) {
+                            remover = *it;
+                            delete(remover);
                           }
-                          // if there is an equal candidate, add it to the list without clearing the list
-                          if ((CandidateLine.ShortestAngle-2.*M_PI - HULLEPSILON) < alpha) {
-                            CandidateLine.pointlist.push_back(Candidate);
-                            Log() << Verbose(0) << "ACCEPT: We have found an equally good candidate: " << *(Candidate) << " with "
-                              << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << "." << endl;
-                          } else {
-                            // remove all candidates from the list and then the list itself
-                            CandidateLine.pointlist.clear();
-                            CandidateLine.pointlist.push_back(Candidate);
-                            Log() << Verbose(0) << "ACCEPT: We have found a better candidate: " << *(Candidate) << " with "
-                              << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << "." << endl;
-                          }
-                          CandidateLine.ShortestAngle = alpha;
-                          CandidateLine.IsDegenerated = IsDegenerated;
-                          if (IsDegenerated)
-                            CandidateLine.ShortestAngle += 2.*M_PI;
-                          Log() << Verbose(0) << "INFO: There are " << CandidateLine.pointlist.size() << " candidates in the list now." << endl;
+                          candidates->clear();
+                          candidates->push_back(optCandidate);
+                          Log() << Verbose(2) << "ACCEPT: We have found a better candidate: " << *(optCandidate->point) << " with "
+                            << alpha << " and circumsphere's center at " << optCandidate->OptCenter << "." << endl;
+                        }
+                        *ShortestAngle = alpha;
+                        //Log() << Verbose(2) << "INFO: There are " << candidates->size() << " candidates in the list now." << endl;
+                      } else {
+                        if ((optCandidate != NULL) && (optCandidate->point != NULL)) {
+                          //Log() << Verbose(2) << "REJECT: Old candidate " << *(optCandidate->point) << " with " << *ShortestAngle << " is better than new one " << *Candidate << " with " << alpha << " ." << endl;
                         } else {
-                          if ((Candidate != NULL) && (CandidateLine.pointlist.begin() != CandidateLine.pointlist.end())) {
-                            Log() << Verbose(1) << "REJECT: Old candidate " << *(Candidate) << " with " << CandidateLine.ShortestAngle << " is better than new one " << *Candidate << " with " << alpha << " ." << endl;
-                          } else {
-                            Log() << Verbose(1) << "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected." << endl;
-                          }
-                        }
-                      } else {
-                        // if there is a better candidate, drop the current list and add the new candidate
-                        // otherwise ignore the new candidate and keep the list
-                        if (CandidateLine.ShortestAngle > (alpha - HULLEPSILON)) {
-                          if (fabs(alpha - Otheralpha) > MYEPSILON) {
-                            CandidateLine.OptCenter.CopyVector(&NewSphereCenter);
-                            CandidateLine.OtherOptCenter.CopyVector(&OtherNewSphereCenter);
-                          } else {
-                            CandidateLine.OptCenter.CopyVector(&OtherNewSphereCenter);
-                            CandidateLine.OtherOptCenter.CopyVector(&NewSphereCenter);
-                          }
-                          // if there is an equal candidate, add it to the list without clearing the list
-                          if ((CandidateLine.ShortestAngle - HULLEPSILON) < alpha) {
-                            CandidateLine.pointlist.push_back(Candidate);
-                            Log() << Verbose(0) << "ACCEPT: We have found an equally good candidate: " << *(Candidate) << " with "
-                              << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << "." << endl;
-                          } else {
-                            // remove all candidates from the list and then the list itself
-                            CandidateLine.pointlist.clear();
-                            CandidateLine.pointlist.push_back(Candidate);
-                            Log() << Verbose(0) << "ACCEPT: We have found a better candidate: " << *(Candidate) << " with "
-                              << alpha << " and circumsphere's center at " << CandidateLine.OptCenter << "." << endl;
-                          }
-                          CandidateLine.ShortestAngle = alpha;
-                          Log() << Verbose(0) << "INFO: There are " << CandidateLine.pointlist.size() << " candidates in the list now." << endl;
-                        } else {
-                          if ((Candidate != NULL) && (CandidateLine.pointlist.begin() != CandidateLine.pointlist.end())) {
-                            Log() << Verbose(1) << "REJECT: Old candidate " << *(Candidate) << " with " << CandidateLine.ShortestAngle << " is better than new one " << *Candidate << " with " << alpha << " ." << endl;
-                          } else {
-                            Log() << Verbose(1) << "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected." << endl;
-                          }
+                          //Log() << Verbose(2) << "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected." << endl;
                         }
                       }
 
                     } else {
-                      Log() << Verbose(1) << "REJECT: NewSphereCenter " << NewSphereCenter << " for " << *Candidate << " is too far away: " << radius << "." << endl;
+                      //Log() << Verbose(2) << "REJECT: NewSphereCenter " << NewSphereCenter << " for " << *Candidate << " is too far away: " << radius << "." << endl;
                     }
                   } else {
-                    Log() << Verbose(1) << "REJECT: Three points from " << *CandidateLine.BaseLine << " and Candidate " << *Candidate << " are linear-dependent." << endl;
+                    //Log() << Verbose(2) << "REJECT: Three points from " << *BaseLine << " and Candidate " << *Candidate << " are linear-dependent." << endl;
                   }
                 } else {
                   if (ThirdNode != NULL) {
-                    Log() << Verbose(1) << "REJECT: Base triangle " << *CandidateLine.BaseLine << " and " << *ThirdNode << " contains Candidate " << *Candidate << "." << endl;
+                    //Log() << Verbose(2) << "REJECT: Base triangle " << *BaseLine << " and " << *ThirdNode << " contains Candidate " << *Candidate << "." << endl;
                   } else {
-                    Log() << Verbose(1) << "REJECT: Base triangle " << *CandidateLine.BaseLine << " contains Candidate " << *Candidate << "." << endl;
+                    //Log() << Verbose(2) << "REJECT: Base triangle " << *BaseLine << " contains Candidate " << *Candidate << "." << endl;
                   }
                 }
@@ -2983 +2597 @@
   } else {
     if (ThirdNode != NULL)
-      Log() << Verbose(1) << "Circumcircle for base line " << *CandidateLine.BaseLine << " and third node " << *ThirdNode << " is too big!" << endl;
+      Log() << Verbose(2) << "Circumcircle for base line " << *BaseLine << " and third node " << *ThirdNode << " is too big!" << endl;
     else
-      Log() << Verbose(1) << "Circumcircle for base line " << *CandidateLine.BaseLine << " is too big!" << endl;
-  }
-
-  Log() << Verbose(1) << "INFO: Sorting candidate list ..." << endl;
-  if (CandidateLine.pointlist.size() > 1) {
-    CandidateLine.pointlist.unique();
-    CandidateLine.pointlist.sort(); //SortCandidates);
-  }
+      Log() << Verbose(2) << "Circumcircle for base line " << *BaseLine << " is too big!" << endl;
+  }
+
+  //Log() << Verbose(2) << "INFO: Sorting candidate list ..." << endl;
+  if (candidates->size() > 1) {
+    candidates->unique();
+    candidates->sort(SortCandidates);
+  }
+
+  Log() << Verbose(1) << "End of FindThirdPointForTesselation" << endl;
 };
 
@@ -3002 +2618 @@
 class BoundaryPointSet *Tesselation::GetCommonEndpoint(const BoundaryLineSet * line1, const BoundaryLineSet * line2) const
 {
-        Info FunctionInfo(__func__);
   const BoundaryLineSet * lines[2] = { line1, line2 };
   class BoundaryPointSet *node = NULL;
@@ -3016 +2631 @@
           { // if insertion fails, we have common endpoint
             node = OrderTest.first->second;
-            Log() << Verbose(1) << "Common endpoint of lines " << *line1
+            Log() << Verbose(5) << "Common endpoint of lines " << *line1
                 << " and " << *line2 << " is: " << *node << "." << endl;
             j = 2;
@@ -3033 +2648 @@
 list<BoundaryTriangleSet*> * Tesselation::FindClosestTrianglesToPoint(const Vector *x, const LinkedCell* LC) const
 {
-        Info FunctionInfo(__func__);
   TesselPoint *trianglePoints[3];
   TesselPoint *SecondPoint = NULL;
@@ -3039 +2653 @@
 
   if (LinesOnBoundary.empty()) {
-    eLog() << Verbose(1) << "Error: There is no tesselation structure to compare the point with, please create one first.";
+    Log() << Verbose(0) << "Error: There is no tesselation structure to compare the point with, please create one first.";
     return NULL;
   }
@@ -3047 +2661 @@
   // check whether closest point is "too close" :), then it's inside
   if (trianglePoints[0] == NULL) {
-    Log() << Verbose(0) << "Is the only point, no one else is closeby." << endl;
+    Log() << Verbose(2) << "Is the only point, no one else is closeby." << endl;
     return NULL;
   }
   if (trianglePoints[0]->node->DistanceSquared(x) < MYEPSILON) {
-    Log() << Verbose(1) << "Point is right on a tesselation point, no nearest triangle." << endl;
+    Log() << Verbose(3) << "Point is right on a tesselation point, no nearest triangle." << endl;
     PointMap::const_iterator PointRunner = PointsOnBoundary.find(trianglePoints[0]->nr);
     triangles = new list<BoundaryTriangleSet*>;
@@ -3075 +2689 @@
     }
   } else {
-    set<TesselPoint*> *connectedPoints = GetAllConnectedPoints(trianglePoints[0]);
-    TesselPointList *connectedClosestPoints = GetCircleOfSetOfPoints(connectedPoints, trianglePoints[0], x);
-    delete(connectedPoints);
+    list<TesselPoint*> *connectedClosestPoints = GetCircleOfConnectedPoints(trianglePoints[0], x);
     if (connectedClosestPoints != NULL) {
       trianglePoints[1] = connectedClosestPoints->front();
@@ -3085 +2697 @@
           eLog() << Verbose(1) << "IsInnerPoint encounters serious error, point " << i << " not found." << endl;
         }
-        //Log() << Verbose(1) << "List of triangle points:" << endl;
-        //Log() << Verbose(2) << *trianglePoints[i] << endl;
+        //Log() << Verbose(2) << "List of triangle points:" << endl;
+        //Log() << Verbose(3) << *trianglePoints[i] << endl;
       }
 
       triangles = FindTriangles(trianglePoints);
-      Log() << Verbose(1) << "List of possible triangles:" << endl;
+      Log() << Verbose(2) << "List of possible triangles:" << endl;
       for(list<BoundaryTriangleSet*>::iterator Runner = triangles->begin(); Runner != triangles->end(); Runner++)
-        Log() << Verbose(2) << **Runner << endl;
+        Log() << Verbose(3) << **Runner << endl;
 
       delete(connectedClosestPoints);
     } else {
       triangles = NULL;
-      eLog() << Verbose(2) << "There is no circle of connected points!" << endl;
+      Log() << Verbose(1) << "There is no circle of connected points!" << endl;
     }
   }
@@ -3117 +2729 @@
 class BoundaryTriangleSet * Tesselation::FindClosestTriangleToPoint(const Vector *x, const LinkedCell* LC) const
 {
-        Info FunctionInfo(__func__);
   class BoundaryTriangleSet *result = NULL;
   list<BoundaryTriangleSet*> *triangles = FindClosestTrianglesToPoint(x, LC);
@@ -3127 +2738 @@
   if (triangles->size() == 1) { // there is no degenerate case
     result = triangles->front();
-    Log() << Verbose(1) << "Normal Vector of this triangle is " << result->NormalVector << "." << endl;
+    Log() << Verbose(2) << "Normal Vector of this triangle is " << result->NormalVector << "." << endl;
   } else {
     result = triangles->front();
     result->GetCenter(&Center);
     Center.SubtractVector(x);
-    Log() << Verbose(1) << "Normal Vector of this front side is " << result->NormalVector << "." << endl;
+    Log() << Verbose(2) << "Normal Vector of this front side is " << result->NormalVector << "." << endl;
     if (Center.ScalarProduct(&result->NormalVector) < 0) {
       result = triangles->back();
-      Log() << Verbose(1) << "Normal Vector of this back side is " << result->NormalVector << "." << endl;
+      Log() << Verbose(2) << "Normal Vector of this back side is " << result->NormalVector << "." << endl;
       if (Center.ScalarProduct(&result->NormalVector) < 0) {
         eLog() << Verbose(1) << "Front and back side yield NormalVector in wrong direction!" << endl;
@@ -3154 +2765 @@
 bool Tesselation::IsInnerPoint(const Vector &Point, const LinkedCell* const LC) const
 {
-        Info FunctionInfo(__func__);
   class BoundaryTriangleSet *result = FindClosestTriangleToPoint(&Point, LC);
   Vector Center;
@@ -3164 +2774 @@
 
   result->GetCenter(&Center);
-  Log() << Verbose(2) << "INFO: Central point of the triangle is " << Center << "." << endl;
+  Log() << Verbose(3) << "INFO: Central point of the triangle is " << Center << "." << endl;
   Center.SubtractVector(&Point);
-  Log() << Verbose(2) << "INFO: Vector from center to point to test is " << Center << "." << endl;
+  Log() << Verbose(3) << "INFO: Vector from center to point to test is " << Center << "." << endl;
   if (Center.ScalarProduct(&result->NormalVector) > -MYEPSILON) {
     Log() << Verbose(1) << Point << " is an inner point." << endl;
@@ -3185 +2795 @@
 bool Tesselation::IsInnerPoint(const TesselPoint * const Point, const LinkedCell* const LC) const
 {
-        Info FunctionInfo(__func__);
   return IsInnerPoint(*(Point->node), LC);
 }
@@ -3197 +2806 @@
 set<TesselPoint*> * Tesselation::GetAllConnectedPoints(const TesselPoint* const Point) const
 {
-        Info FunctionInfo(__func__);
   set<TesselPoint*> *connectedPoints = new set<TesselPoint*>;
   class BoundaryPointSet *ReferencePoint = NULL;
   TesselPoint* current;
   bool takePoint = false;
+
+  Log() << Verbose(3) << "Begin of GetAllConnectedPoints" << endl;
 
   // find the respective boundary point
@@ -3208 +2818 @@
     ReferencePoint = PointRunner->second;
   } else {
-    eLog() << Verbose(2) << "GetAllConnectedPoints() could not find the BoundaryPoint belonging to " << *Point << "." << endl;
+    Log() << Verbose(2) << "GetAllConnectedPoints() could not find the BoundaryPoint belonging to " << *Point << "." << endl;
     ReferencePoint = NULL;
   }
@@ -3232 +2842 @@
 
    if (takePoint) {
-     Log() << Verbose(1) << "INFO: Endpoint " << *current << " of line " << *(findLines->second) << " is enlisted." << endl;
+     Log() << Verbose(5) << "INFO: Endpoint " << *current << " of line " << *(findLines->second) << " is enlisted." << endl;
      connectedPoints->insert(current);
    }
@@ -3244 +2854 @@
   }
 
+  Log() << Verbose(3) << "End of GetAllConnectedPoints" << endl;
   return connectedPoints;
 };
@@ -3255 +2866 @@
  *
  * @param *out output stream for debugging
- * @param *SetOfNeighbours all points for which the angle should be calculated
  * @param *Point of which get all connected points
  * @param *Reference Reference vector for zero angle or NULL for no preference
  * @return list of the all points linked to the provided one
  */
-list<TesselPoint*> * Tesselation::GetCircleOfSetOfPoints(set<TesselPoint*> *SetOfNeighbours, const TesselPoint* const Point, const Vector * const Reference) const
-{
-        Info FunctionInfo(__func__);
+list<TesselPoint*> * Tesselation::GetCircleOfConnectedPoints(const TesselPoint* const Point, const Vector * const Reference) const
+{
   map<double, TesselPoint*> anglesOfPoints;
+  set<TesselPoint*> *connectedPoints = GetAllConnectedPoints(Point);
   list<TesselPoint*> *connectedCircle = new list<TesselPoint*>;
   Vector center;
@@ -3271 +2881 @@
   Vector helper;
 
-  if (SetOfNeighbours == NULL) {
-    eLog() << Verbose(2) << "Could not find any connected points!" << endl;
+  if (connectedPoints == NULL) {
+    Log() << Verbose(2) << "Could not find any connected points!" << endl;
     delete(connectedCircle);
     return NULL;
   }
+  Log() << Verbose(2) << "Begin of GetCircleOfConnectedPoints" << endl;
 
   // calculate central point
-  for (set<TesselPoint*>::const_iterator TesselRunner = SetOfNeighbours->begin(); TesselRunner != SetOfNeighbours->end(); TesselRunner++)
+  for (set<TesselPoint*>::const_iterator TesselRunner = connectedPoints->begin(); TesselRunner != connectedPoints->end(); TesselRunner++)
     center.AddVector((*TesselRunner)->node);
   //Log() << Verbose(0) << "Summed vectors " << center << "; number of points " << connectedPoints.size()
   //  << "; scale factor " << 1.0/connectedPoints.size();
-  center.Scale(1.0/SetOfNeighbours->size());
-  Log() << Verbose(1) << "INFO: Calculated center of all circle points is " << center << "." << endl;
+  center.Scale(1.0/connectedPoints->size());
+  Log() << Verbose(4) << "INFO: Calculated center of all circle points is " << center << "." << endl;
 
   // projection plane of the circle is at the closes Point and normal is pointing away from center of all circle points
@@ -3289 +2900 @@
   PlaneNormal.SubtractVector(&center);
   PlaneNormal.Normalize();
-  Log() << Verbose(1) << "INFO: Calculated plane normal of circle is " << PlaneNormal << "." << endl;
+  Log() << Verbose(4) << "INFO: Calculated plane normal of circle is " << PlaneNormal << "." << endl;
 
   // construct one orthogonal vector
@@ -3298 +2909 @@
   }
   if ((Reference == NULL) || (AngleZero.NormSquared() < MYEPSILON )) {
-    Log() << Verbose(1) << "Using alternatively " << *(*SetOfNeighbours->begin())->node << " as angle 0 referencer." << endl;
-    AngleZero.CopyVector((*SetOfNeighbours->begin())->node);
+    Log() << Verbose(4) << "Using alternatively " << *(*connectedPoints->begin())->node << " as angle 0 referencer." << endl;
+    AngleZero.CopyVector((*connectedPoints->begin())->node);
     AngleZero.SubtractVector(Point->node);
     AngleZero.ProjectOntoPlane(&PlaneNormal);
@@ -3307 +2918 @@
     }
   }
-  Log() << Verbose(1) << "INFO: Reference vector on this plane representing angle 0 is " << AngleZero << "." << endl;
+  Log() << Verbose(4) << "INFO: Reference vector on this plane representing angle 0 is " << AngleZero << "." << endl;
   if (AngleZero.NormSquared() > MYEPSILON)
     OrthogonalVector.MakeNormalVector(&PlaneNormal, &AngleZero);
   else
     OrthogonalVector.MakeNormalVector(&PlaneNormal);
-  Log() << Verbose(1) << "INFO: OrthogonalVector on plane is " << OrthogonalVector << "." << endl;
+  Log() << Verbose(4) << "INFO: OrthogonalVector on plane is " << OrthogonalVector << "." << endl;
 
   // go through all connected points and calculate angle
-  for (set<TesselPoint*>::iterator listRunner = SetOfNeighbours->begin(); listRunner != SetOfNeighbours->end(); listRunner++) {
+  for (set<TesselPoint*>::iterator listRunner = connectedPoints->begin(); listRunner != connectedPoints->end(); listRunner++) {
     helper.CopyVector((*listRunner)->node);
     helper.SubtractVector(Point->node);
     helper.ProjectOntoPlane(&PlaneNormal);
     double angle = GetAngle(helper, AngleZero, OrthogonalVector);
-    Log() << Verbose(0) << "INFO: Calculated angle is " << angle << " for point " << **listRunner << "." << endl;
+    Log() << Verbose(3) << "INFO: Calculated angle is " << angle << " for point " << **listRunner << "." << endl;
     anglesOfPoints.insert(pair<double, TesselPoint*>(angle, (*listRunner)));
   }
@@ -3327 +2938 @@
     connectedCircle->push_back(AngleRunner->second);
   }
+
+  delete(connectedPoints);
+
+  Log() << Verbose(2) << "End of GetCircleOfConnectedPoints" << endl;
 
   return connectedCircle;
@@ -3339 +2954 @@
 list<list<TesselPoint*> *> * Tesselation::GetPathsOfConnectedPoints(const TesselPoint* const Point) const
 {
-        Info FunctionInfo(__func__);
   map<double, TesselPoint*> anglesOfPoints;
   list<list<TesselPoint*> *> *ListOfPaths = new list<list<TesselPoint*> *>;
@@ -3384 +2998 @@
         StartLine = CurrentLine;
         CurrentPoint = CurrentLine->GetOtherEndpoint(ReferencePoint);
-        Log() << Verbose(1)<< "INFO: Beginning path retrieval at " << *CurrentPoint << " of line " << *CurrentLine << "." << endl;
+        Log() << Verbose(3)<< "INFO: Beginning path retrieval at " << *CurrentPoint << " of line " << *CurrentLine << "." << endl;
         do {
           // push current one
-          Log() << Verbose(1) << "INFO: Putting " << *CurrentPoint << " at end of path." << endl;
+          Log() << Verbose(3) << "INFO: Putting " << *CurrentPoint << " at end of path." << endl;
           connectedPath->push_back(CurrentPoint->node);
 
           // find next triangle
           for (TriangleMap::iterator Runner = CurrentLine->triangles.begin(); Runner != CurrentLine->triangles.end(); Runner++) {
-            Log() << Verbose(1) << "INFO: Inspecting triangle " << *Runner->second << "." << endl;
+            Log() << Verbose(3) << "INFO: Inspecting triangle " << *Runner->second << "." << endl;
             if ((Runner->second != triangle)) { // look for first triangle not equal to old one
               triangle = Runner->second;
@@ -3399 +3013 @@
                 if (!TriangleRunner->second) {
                   TriangleRunner->second = true;
-                  Log() << Verbose(1) << "INFO: Connecting triangle is " << *triangle << "." << endl;
+                  Log() << Verbose(3) << "INFO: Connecting triangle is " << *triangle << "." << endl;
                   break;
                 } else {
-                  Log() << Verbose(1) << "INFO: Skipping " << *triangle << ", as we have already visited it." << endl;
+                  Log() << Verbose(3) << "INFO: Skipping " << *triangle << ", as we have already visited it." << endl;
                   triangle = NULL;
                 }
@@ -3417 +3031 @@
             if ((triangle->lines[i] != CurrentLine) && (triangle->lines[i]->ContainsBoundaryPoint(ReferencePoint))) { // not the current line and still containing Point
               CurrentLine = triangle->lines[i];
-              Log() << Verbose(1) << "INFO: Connecting line is " << *CurrentLine << "." << endl;
+              Log() << Verbose(3) << "INFO: Connecting line is " << *CurrentLine << "." << endl;
               break;
             }
@@ -3431 +3045 @@
         } while (CurrentLine != StartLine);
         // last point is missing, as it's on start line
-        Log() << Verbose(1) << "INFO: Putting " << *CurrentPoint << " at end of path." << endl;
+        Log() << Verbose(3) << "INFO: Putting " << *CurrentPoint << " at end of path." << endl;
         if (StartLine->GetOtherEndpoint(ReferencePoint)->node != connectedPath->back())
           connectedPath->push_back(StartLine->GetOtherEndpoint(ReferencePoint)->node);
@@ -3437 +3051 @@
         ListOfPaths->push_back(connectedPath);
       } else {
-        Log() << Verbose(1) << "INFO: Skipping " << *runner->second << ", as we have already visited it." << endl;
+        Log() << Verbose(3) << "INFO: Skipping " << *runner->second << ", as we have already visited it." << endl;
       }
     }
@@ -3455 +3069 @@
 list<list<TesselPoint*> *> * Tesselation::GetClosedPathsOfConnectedPoints(const TesselPoint* const Point) const
 {
-        Info FunctionInfo(__func__);
   list<list<TesselPoint*> *> *ListofPaths = GetPathsOfConnectedPoints(Point);
   list<list<TesselPoint*> *> *ListofClosedPaths = new list<list<TesselPoint*> *>;
@@ -3469 +3082 @@
     connectedPath = *ListRunner;
 
-    Log() << Verbose(1) << "INFO: Current path is " << connectedPath << "." << endl;
+    Log() << Verbose(2) << "INFO: Current path is " << connectedPath << "." << endl;
 
     // go through list, look for reappearance of starting Point and count
@@ -3479 +3092 @@
       if ((*CircleRunner == *CircleStart) && (CircleRunner != CircleStart)) { // is not the very first point
         // we have a closed circle from Marker to new Marker
-        Log() << Verbose(1) << count+1 << ". closed path consists of: ";
+        Log() << Verbose(3) << count+1 << ". closed path consists of: ";
         newPath = new list<TesselPoint*>;
         list<TesselPoint*>::iterator CircleSprinter = Marker;
@@ -3495 +3108 @@
     }
   }
-  Log() << Verbose(1) << "INFO: " << count << " closed additional path(s) have been created." << endl;
+  Log() << Verbose(3) << "INFO: " << count << " closed additional path(s) have been created." << endl;
 
   // delete list of paths
@@ -3517 +3130 @@
 set<BoundaryTriangleSet*> *Tesselation::GetAllTriangles(const BoundaryPointSet * const Point) const
 {
-        Info FunctionInfo(__func__);
   set<BoundaryTriangleSet*> *connectedTriangles = new set<BoundaryTriangleSet*>;
 
@@ -3556 +3168 @@
     return 0.;
   } else
-    Log() << Verbose(0) << "Removing point " << *point << " from tesselated boundary ..." << endl;
+    Log() << Verbose(2) << "Removing point " << *point << " from tesselated boundary ..." << endl;
 
   // copy old location for the volume
@@ -3586 +3198 @@
   NormalVector.Zero();
   for (map<class BoundaryTriangleSet *, int>::iterator Runner = Candidates.begin(); Runner != Candidates.end(); Runner++) {
-    Log() << Verbose(1) << "INFO: Removing triangle " << *(Runner->first) << "." << endl;
+    Log() << Verbose(3) << "INFO: Removing triangle " << *(Runner->first) << "." << endl;
     NormalVector.SubtractVector(&Runner->first->NormalVector); // has to point inward
     RemoveTesselationTriangle(Runner->first);
@@ -3616 +3228 @@
         smallestangle = 0.;
         for (MiddleNode = connectedPath->begin(); MiddleNode != connectedPath->end(); MiddleNode++) {
-          Log() << Verbose(1) << "INFO: MiddleNode is " << **MiddleNode << "." << endl;
+          Log() << Verbose(3) << "INFO: MiddleNode is " << **MiddleNode << "." << endl;
           // construct vectors to next and previous neighbour
           StartNode = MiddleNode;
@@ -3644 +3256 @@
         MiddleNode = EndNode;
         if (MiddleNode == connectedPath->end()) {
-          eLog() << Verbose(0) << "CRITICAL: Could not find a smallest angle!" << endl;
-          performCriticalExit();
+          Log() << Verbose(1) << "CRITICAL: Could not find a smallest angle!" << endl;
+          exit(255);
         }
         StartNode = MiddleNode;
@@ -3654 +3266 @@
         if (EndNode == connectedPath->end())
           EndNode = connectedPath->begin();
-        Log() << Verbose(2) << "INFO: StartNode is " << **StartNode << "." << endl;
-        Log() << Verbose(2) << "INFO: MiddleNode is " << **MiddleNode << "." << endl;
-        Log() << Verbose(2) << "INFO: EndNode is " << **EndNode << "." << endl;
-        Log() << Verbose(1) << "INFO: Attempting to create triangle " << (*StartNode)->Name << ", " << (*MiddleNode)->Name << " and " << (*EndNode)->Name << "." << endl;
+        Log() << Verbose(4) << "INFO: StartNode is " << **StartNode << "." << endl;
+        Log() << Verbose(4) << "INFO: MiddleNode is " << **MiddleNode << "." << endl;
+        Log() << Verbose(4) << "INFO: EndNode is " << **EndNode << "." << endl;
+        Log() << Verbose(3) << "INFO: Attempting to create triangle " << (*StartNode)->Name << ", " << (*MiddleNode)->Name << " and " << (*EndNode)->Name << "." << endl;
         TriangleCandidates[0] = *StartNode;
         TriangleCandidates[1] = *MiddleNode;
@@ -3663 +3275 @@
         triangle = GetPresentTriangle(TriangleCandidates);
         if (triangle != NULL) {
-          eLog() << Verbose(0) << "New triangle already present, skipping!" << endl;
+          eLog() << Verbose(2) << "New triangle already present, skipping!" << endl;
           StartNode++;
           MiddleNode++;
@@ -3675 +3287 @@
           continue;
         }
-        Log() << Verbose(3) << "Adding new triangle points."<< endl;
+        Log() << Verbose(5) << "Adding new triangle points."<< endl;
         AddTesselationPoint(*StartNode, 0);
         AddTesselationPoint(*MiddleNode, 1);
         AddTesselationPoint(*EndNode, 2);
-        Log() << Verbose(3) << "Adding new triangle lines."<< endl;
+        Log() << Verbose(5) << "Adding new triangle lines."<< endl;
         AddTesselationLine(TPS[0], TPS[1], 0);
         AddTesselationLine(TPS[0], TPS[2], 1);
@@ -3694 +3306 @@
         // prepare nodes for next triangle
         StartNode = EndNode;
-        Log() << Verbose(2) << "Removing " << **MiddleNode << " from closed path, remaining points: " << connectedPath->size() << "." << endl;
+        Log() << Verbose(4) << "Removing " << **MiddleNode << " from closed path, remaining points: " << connectedPath->size() << "." << endl;
         connectedPath->remove(*MiddleNode); // remove the middle node (it is surrounded by triangles)
         if (connectedPath->size() == 2) { // we are done
@@ -3701 +3313 @@
           break;
         } else if (connectedPath->size() < 2) { // something's gone wrong!
-          eLog() << Verbose(0) << "CRITICAL: There are only two endpoints left!" << endl;
-          performCriticalExit();
+          Log() << Verbose(1) << "CRITICAL: There are only two endpoints left!" << endl;
+          exit(255);
         } else {
           MiddleNode = StartNode;
@@ -3730 +3342 @@
           if (maxgain != 0) {
             volume += maxgain;
-            Log() << Verbose(1) << "Flipping baseline with highest volume" << **Candidate << "." << endl;
+            Log() << Verbose(3) << "Flipping baseline with highest volume" << **Candidate << "." << endl;
             OtherBase = FlipBaseline(*Candidate);
             NewLines.erase(Candidate);
@@ -3741 +3353 @@
       delete(connectedPath);
     }
-    Log() << Verbose(0) << count << " triangles were created." << endl;
+    Log() << Verbose(1) << count << " triangles were created." << endl;
   } else {
     while (!ListOfClosedPaths->empty()) {
@@ -3749 +3361 @@
       delete(connectedPath);
     }
-    Log() << Verbose(0) << "No need to create any triangles." << endl;
+    Log() << Verbose(1) << "No need to create any triangles." << endl;
   }
   delete(ListOfClosedPaths);
 
-  Log() << Verbose(0) << "Removed volume is " << volume << "." << endl;
+  Log() << Verbose(1) << "Removed volume is " << volume << "." << endl;
 
   return volume;
@@ -3770 +3382 @@
 list<BoundaryTriangleSet*> *Tesselation::FindTriangles(const TesselPoint* const Points[3]) const
 {
-        Info FunctionInfo(__func__);
   list<BoundaryTriangleSet*> *result = new list<BoundaryTriangleSet*>;
   LineMap::const_iterator FindLine;
@@ -3811 +3422 @@
 }
 
-struct BoundaryLineSetCompare {
-  bool operator() (const BoundaryLineSet * const a, const BoundaryLineSet * const b) {
-    int lowerNra = -1;
-    int lowerNrb = -1;
-
-    if (a->endpoints[0] < a->endpoints[1])
-      lowerNra = 0;
-    else
-      lowerNra = 1;
-
-    if (b->endpoints[0] < b->endpoints[1])
-      lowerNrb = 0;
-    else
-      lowerNrb = 1;
-
-    if (a->endpoints[lowerNra] < b->endpoints[lowerNrb])
-      return true;
-    else if (a->endpoints[lowerNra] > b->endpoints[lowerNrb])
-      return false;
-    else {  // both lower-numbered endpoints are the same ...
-     if (a->endpoints[(lowerNra+1)%2] < b->endpoints[(lowerNrb+1)%2])
-       return true;
-     else if (a->endpoints[(lowerNra+1)%2] > b->endpoints[(lowerNrb+1)%2])
-       return false;
-    }
-    return false;
-  };
-};
-
-#define UniqueLines set < class BoundaryLineSet *, BoundaryLineSetCompare>
-
 /**
  * Finds all degenerated lines within the tesselation structure.
@@ -3850 +3430 @@
 map<int, int> * Tesselation::FindAllDegeneratedLines()
 {
-        Info FunctionInfo(__func__);
-        UniqueLines AllLines;
+  map<int, class BoundaryLineSet *> AllLines;
   map<int, int> * DegeneratedLines = new map<int, int>;
 
   // sanity check
   if (LinesOnBoundary.empty()) {
-    eLog() << Verbose(2) << "FindAllDegeneratedTriangles() was called without any tesselation structure.";
+    Log() << Verbose(1) << "Warning: FindAllDegeneratedTriangles() was called without any tesselation structure.";
     return DegeneratedLines;
   }
 
   LineMap::iterator LineRunner1;
-  pair< UniqueLines::iterator, bool> tester;
+  pair<LineMap::iterator, bool> tester;
   for (LineRunner1 = LinesOnBoundary.begin(); LineRunner1 != LinesOnBoundary.end(); ++LineRunner1) {
-    tester = AllLines.insert( LineRunner1->second );
-    if (!tester.second) { // found degenerated line
-      DegeneratedLines->insert ( pair<int, int> (LineRunner1->second->Nr, (*tester.first)->Nr) );
-      DegeneratedLines->insert ( pair<int, int> ((*tester.first)->Nr, LineRunner1->second->Nr) );
+    tester = AllLines.insert( pair<int,BoundaryLineSet *> (LineRunner1->second->endpoints[0]->Nr, LineRunner1->second) );
+    if ((!tester.second) && (tester.first->second->endpoints[1]->Nr == LineRunner1->second->endpoints[1]->Nr)) { // found degenerated line
+      DegeneratedLines->insert ( pair<int, int> (LineRunner1->second->Nr, tester.first->second->Nr) );
+      DegeneratedLines->insert ( pair<int, int> (tester.first->second->Nr, LineRunner1->second->Nr) );
     }
   }
@@ -3872 +3451 @@
   AllLines.clear();
 
-  Log() << Verbose(0) << "FindAllDegeneratedLines() found " << DegeneratedLines->size() << " lines." << endl;
+  Log() << Verbose(1) << "FindAllDegeneratedLines() found " << DegeneratedLines->size() << " lines." << endl;
   map<int,int>::iterator it;
-  for (it = DegeneratedLines->begin(); it != DegeneratedLines->end(); it++) {
-    const LineMap::const_iterator Line1 = LinesOnBoundary.find((*it).first);
-    const LineMap::const_iterator Line2 = LinesOnBoundary.find((*it).second);
-    if (Line1 != LinesOnBoundary.end() && Line2 != LinesOnBoundary.end())
-      Log() << Verbose(0) << *Line1->second << " => " << *Line2->second << endl;
-    else
-      eLog() << Verbose(1) << "Either " << (*it).first << " or " << (*it).second << " are not in LinesOnBoundary!" << endl;
-  }
+  for (it = DegeneratedLines->begin(); it != DegeneratedLines->end(); it++)
+      Log() << Verbose(2) << (*it).first << " => " << (*it).second << endl;
 
   return DegeneratedLines;
@@ -3894 +3467 @@
 map<int, int> * Tesselation::FindAllDegeneratedTriangles()
 {
-        Info FunctionInfo(__func__);
   map<int, int> * DegeneratedLines = FindAllDegeneratedLines();
   map<int, int> * DegeneratedTriangles = new map<int, int>;
@@ -3922 +3494 @@
   delete(DegeneratedLines);
 
-  Log() << Verbose(0) << "FindAllDegeneratedTriangles() found " << DegeneratedTriangles->size() << " triangles:" << endl;
+  Log() << Verbose(1) << "FindAllDegeneratedTriangles() found " << DegeneratedTriangles->size() << " triangles:" << endl;
   map<int,int>::iterator it;
   for (it = DegeneratedTriangles->begin(); it != DegeneratedTriangles->end(); it++)
-      Log() << Verbose(0) << (*it).first << " => " << (*it).second << endl;
+      Log() << Verbose(2) << (*it).first << " => " << (*it).second << endl;
 
   return DegeneratedTriangles;
@@ -3936 +3508 @@
 void Tesselation::RemoveDegeneratedTriangles()
 {
-        Info FunctionInfo(__func__);
   map<int, int> * DegeneratedTriangles = FindAllDegeneratedTriangles();
   TriangleMap::iterator finder;
   BoundaryTriangleSet *triangle = NULL, *partnerTriangle = NULL;
   int count  = 0;
+
+  Log() << Verbose(1) << "Begin of RemoveDegeneratedTriangles" << endl;
 
   for (map<int, int>::iterator TriangleKeyRunner = DegeneratedTriangles->begin();
@@ -3999 +3572 @@
       // erase the pair
       count += (int) DegeneratedTriangles->erase(triangle->Nr);
-      Log() << Verbose(0) << "RemoveDegeneratedTriangles() removes triangle " << *triangle << "." << endl;
+      Log() << Verbose(1) << "RemoveDegeneratedTriangles() removes triangle " << *triangle << "." << endl;
       RemoveTesselationTriangle(triangle);
       count += (int) DegeneratedTriangles->erase(partnerTriangle->Nr);
-      Log() << Verbose(0) << "RemoveDegeneratedTriangles() removes triangle " << *partnerTriangle << "." << endl;
+      Log() << Verbose(1) << "RemoveDegeneratedTriangles() removes triangle " << *partnerTriangle << "." << endl;
       RemoveTesselationTriangle(partnerTriangle);
     } else {
-      Log() << Verbose(0) << "RemoveDegeneratedTriangles() does not remove triangle " << *triangle
+      Log() << Verbose(1) << "RemoveDegeneratedTriangles() does not remove triangle " << *triangle
         << " and its partner " << *partnerTriangle << " because it is essential for at"
         << " least one of the endpoints to be kept in the tesselation structure." << endl;
@@ -4011 +3584 @@
   }
   delete(DegeneratedTriangles);
-  if (count > 0)
-    LastTriangle = NULL;
-
-  Log() << Verbose(0) << "RemoveDegeneratedTriangles() removed " << count << " triangles:" << endl;
+
+  Log() << Verbose(1) << "RemoveDegeneratedTriangles() removed " << count << " triangles:" << endl;
+  Log() << Verbose(1) << "End of RemoveDegeneratedTriangles" << endl;
 }
 
@@ -4027 +3599 @@
 void Tesselation::AddBoundaryPointByDegeneratedTriangle(class TesselPoint *point, LinkedCell *LC)
 {
-        Info FunctionInfo(__func__);
+  Log() << Verbose(2) << "Begin of AddBoundaryPointByDegeneratedTriangle" << endl;
+
   // find nearest boundary point
   class TesselPoint *BackupPoint = NULL;
@@ -4043 +3616 @@
     return;
   }
-  Log() << Verbose(0) << "Nearest point on boundary is " << NearestPoint->Name << "." << endl;
+  Log() << Verbose(2) << "Nearest point on boundary is " << NearestPoint->Name << "." << endl;
 
   // go through its lines and find the best one to split
@@ -4076 +3649 @@
 
   // create new triangle to connect point (connects automatically with the missing spot of the chosen line)
-  Log() << Verbose(2) << "Adding new triangle points."<< endl;
+  Log() << Verbose(5) << "Adding new triangle points."<< endl;
   AddTesselationPoint((BestLine->endpoints[0]->node), 0);
   AddTesselationPoint((BestLine->endpoints[1]->node), 1);
   AddTesselationPoint(point, 2);
-  Log() << Verbose(2) << "Adding new triangle lines."<< endl;
+  Log() << Verbose(5) << "Adding new triangle lines."<< endl;
   AddTesselationLine(TPS[0], TPS[1], 0);
   AddTesselationLine(TPS[0], TPS[2], 1);
@@ -4087 +3660 @@
   BTS->GetNormalVector(TempTriangle->NormalVector);
   BTS->NormalVector.Scale(-1.);
-  Log() << Verbose(1) << "INFO: NormalVector of new triangle is " << BTS->NormalVector << "." << endl;
+  Log() << Verbose(3) << "INFO: NormalVector of new triangle is " << BTS->NormalVector << "." << endl;
   AddTesselationTriangle();
 
   // create other side of this triangle and close both new sides of the first created triangle
-  Log() << Verbose(2) << "Adding new triangle points."<< endl;
+  Log() << Verbose(5) << "Adding new triangle points."<< endl;
   AddTesselationPoint((BestLine->endpoints[0]->node), 0);
   AddTesselationPoint((BestLine->endpoints[1]->node), 1);
   AddTesselationPoint(point, 2);
-  Log() << Verbose(2) << "Adding new triangle lines."<< endl;
+  Log() << Verbose(5) << "Adding new triangle lines."<< endl;
   AddTesselationLine(TPS[0], TPS[1], 0);
   AddTesselationLine(TPS[0], TPS[2], 1);
@@ -4101 +3674 @@
   BTS = new class BoundaryTriangleSet(BLS, TrianglesOnBoundaryCount);
   BTS->GetNormalVector(TempTriangle->NormalVector);
-  Log() << Verbose(1) << "INFO: NormalVector of other new triangle is " << BTS->NormalVector << "." << endl;
+  Log() << Verbose(3) << "INFO: NormalVector of other new triangle is " << BTS->NormalVector << "." << endl;
   AddTesselationTriangle();
 
@@ -4108 +3681 @@
     if ((BTS->lines[i]->ContainsBoundaryPoint(BestLine->endpoints[0])) && (BTS->lines[i]->ContainsBoundaryPoint(BestLine->endpoints[1]))) {
       if (BestLine == BTS->lines[i]){
-        eLog() << Verbose(0) << "BestLine is same as found line, something's wrong here!" << endl;
-        performCriticalExit();
+        Log() << Verbose(1) << "CRITICAL: BestLine is same as found line, something's wrong here!" << endl;
+        exit(255);
       }
       BTS->lines[i]->triangles.insert( pair<int, class BoundaryTriangleSet *> (TempTriangle->Nr, TempTriangle) );
@@ -4116 +3689 @@
     }
   }
+
+  // exit
+  Log() << Verbose(2) << "End of AddBoundaryPointByDegeneratedTriangle" << endl;
 };
 
@@ -4125 +3701 @@
 void Tesselation::Output(const char *filename, const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   ofstream *tempstream = NULL;
   string NameofTempFile;
@@ -4138 +3713 @@
       NameofTempFile.erase(npos, 1);
       NameofTempFile.append(TecplotSuffix);
-      Log() << Verbose(0) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n";
+      Log() << Verbose(1) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n";
       tempstream = new ofstream(NameofTempFile.c_str(), ios::trunc);
       WriteTecplotFile(tempstream, this, cloud, TriangleFilesWritten);
@@ -4152 +3727 @@
       NameofTempFile.erase(npos, 1);
       NameofTempFile.append(Raster3DSuffix);
-      Log() << Verbose(0) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n";
+      Log() << Verbose(1) << "Writing temporary non convex hull to file " << NameofTempFile << ".\n";
       tempstream = new ofstream(NameofTempFile.c_str(), ios::trunc);
       WriteRaster3dFile(tempstream, this, cloud);
@@ -4164 +3739 @@
     TriangleFilesWritten++;
 };
-
-struct BoundaryPolygonSetCompare {
-  bool operator()(const BoundaryPolygonSet * s1, const BoundaryPolygonSet * s2) const {
-    if (s1->endpoints.size() < s2->endpoints.size())
-      return true;
-    else if (s1->endpoints.size() > s2->endpoints.size())
-      return false;
-    else { // equality of number of endpoints
-      PointSet::const_iterator Walker1 = s1->endpoints.begin();
-      PointSet::const_iterator Walker2 = s2->endpoints.begin();
-      while ((Walker1 != s1->endpoints.end()) || (Walker2 != s2->endpoints.end())) {
-        if ((*Walker1)->Nr < (*Walker2)->Nr)
-          return true;
-        else if ((*Walker1)->Nr > (*Walker2)->Nr)
-          return false;
-        Walker1++;
-        Walker2++;
-      }
-      return false;
-    }
-  }
-};
-
-#define UniquePolygonSet set < BoundaryPolygonSet *, BoundaryPolygonSetCompare>
-
-/** Finds all degenerated polygons and calls ReTesselateDegeneratedPolygon()/
- * \return number of polygons found
- */
-int Tesselation::CorrectAllDegeneratedPolygons()
-{
-  Info FunctionInfo(__func__);
-
-  /// 2. Go through all BoundaryPointSet's, check their triangles' NormalVector
-  map <int, int> *DegeneratedTriangles = FindAllDegeneratedTriangles();
-  set < BoundaryPointSet *> EndpointCandidateList;
-  pair < set < BoundaryPointSet *>::iterator, bool > InsertionTester;
-  pair < map < int, Vector *>::iterator, bool > TriangleInsertionTester;
-  for (PointMap::const_iterator Runner = PointsOnBoundary.begin(); Runner != PointsOnBoundary.end(); Runner++) {
-    Log() << Verbose(0) << "Current point is " << *Runner->second << "." << endl;
-    map < int, Vector *> TriangleVectors;
-    // gather all NormalVectors
-    Log() << Verbose(1) << "Gathering triangles ..." << endl;
-    for (LineMap::const_iterator LineRunner = (Runner->second)->lines.begin(); LineRunner != (Runner->second)->lines.end(); LineRunner++)
-      for (TriangleMap::const_iterator TriangleRunner = (LineRunner->second)->triangles.begin(); TriangleRunner != (LineRunner->second)->triangles.end(); TriangleRunner++) {
-        if (DegeneratedTriangles->find(TriangleRunner->second->Nr) == DegeneratedTriangles->end()) {
-          TriangleInsertionTester = TriangleVectors.insert( pair< int, Vector *> ((TriangleRunner->second)->Nr, &((TriangleRunner->second)->NormalVector)) );
-          if (TriangleInsertionTester.second)
-            Log() << Verbose(1) << " Adding triangle " << *(TriangleRunner->second) << " to triangles to check-list." << endl;
-        } else {
-          Log() << Verbose(1) << " NOT adding triangle " << *(TriangleRunner->second) << " as it's a simply degenerated one." << endl;
-        }
-      }
-    // check whether there are two that are parallel
-    Log() << Verbose(1) << "Finding two parallel triangles ..." << endl;
-    for (map < int, Vector *>::iterator VectorWalker = TriangleVectors.begin(); VectorWalker != TriangleVectors.end(); VectorWalker++)
-      for (map < int, Vector *>::iterator VectorRunner = VectorWalker; VectorRunner != TriangleVectors.end(); VectorRunner++)
-        if (VectorWalker != VectorRunner) { // skip equals
-          const double SCP = VectorWalker->second->ScalarProduct(VectorRunner->second);  // ScalarProduct should result in -1. for degenerated triangles
-          Log() << Verbose(1) << "Checking " << *VectorWalker->second<< " against " << *VectorRunner->second << ": " << SCP << endl;
-          if (fabs(SCP + 1.) < ParallelEpsilon) {
-            InsertionTester = EndpointCandidateList.insert((Runner->second));
-            if (InsertionTester.second)
-              Log() << Verbose(0) << " Adding " << *Runner->second << " to endpoint candidate list." << endl;
-            // and break out of both loops
-            VectorWalker = TriangleVectors.end();
-            VectorRunner = TriangleVectors.end();
-            break;
-          }
-        }
-  }
-
-  /// 3. Find connected endpoint candidates and put them into a polygon
-  UniquePolygonSet ListofDegeneratedPolygons;
-  BoundaryPointSet *Walker = NULL;
-  BoundaryPointSet *OtherWalker = NULL;
-  BoundaryPolygonSet *Current = NULL;
-  stack <BoundaryPointSet*> ToCheckConnecteds;
-  while (!EndpointCandidateList.empty()) {
-    Walker = *(EndpointCandidateList.begin());
-    if (Current == NULL) {  // create a new polygon with current candidate
-      Log() << Verbose(0) << "Starting new polygon set at point " << *Walker << endl;
-      Current = new BoundaryPolygonSet;
-      Current->endpoints.insert(Walker);
-      EndpointCandidateList.erase(Walker);
-      ToCheckConnecteds.push(Walker);
-    }
-
-    // go through to-check stack
-    while (!ToCheckConnecteds.empty()) {
-      Walker = ToCheckConnecteds.top(); // fetch ...
-      ToCheckConnecteds.pop(); // ... and remove
-      for (LineMap::const_iterator LineWalker = Walker->lines.begin(); LineWalker != Walker->lines.end(); LineWalker++) {
-        OtherWalker = (LineWalker->second)->GetOtherEndpoint(Walker);
-        Log() << Verbose(1) << "Checking " << *OtherWalker << endl;
-        set < BoundaryPointSet *>::iterator Finder = EndpointCandidateList.find(OtherWalker);
-        if (Finder != EndpointCandidateList.end()) {  // found a connected partner
-          Log() << Verbose(1) << " Adding to polygon." << endl;
-          Current->endpoints.insert(OtherWalker);
-          EndpointCandidateList.erase(Finder);  // remove from candidates
-          ToCheckConnecteds.push(OtherWalker);  // but check its partners too
-        } else {
-          Log() << Verbose(1) << " is not connected to " << *Walker << endl;
-        }
-      }
-    }
-
-    Log() << Verbose(0) << "Final polygon is " << *Current << endl;
-    ListofDegeneratedPolygons.insert(Current);
-    Current = NULL;
-  }
-
-  const int counter = ListofDegeneratedPolygons.size();
-
-  Log() << Verbose(0) << "The following " << counter << " degenerated polygons have been found: " << endl;
-  for (UniquePolygonSet::iterator PolygonRunner = ListofDegeneratedPolygons.begin(); PolygonRunner != ListofDegeneratedPolygons.end(); PolygonRunner++)
-    Log() << Verbose(0) << " " << **PolygonRunner << endl;
-
-  /// 4. Go through all these degenerated polygons
-  for (UniquePolygonSet::iterator PolygonRunner = ListofDegeneratedPolygons.begin(); PolygonRunner != ListofDegeneratedPolygons.end(); PolygonRunner++) {
-    stack <int> TriangleNrs;
-    Vector NormalVector;
-    /// 4a. Gather all triangles of this polygon
-    TriangleSet *T = (*PolygonRunner)->GetAllContainedTrianglesFromEndpoints();
-
-    if (T->size() == 2) {
-      Log() << Verbose(1) << " Skipping degenerated polygon, is just a (already simply degenerated) triangle." << endl;
-      delete(T);
-      continue;
-    }
-
-    TriangleSet::iterator TriangleWalker = T->begin();  // is the inner iterator
-    /// 4a. Get NormalVector for one side (this is "front")
-    NormalVector.CopyVector(&(*TriangleWalker)->NormalVector);
-    Log() << Verbose(1) << "\"front\" defining triangle is " << **TriangleWalker << " and Normal vector of \"front\" side is " << NormalVector << endl;
-    TriangleWalker++;
-    TriangleSet::iterator TriangleSprinter = TriangleWalker; // is the inner advanced iterator
-    /// 4b. Remove all triangles whose NormalVector is in opposite direction (i.e. "back")
-    BoundaryTriangleSet *triangle = NULL;
-    while (TriangleSprinter != T->end()) {
-      TriangleWalker = TriangleSprinter;
-      triangle = *TriangleWalker;
-      TriangleSprinter++;
-      Log() << Verbose(1) << "Current triangle to test for removal: " << *triangle << endl;
-      if (triangle->NormalVector.ScalarProduct(&NormalVector) < 0) { // if from other side, then delete and remove from list
-        Log() << Verbose(1) << " Removing ... " << endl;
-        TriangleNrs.push(triangle->Nr);
-        T->erase(TriangleWalker);
-        RemoveTesselationTriangle(triangle);
-      } else
-        Log() << Verbose(1) << " Keeping ... " << endl;
-    }
-    /// 4c. Copy all "front" triangles but with inverse NormalVector
-    TriangleWalker = T->begin();
-    while (TriangleWalker != T->end()) {  // go through all front triangles
-      Log() << Verbose(1) << " Re-creating triangle " << **TriangleWalker << " with NormalVector " << (*TriangleWalker)->NormalVector << endl;
-      for (int i = 0; i < 3; i++)
-        AddTesselationPoint((*TriangleWalker)->endpoints[i]->node, i);
-      AddTesselationLine(TPS[0], TPS[1], 0);
-      AddTesselationLine(TPS[0], TPS[2], 1);
-      AddTesselationLine(TPS[1], TPS[2], 2);
-      if (TriangleNrs.empty())
-        eLog() << Verbose(0) << "No more free triangle numbers!" << endl;
-      BTS = new BoundaryTriangleSet(BLS, TriangleNrs.top()); // copy triangle ...
-      AddTesselationTriangle(); // ... and add
-      TriangleNrs.pop();
-      BTS->NormalVector.CopyVector(&(*TriangleWalker)->NormalVector);
-      BTS->NormalVector.Scale(-1.);
-      TriangleWalker++;
-    }
-    if (!TriangleNrs.empty()) {
-      eLog() << Verbose(0) << "There have been less triangles created than removed!" << endl;
-    }
-    delete(T);  // remove the triangleset
-  }
-
-  map<int, int> * SimplyDegeneratedTriangles = FindAllDegeneratedTriangles();
-  Log() << Verbose(0) << "Final list of simply degenerated triangles found, containing " << SimplyDegeneratedTriangles->size() << " triangles:" << endl;
-  map<int,int>::iterator it;
-  for (it = SimplyDegeneratedTriangles->begin(); it != SimplyDegeneratedTriangles->end(); it++)
-      Log() << Verbose(0) << (*it).first << " => " << (*it).second << endl;
-  delete(SimplyDegeneratedTriangles);
-
-  /// 5. exit
-  UniquePolygonSet::iterator PolygonRunner;
-  while (!ListofDegeneratedPolygons.empty()) {
-    PolygonRunner = ListofDegeneratedPolygons.begin();
-    delete(*PolygonRunner);
-    ListofDegeneratedPolygons.erase(PolygonRunner);
-  }
-
-  return counter;
-};

src/tesselation.hpp

@@ -23 +23 @@
 #include <list>
 #include <set>
-#include <stack>
 
 #include "atom_particleinfo.hpp"
@@ -48 +47 @@
 #define VRMLSUffix ".wrl"
 
-#define ParallelEpsilon 1e-3
-
 // ======================================================= some template functions =========================================
 
 #define PointMap map < int, class BoundaryPointSet * >
-#define PointSet set < class BoundaryPointSet * >
-#define PointList list < class BoundaryPointSet * >
 #define PointPair pair < int, class BoundaryPointSet * >
 #define PointTestPair pair < PointMap::iterator, bool >
-
 #define CandidateList list <class CandidateForTesselation *>
-#define CandidateMap map <class BoundaryLineSet *, class CandidateForTesselation *>
 
 #define LineMap multimap < int, class BoundaryLineSet * >
-#define LineSet set < class BoundaryLineSet * >
-#define LineList list < class BoundaryLineSet * >
 #define LinePair pair < int, class BoundaryLineSet * >
 #define LineTestPair pair < LineMap::iterator, bool >
 
 #define TriangleMap map < int, class BoundaryTriangleSet * >
-#define TriangleSet set < class BoundaryTriangleSet * >
-#define TriangleList list < class BoundaryTriangleSet * >
 #define TrianglePair pair < int, class BoundaryTriangleSet * >
 #define TriangleTestPair pair < TrianglePair::iterator, bool >
 
-#define PolygonMap map < int, class BoundaryPolygonSet * >
-#define PolygonSet set < class BoundaryPolygonSet * >
-#define PolygonList list < class BoundaryPolygonSet * >
-
 #define DistanceMultiMap multimap <double, pair < PointMap::iterator, PointMap::iterator> >
 #define DistanceMultiMapPair pair <double, pair < PointMap::iterator, PointMap::iterator> >
-
-#define TesselPointList list <TesselPoint *>
-#define TesselPointSet set <TesselPoint *>
 
 /********************************************** declarations *******************************/
@@ -132 +114 @@
     TriangleMap triangles;
     int Nr;
-    bool skipped;
 };
 
@@ -158 +139 @@
     class BoundaryLineSet *lines[3];
     Vector NormalVector;
-    Vector SphereCenter;
     int Nr;
 };
 
 ostream & operator << (ostream &ost, const BoundaryTriangleSet &a);
-
-
-// ======================================================== class BoundaryTriangleSet =======================================
-
-/** Set of BoundaryPointSet.
- * This is just meant as a container for a group of endpoints, extending the node, line, triangle concept. However, this has
- * only marginally something to do with the tesselation. Hence, there is no incorporation into the bookkeeping of the Tesselation
- * class (i.e. no allocation, no deletion).
- * \note we assume that the set of endpoints reside (more or less) on a plane.
- */
-class BoundaryPolygonSet {
-  public:
-    BoundaryPolygonSet();
-    ~BoundaryPolygonSet();
-
-    Vector * GetNormalVector(const Vector &NormalVector) const;
-    void GetCenter(Vector *center) const;
-    bool ContainsBoundaryLine(const BoundaryLineSet * const line) const;
-    bool ContainsBoundaryPoint(const BoundaryPointSet * const point) const;
-    bool ContainsBoundaryPoint(const TesselPoint * const point) const;
-    bool ContainsBoundaryTriangle(const BoundaryTriangleSet * const point) const;
-    bool ContainsPresentTupel(const BoundaryPointSet * const * Points, const int dim) const;
-    bool ContainsPresentTupel(const BoundaryPolygonSet * const P) const;
-    bool ContainsPresentTupel(const PointSet &endpoints) const;
-    TriangleSet * GetAllContainedTrianglesFromEndpoints() const;
-    bool FillPolygonFromTrianglesOfLine(const BoundaryLineSet * const line);
-
-    PointSet endpoints;
-    int Nr;
-};
-
-ostream & operator << (ostream &ost, const BoundaryPolygonSet &a);
 
 // =========================================================== class TESSELPOINT ===========================================
@@ -222 +170 @@
   virtual ~PointCloud();
 
-  virtual const char * const GetName() const { return "unknown"; };
   virtual Vector *GetCenter() const { return NULL; };
   virtual TesselPoint *GetPoint() const { return NULL; };
@@ -230 +177 @@
   virtual void GoToFirst() const {};
   virtual void GoToLast() const {};
-  virtual bool IsEmpty() const { return true; };
-  virtual bool IsEnd() const { return true; };
+  virtual bool IsEmpty() const { return false; };
+  virtual bool IsEnd() const { return false; };
 };
 
@@ -238 +185 @@
 class CandidateForTesselation {
   public :
-  CandidateForTesselation(BoundaryLineSet* currentBaseLine);
   CandidateForTesselation(TesselPoint* candidate, BoundaryLineSet* currentBaseLine, Vector OptCandidateCenter, Vector OtherOptCandidateCenter);
   ~CandidateForTesselation();
 
-  TesselPointList pointlist;
+  TesselPoint *point;
   BoundaryLineSet *BaseLine;
   Vector OptCenter;
   Vector OtherOptCenter;
-  bool IsDegenerated;
-  double ShortestAngle;
-  double OtherShortestAngle;
-};
-
-ostream & operator <<(ostream &ost, const  CandidateForTesselation &a);
+};
 
 // =========================================================== class TESSELATION ===========================================
@@ -269 +210 @@
     void AddTesselationTriangle();
     void AddTesselationTriangle(const int nr);
-    void AddCandidateTriangle(CandidateForTesselation CandidateLine);
     void RemoveTesselationTriangle(class BoundaryTriangleSet *triangle);
     void RemoveTesselationLine(class BoundaryLineSet *line);
@@ -278 +218 @@
     void FindStartingTriangle(const double RADIUS, const LinkedCell *LC);
     void FindSecondPointForTesselation(class TesselPoint* a, Vector Oben, class TesselPoint*& OptCandidate, double Storage[3], double RADIUS, const LinkedCell *LC);
-    void FindThirdPointForTesselation(Vector &NormalVector, Vector &SearchDirection, Vector &OldSphereCenter, CandidateForTesselation &CandidateLine, const class TesselPoint  * const ThirdNode, const double RADIUS, const LinkedCell *LC) const;
-    bool FindNextSuitableTriangle(CandidateForTesselation &CandidateLine, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC);
+    void FindThirdPointForTesselation(Vector &NormalVector, Vector &SearchDirection, Vector &OldSphereCenter, class BoundaryLineSet *BaseLine, const class TesselPoint * const ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, const LinkedCell *LC) const;
+    bool FindNextSuitableTriangle(BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC);
     int CheckPresenceOfTriangle(class TesselPoint *Candidates[3]) const;
     class BoundaryTriangleSet * GetPresentTriangle(TesselPoint *Candidates[3]);
@@ -295 +235 @@
     void RemoveDegeneratedTriangles();
     void AddBoundaryPointByDegeneratedTriangle(class TesselPoint *point, LinkedCell *LC);
-    int CorrectAllDegeneratedPolygons();
 
     set<TesselPoint*> * GetAllConnectedPoints(const TesselPoint* const Point) const;
@@ -301 +240 @@
     list<list<TesselPoint*> *> * GetPathsOfConnectedPoints(const TesselPoint* const Point) const;
     list<list<TesselPoint*> *> * GetClosedPathsOfConnectedPoints(const TesselPoint* const Point) const;
-    list<TesselPoint*> * GetCircleOfSetOfPoints(set<TesselPoint*> *SetOfNeighbours, const TesselPoint* const Point, const Vector * const Reference = NULL) const;
+    list<TesselPoint*> * GetCircleOfConnectedPoints(const TesselPoint* const Point, const Vector * const Reference = NULL) const;
     class BoundaryPointSet *GetCommonEndpoint(const BoundaryLineSet * line1, const BoundaryLineSet * line2) const;
     list<BoundaryTriangleSet*> *FindTriangles(const TesselPoint* const Points[3]) const;
@@ -320 +259 @@
     PointMap PointsOnBoundary;
     LineMap LinesOnBoundary;
-    CandidateMap OpenLines;
     TriangleMap TrianglesOnBoundary;
     int PointsOnBoundaryCount;
@@ -348 +286 @@
     mutable PointMap::const_iterator InternalPointer;
 
-    //bool HasOtherBaselineBetterCandidate(const BoundaryLineSet * const BaseRay, const TesselPoint * const OptCandidate, double ShortestAngle, double RADIUS, const LinkedCell * const LC) const;
+    bool HasOtherBaselineBetterCandidate(const BoundaryLineSet * const BaseRay, const TesselPoint * const OptCandidate, double ShortestAngle, double RADIUS, const LinkedCell * const LC) const;
 };
 

src/tesselationhelpers.cpp

@@ -8 +8 @@
 #include <fstream>
 
-#include "info.hpp"
 #include "linkedcell.hpp"
 #include "log.hpp"
@@ -16 +15 @@
 #include "verbose.hpp"
 
-double DetGet(gsl_matrix * const A, const int inPlace)
-{
-        Info FunctionInfo(__func__);
+double DetGet(gsl_matrix * const A, const int inPlace) {
   /*
   inPlace = 1 => A is replaced with the LU decomposed copy.
@@ -48 +45 @@
 void GetSphere(Vector * const center, const Vector &a, const Vector &b, const Vector &c, const double RADIUS)
 {
-        Info FunctionInfo(__func__);
   gsl_matrix *A = gsl_matrix_calloc(3,3);
   double m11, m12, m13, m14;
@@ -115 +111 @@
     const double HalfplaneIndicator, const double AlternativeIndicator, const double alpha, const double beta, const double gamma, const double RADIUS, const double Umkreisradius)
 {
-        Info FunctionInfo(__func__);
   Vector TempNormal, helper;
   double Restradius;
   Vector OtherCenter;
+  Log() << Verbose(3) << "Begin of GetCenterOfSphere.\n";
   Center->Zero();
   helper.CopyVector(&a);
@@ -132 +128 @@
   Center->Scale(1./(sin(2.*alpha) + sin(2.*beta) + sin(2.*gamma)));
   NewUmkreismittelpunkt->CopyVector(Center);
-  Log() << Verbose(1) << "Center of new circumference is " << *NewUmkreismittelpunkt << ".\n";
+  Log() << Verbose(4) << "Center of new circumference is " << *NewUmkreismittelpunkt << ".\n";
   // Here we calculated center of circumscribing circle, using barycentric coordinates
-  Log() << Verbose(1) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n";
+  Log() << Verbose(4) << "Center of circumference is " << *Center << " in direction " << *Direction << ".\n";
 
   TempNormal.CopyVector(&a);
@@ -158 +154 @@
   TempNormal.Normalize();
   Restradius = sqrt(RADIUS*RADIUS - Umkreisradius*Umkreisradius);
-  Log() << Verbose(1) << "Height of center of circumference to center of sphere is " << Restradius << ".\n";
+  Log() << Verbose(4) << "Height of center of circumference to center of sphere is " << Restradius << ".\n";
   TempNormal.Scale(Restradius);
-  Log() << Verbose(1) << "Shift vector to sphere of circumference is " << TempNormal << ".\n";
+  Log() << Verbose(4) << "Shift vector to sphere of circumference is " << TempNormal << ".\n";
 
   Center->AddVector(&TempNormal);
-  Log() << Verbose(1) << "Center of sphere of circumference is " << *Center << ".\n";
+  Log() << Verbose(0) << "Center of sphere of circumference is " << *Center << ".\n";
   GetSphere(&OtherCenter, a, b, c, RADIUS);
-  Log() << Verbose(1) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
+  Log() << Verbose(0) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
+  Log() << Verbose(3) << "End of GetCenterOfSphere.\n";
 };
 
@@ -177 +174 @@
 void GetCenterofCircumcircle(Vector * const Center, const Vector &a, const Vector &b, const Vector &c)
 {
-        Info FunctionInfo(__func__);
   Vector helper;
   double alpha, beta, gamma;
@@ -190 +186 @@
   beta = M_PI - SideC.Angle(&SideA);
   gamma = M_PI - SideA.Angle(&SideB);
-  //Log() << Verbose(1) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
+  //Log() << Verbose(3) << "INFO: alpha = " << alpha/M_PI*180. << ", beta = " << beta/M_PI*180. << ", gamma = " << gamma/M_PI*180. << "." << endl;
   if (fabs(M_PI - alpha - beta - gamma) > HULLEPSILON) {
-    eLog() << Verbose(1) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
+    eLog() << Verbose(0) << "GetCenterofCircumcircle: Sum of angles " << (alpha+beta+gamma)/M_PI*180. << " > 180 degrees by " << fabs(M_PI - alpha - beta - gamma)/M_PI*180. << "!" << endl;
+    performCriticalExit();
   }
 
@@ -223 +220 @@
 double GetPathLengthonCircumCircle(const Vector &CircleCenter, const Vector &CirclePlaneNormal, const double CircleRadius, const Vector &NewSphereCenter, const Vector &OldSphereCenter, const Vector &NormalVector, const Vector &SearchDirection)
 {
-        Info FunctionInfo(__func__);
   Vector helper;
   double radius, alpha;
-  Vector RelativeOldSphereCenter;
-  Vector RelativeNewSphereCenter;
-
-  RelativeOldSphereCenter.CopyVector(&OldSphereCenter);
-  RelativeOldSphereCenter.SubtractVector(&CircleCenter);
-  RelativeNewSphereCenter.CopyVector(&NewSphereCenter);
-  RelativeNewSphereCenter.SubtractVector(&CircleCenter);
-  helper.CopyVector(&RelativeNewSphereCenter);
+
+  helper.CopyVector(&NewSphereCenter);
   // test whether new center is on the parameter circle's plane
   if (fabs(helper.ScalarProduct(&CirclePlaneNormal)) > HULLEPSILON) {
@@ -239 +229 @@
     helper.ProjectOntoPlane(&CirclePlaneNormal);
   }
-  radius = helper.NormSquared();
+  radius = helper.ScalarProduct(&helper);
   // test whether the new center vector has length of CircleRadius
   if (fabs(radius - CircleRadius) > HULLEPSILON)
     eLog() << Verbose(1) << "The projected center of the new sphere has radius " << radius << " instead of " << CircleRadius << "." << endl;
-  alpha = helper.Angle(&RelativeOldSphereCenter);
+  alpha = helper.Angle(&OldSphereCenter);
   // make the angle unique by checking the halfplanes/search direction
   if (helper.ScalarProduct(&SearchDirection) < -HULLEPSILON)  // acos is not unique on [0, 2.*M_PI), hence extra check to decide between two half intervals
     alpha = 2.*M_PI - alpha;
-  Log() << Verbose(1) << "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << "." << endl;
-  radius = helper.Distance(&RelativeOldSphereCenter);
+  //Log() << Verbose(2) << "INFO: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << OldSphereCenter << " and resulting angle is " << alpha << "." << endl;
+  radius = helper.Distance(&OldSphereCenter);
   helper.ProjectOntoPlane(&NormalVector);
   // check whether new center is somewhat away or at least right over the current baseline to prevent intersecting triangles
   if ((radius > HULLEPSILON) || (helper.Norm() < HULLEPSILON)) {
-    Log() << Verbose(1) << "INFO: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << "." << endl;
+    //Log() << Verbose(2) << "INFO: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << "." << endl;
     return alpha;
   } else {
-    Log() << Verbose(1) << "INFO: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << "." << endl;
+    //Log() << Verbose(1) << "INFO: NewSphereCenter " << helper << " is too close to OldSphereCenter" << OldSphereCenter << "." << endl;
     return 2.*M_PI;
   }
@@ -275 +265 @@
 double MinIntersectDistance(const gsl_vector * x, void *params)
 {
-        Info FunctionInfo(__func__);
   double retval = 0;
   struct Intersection *I = (struct Intersection *)params;
@@ -296 +285 @@
 
   retval = HeightA.ScalarProduct(&HeightA) + HeightB.ScalarProduct(&HeightB);
-  //Log() << Verbose(1) << "MinIntersectDistance called, result: " << retval << endl;
+  //Log() << Verbose(2) << "MinIntersectDistance called, result: " << retval << endl;
 
   return retval;
@@ -316 +305 @@
 bool existsIntersection(const Vector &point1, const Vector &point2, const Vector &point3, const Vector &point4)
 {
-        Info FunctionInfo(__func__);
   bool result;
 
@@ -364 +352 @@
 
         if (status == GSL_SUCCESS) {
-          Log() << Verbose(1) << "converged to minimum" <<  endl;
+          Log() << Verbose(2) << "converged to minimum" <<  endl;
         }
     } while (status == GSL_CONTINUE && iter < 100);
@@ -389 +377 @@
   t2 = HeightB.ScalarProduct(&SideB)/SideB.ScalarProduct(&SideB);
 
-  Log() << Verbose(1) << "Intersection " << intersection << " is at "
+  Log() << Verbose(2) << "Intersection " << intersection << " is at "
     << t1 << " for (" << point1 << "," << point2 << ") and at "
     << t2 << " for (" << point3 << "," << point4 << "): ";
 
   if (((t1 >= 0) && (t1 <= 1)) && ((t2 >= 0) && (t2 <= 1))) {
-    Log() << Verbose(1) << "true intersection." << endl;
+    Log() << Verbose(0) << "true intersection." << endl;
     result = true;
   } else {
-    Log() << Verbose(1) << "intersection out of region of interest." << endl;
+    Log() << Verbose(0) << "intersection out of region of interest." << endl;
     result = false;
   }
@@ -420 +408 @@
 double GetAngle(const Vector &point, const Vector &reference, const Vector &OrthogonalVector)
 {
-        Info FunctionInfo(__func__);
   if (reference.IsZero())
     return M_PI;
@@ -432 +419 @@
   }
 
-  Log() << Verbose(1) << "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << "." << endl;
+  Log() << Verbose(4) << "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << "." << endl;
 
   return phi;
@@ -447 +434 @@
 double CalculateVolumeofGeneralTetraeder(const Vector &a, const Vector &b, const Vector &c, const Vector &d)
 {
-        Info FunctionInfo(__func__);
   Vector Point, TetraederVector[3];
   double volume;
@@ -471 +457 @@
 bool CheckLineCriteriaForDegeneratedTriangle(const BoundaryPointSet * const nodes[3])
 {
-        Info FunctionInfo(__func__);
   bool result = false;
   int counter = 0;
@@ -498 +483 @@
     }
   if ((!result) && (counter > 1)) {
-    Log() << Verbose(1) << "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used." << endl;
+    Log() << Verbose(2) << "INFO: Degenerate triangle is ok, at least two, here " << counter << ", existing lines are used." << endl;
     result = true;
   }
@@ -505 +490 @@
 
 
-///** Sort function for the candidate list.
-// */
-//bool SortCandidates(const CandidateForTesselation* candidate1, const CandidateForTesselation* candidate2)
-//{
-//      Info FunctionInfo(__func__);
-//  Vector BaseLineVector, OrthogonalVector, helper;
-//  if (candidate1->BaseLine != candidate2->BaseLine) {  // sanity check
-//    eLog() << Verbose(1) << "sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl;
-//    //return false;
-//    exit(1);
-//  }
-//  // create baseline vector
-//  BaseLineVector.CopyVector(candidate1->BaseLine->endpoints[1]->node->node);
-//  BaseLineVector.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  BaseLineVector.Normalize();
-//
-//  // create normal in-plane vector to cope with acos() non-uniqueness on [0,2pi] (note that is pointing in the "right" direction already, hence ">0" test!)
-//  helper.CopyVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  helper.SubtractVector(candidate1->point->node);
-//  OrthogonalVector.CopyVector(&helper);
-//  helper.VectorProduct(&BaseLineVector);
-//  OrthogonalVector.SubtractVector(&helper);
-//  OrthogonalVector.Normalize();
-//
-//  // calculate both angles and correct with in-plane vector
-//  helper.CopyVector(candidate1->point->node);
-//  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  double phi = BaseLineVector.Angle(&helper);
-//  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
-//    phi = 2.*M_PI - phi;
-//  }
-//  helper.CopyVector(candidate2->point->node);
-//  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
-//  double psi = BaseLineVector.Angle(&helper);
-//  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
-//    psi = 2.*M_PI - psi;
-//  }
-//
-//  Log() << Verbose(1) << *candidate1->point << " has angle " << phi << endl;
-//  Log() << Verbose(1) << *candidate2->point << " has angle " << psi << endl;
-//
-//  // return comparison
-//  return phi < psi;
-//};
+/** Sort function for the candidate list.
+ */
+bool SortCandidates(const CandidateForTesselation* candidate1, const CandidateForTesselation* candidate2)
+{
+  Vector BaseLineVector, OrthogonalVector, helper;
+  if (candidate1->BaseLine != candidate2->BaseLine) {  // sanity check
+    eLog() << Verbose(1) << "sortCandidates was called for two different baselines: " << candidate1->BaseLine << " and " << candidate2->BaseLine << "." << endl;
+    //return false;
+    exit(1);
+  }
+  // create baseline vector
+  BaseLineVector.CopyVector(candidate1->BaseLine->endpoints[1]->node->node);
+  BaseLineVector.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
+  BaseLineVector.Normalize();
+
+  // create normal in-plane vector to cope with acos() non-uniqueness on [0,2pi] (note that is pointing in the "right" direction already, hence ">0" test!)
+  helper.CopyVector(candidate1->BaseLine->endpoints[0]->node->node);
+  helper.SubtractVector(candidate1->point->node);
+  OrthogonalVector.CopyVector(&helper);
+  helper.VectorProduct(&BaseLineVector);
+  OrthogonalVector.SubtractVector(&helper);
+  OrthogonalVector.Normalize();
+
+  // calculate both angles and correct with in-plane vector
+  helper.CopyVector(candidate1->point->node);
+  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
+  double phi = BaseLineVector.Angle(&helper);
+  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
+    phi = 2.*M_PI - phi;
+  }
+  helper.CopyVector(candidate2->point->node);
+  helper.SubtractVector(candidate1->BaseLine->endpoints[0]->node->node);
+  double psi = BaseLineVector.Angle(&helper);
+  if (OrthogonalVector.ScalarProduct(&helper) > 0) {
+    psi = 2.*M_PI - psi;
+  }
+
+  Log() << Verbose(2) << *candidate1->point << " has angle " << phi << endl;
+  Log() << Verbose(2) << *candidate2->point << " has angle " << psi << endl;
+
+  // return comparison
+  return phi < psi;
+};
 
 /**
@@ -560 +544 @@
 TesselPoint* FindSecondClosestPoint(const Vector* Point, const LinkedCell* const LC)
 {
-        Info FunctionInfo(__func__);
   TesselPoint* closestPoint = NULL;
   TesselPoint* secondClosestPoint = NULL;
@@ -571 +554 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
+  Log() << Verbose(2) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
 
   LC->GetNeighbourBounds(Nlower, Nupper);
-  //Log() << Verbose(1) << endl;
+  //Log() << Verbose(0) << endl;
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
         const LinkedNodes *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        //Log() << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
         if (List != NULL) {
           for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -615 +598 @@
 TesselPoint* FindClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, const LinkedCell* const LC)
 {
-        Info FunctionInfo(__func__);
   TesselPoint* closestPoint = NULL;
   SecondPoint = NULL;
@@ -626 +608 @@
   for(int i=0;i<NDIM;i++) // store indices of this cell
     N[i] = LC->n[i];
-  Log() << Verbose(1) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
+  Log() << Verbose(3) << "INFO: Center cell is " << N[0] << ", " << N[1] << ", " << N[2] << " with No. " << LC->index << "." << endl;
 
   LC->GetNeighbourBounds(Nlower, Nupper);
-  //Log() << Verbose(1) << endl;
+  //Log() << Verbose(0) << endl;
   for (LC->n[0] = Nlower[0]; LC->n[0] <= Nupper[0]; LC->n[0]++)
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
         const LinkedNodes *List = LC->GetCurrentCell();
-        //Log() << Verbose(1) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
+        //Log() << Verbose(3) << "The current cell " << LC->n[0] << "," << LC->n[1] << "," << LC->n[2] << endl;
         if (List != NULL) {
           for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
@@ -645 +627 @@
               distance = currentNorm;
               closestPoint = (*Runner);
-              //Log() << Verbose(1) << "INFO: New Nearest Neighbour is " << *closestPoint << "." << endl;
+              //Log() << Verbose(2) << "INFO: New Nearest Neighbour is " << *closestPoint << "." << endl;
             } else if (currentNorm < secondDistance) {
               secondDistance = currentNorm;
               SecondPoint = (*Runner);
-              //Log() << Verbose(1) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
+              //Log() << Verbose(2) << "INFO: New Second Nearest Neighbour is " << *SecondPoint << "." << endl;
             }
           }
@@ -659 +641 @@
   // output
   if (closestPoint != NULL) {
-    Log() << Verbose(1) << "Closest point is " << *closestPoint;
+    Log() << Verbose(2) << "Closest point is " << *closestPoint;
     if (SecondPoint != NULL)
       Log() << Verbose(0) << " and second closest is " << *SecondPoint;
@@ -675 +657 @@
 Vector * GetClosestPointBetweenLine(const BoundaryLineSet * const Base, const BoundaryLineSet * const OtherBase)
 {
-        Info FunctionInfo(__func__);
   // construct the plane of the two baselines (i.e. take both their directional vectors)
   Vector Normal;
@@ -686 +667 @@
   Normal.VectorProduct(&OtherBaseline);
   Normal.Normalize();
-  Log() << Verbose(1) << "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << "." << endl;
+  Log() << Verbose(4) << "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << "." << endl;
 
   // project one offset point of OtherBase onto this plane (and add plane offset vector)
@@ -703 +684 @@
   Normal.CopyVector(Intersection);
   Normal.SubtractVector(Base->endpoints[0]->node->node);
-  Log() << Verbose(1) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(&Baseline)/Baseline.NormSquared()) << "." << endl;
+  Log() << Verbose(3) << "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(&Baseline)/Baseline.NormSquared()) << "." << endl;
 
   return Intersection;
@@ -716 +697 @@
 double DistanceToTrianglePlane(const Vector *x, const BoundaryTriangleSet * const triangle)
 {
-        Info FunctionInfo(__func__);
   double distance = 0.;
   if (x == NULL) {
@@ -733 +713 @@
 void WriteVrmlFile(ofstream * const vrmlfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   TesselPoint *Walker = NULL;
   int i;
@@ -777 +756 @@
 void IncludeSphereinRaster3D(ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   Vector helper;
-
-  if (Tess->LastTriangle != NULL) {
-    // include the current position of the virtual sphere in the temporary raster3d file
-    Vector *center = cloud->GetCenter();
-    // make the circumsphere's center absolute again
-    helper.CopyVector(Tess->LastTriangle->endpoints[0]->node->node);
-    helper.AddVector(Tess->LastTriangle->endpoints[1]->node->node);
-    helper.AddVector(Tess->LastTriangle->endpoints[2]->node->node);
-    helper.Scale(1./3.);
-    helper.SubtractVector(center);
-    // and add to file plus translucency object
-    *rasterfile << "# current virtual sphere\n";
-    *rasterfile << "8\n  25.0    0.6     -1.0 -1.0 -1.0     0.2        0 0 0 0\n";
-    *rasterfile << "2\n  " << helper.x[0] << " " << helper.x[1] << " " << helper.x[2] << "\t" << 5. << "\t1 0 0\n";
-    *rasterfile << "9\n  terminating special property\n";
-    delete(center);
-  }
+  // include the current position of the virtual sphere in the temporary raster3d file
+  Vector *center = cloud->GetCenter();
+  // make the circumsphere's center absolute again
+  helper.CopyVector(Tess->LastTriangle->endpoints[0]->node->node);
+  helper.AddVector(Tess->LastTriangle->endpoints[1]->node->node);
+  helper.AddVector(Tess->LastTriangle->endpoints[2]->node->node);
+  helper.Scale(1./3.);
+  helper.SubtractVector(center);
+  // and add to file plus translucency object
+  *rasterfile << "# current virtual sphere\n";
+  *rasterfile << "8\n  25.0    0.6     -1.0 -1.0 -1.0     0.2        0 0 0 0\n";
+  *rasterfile << "2\n  " << helper.x[0] << " " << helper.x[1] << " " << helper.x[2] << "\t" << 5. << "\t1 0 0\n";
+  *rasterfile << "9\n  terminating special property\n";
+  delete(center);
 };
 
@@ -806 +781 @@
 void WriteRaster3dFile(ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
-        Info FunctionInfo(__func__);
   TesselPoint *Walker = NULL;
   int i;
@@ -852 +826 @@
 void WriteTecplotFile(ofstream * const tecplot, const Tesselation * const TesselStruct, const PointCloud * const cloud, const int N)
 {
-        Info FunctionInfo(__func__);
   if ((tecplot != NULL) && (TesselStruct != NULL)) {
     // write header
     *tecplot << "TITLE = \"3D CONVEX SHELL\"" << endl;
     *tecplot << "VARIABLES = \"X\" \"Y\" \"Z\" \"U\"" << endl;
-    *tecplot << "ZONE T=\"";
-    if (N < 0) {
-      *tecplot << cloud->GetName();
-    } else {
-      *tecplot << N << "-";
-      for (int i=0;i<3;i++)
-        *tecplot << (i==0 ? "" : "_") << TesselStruct->LastTriangle->endpoints[i]->node->Name;
-    }
+    *tecplot << "ZONE T=\"" << N << "-";
+    for (int i=0;i<3;i++)
+      *tecplot << (i==0 ? "" : "_") << TesselStruct->LastTriangle->endpoints[i]->node->Name;
     *tecplot << "\", N=" << TesselStruct->PointsOnBoundary.size() << ", E=" << TesselStruct->TrianglesOnBoundary.size() << ", DATAPACKING=POINT, ZONETYPE=FETRIANGLE" << endl;
     int i=0;
@@ -873 +841 @@
 
     // print atom coordinates
+    Log() << Verbose(2) << "The following triangles were created:";
     int Counter = 1;
     TesselPoint *Walker = NULL;
@@ -882 +851 @@
     *tecplot << endl;
     // print connectivity
-    Log() << Verbose(1) << "The following triangles were created:" << endl;
     for (TriangleMap::const_iterator runner = TesselStruct->TrianglesOnBoundary.begin(); runner != TesselStruct->TrianglesOnBoundary.end(); runner++) {
-      Log() << Verbose(1) << " " << runner->second->endpoints[0]->node->Name << "<->" << runner->second->endpoints[1]->node->Name << "<->" << runner->second->endpoints[2]->node->Name << endl;
+      Log() << Verbose(0) << " " << runner->second->endpoints[0]->node->Name << "<->" << runner->second->endpoints[1]->node->Name << "<->" << runner->second->endpoints[2]->node->Name;
       *tecplot << LookupList[runner->second->endpoints[0]->node->nr] << " " << LookupList[runner->second->endpoints[1]->node->nr] << " " << LookupList[runner->second->endpoints[2]->node->nr] << endl;
     }
     delete[] (LookupList);
+    Log() << Verbose(0) << endl;
   }
 };
@@ -898 +867 @@
 void CalculateConcavityPerBoundaryPoint(const Tesselation * const TesselStruct)
 {
-        Info FunctionInfo(__func__);
   class BoundaryPointSet *point = NULL;
   class BoundaryLineSet *line = NULL;
 
+  //Log() << Verbose(2) << "Begin of CalculateConcavityPerBoundaryPoint" << endl;
   // calculate remaining concavity
   for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
@@ -909 +878 @@
     for (LineMap::iterator LineRunner = point->lines.begin(); LineRunner != point->lines.end(); LineRunner++) {
       line = LineRunner->second;
-      //Log() << Verbose(1) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
+      //Log() << Verbose(2) << "INFO: Current line of point " << *point << " is " << *line << "." << endl;
       if (!line->CheckConvexityCriterion())
         point->value += 1;
     }
   }
+  //Log() << Verbose(2) << "End of CalculateConcavityPerBoundaryPoint" << endl;
 };
 
@@ -924 +894 @@
 bool CheckListOfBaselines(const Tesselation * const TesselStruct)
 {
-        Info FunctionInfo(__func__);
   LineMap::const_iterator testline;
   bool result = false;
@@ -932 +901 @@
   for (testline = TesselStruct->LinesOnBoundary.begin(); testline != TesselStruct->LinesOnBoundary.end(); testline++) {
     if (testline->second->triangles.size() != 2) {
-      Log() << Verbose(2) << *testline->second << "\t" << testline->second->triangles.size() << endl;
+      Log() << Verbose(1) << *testline->second << "\t" << testline->second->triangles.size() << endl;
       counter++;
     }
@@ -943 +912 @@
 }
 
-/** Counts the number of triangle pairs that contain the given polygon.
- * \param *P polygon with endpoints to look for
- * \param *T set of triangles to create pairs from containing \a *P
- */
-int CountTrianglePairContainingPolygon(const BoundaryPolygonSet * const P, const TriangleSet * const T)
-{
-  Info FunctionInfo(__func__);
-  // check number of endpoints in *P
-  if (P->endpoints.size() != 4) {
-    eLog() << Verbose(1) << "CountTrianglePairContainingPolygon works only on polygons with 4 nodes!" << endl;
-    return 0;
-  }
-
-  // check number of triangles in *T
-  if (T->size() < 2) {
-    eLog() << Verbose(1) << "Not enough triangles to have pairs!" << endl;
-    return 0;
-  }
-
-  Log() << Verbose(0) << "Polygon is " << *P << endl;
-  // create each pair, get the endpoints and check whether *P is contained.
-  int counter = 0;
-  PointSet Trianglenodes;
-  class BoundaryPolygonSet PairTrianglenodes;
-  for(TriangleSet::iterator Walker = T->begin(); Walker != T->end(); Walker++) {
-    for (int i=0;i<3;i++)
-      Trianglenodes.insert((*Walker)->endpoints[i]);
-
-    for(TriangleSet::iterator PairWalker = Walker; PairWalker != T->end(); PairWalker++) {
-      if (Walker != PairWalker) { // skip first
-        PairTrianglenodes.endpoints = Trianglenodes;
-        for (int i=0;i<3;i++)
-          PairTrianglenodes.endpoints.insert((*PairWalker)->endpoints[i]);
-        const int size = PairTrianglenodes.endpoints.size();
-        if (size == 4) {
-          Log() << Verbose(0) << " Current pair of triangles: " << **Walker << "," << **PairWalker << " with " << size << " distinct endpoints:" << PairTrianglenodes << endl;
-          // now check
-          if (PairTrianglenodes.ContainsPresentTupel(P)) {
-            counter++;
-            Log() << Verbose(0) << "  ACCEPT: Matches with " << *P << endl;
-          } else {
-            Log() << Verbose(0) << "  REJECT: No match with " << *P << endl;
-          }
-        } else {
-          Log() << Verbose(0) << "  REJECT: Less than four endpoints." << endl;
-        }
-      }
-    }
-    Trianglenodes.clear();
-  }
-  return counter;
-};
-
-/** Checks whether two give polygons have two or more points in common.
- * \param *P1 first polygon
- * \param *P2 second polygon
- * \return true - are connected, false = are note
- */
-bool ArePolygonsEdgeConnected(const BoundaryPolygonSet * const P1, const BoundaryPolygonSet * const P2)
-{
-  Info FunctionInfo(__func__);
-  int counter = 0;
-  for(PointSet::const_iterator Runner = P1->endpoints.begin(); Runner != P1->endpoints.end(); Runner++) {
-    if (P2->ContainsBoundaryPoint((*Runner))) {
-      counter++;
-      Log() << Verbose(1) << *(*Runner) << " of second polygon is found in the first one." << endl;
-      return true;
-    }
-  }
-  return false;
-};
-
-/** Combines second into the first and deletes the second.
- * \param *P1 first polygon, contains all nodes on return
- * \param *&P2 second polygon, is deleted.
- */
-void CombinePolygons(BoundaryPolygonSet * const P1, BoundaryPolygonSet * &P2)
-{
-  Info FunctionInfo(__func__);
-  pair <PointSet::iterator, bool> Tester;
-  for(PointSet::iterator Runner = P2->endpoints.begin(); Runner != P2->endpoints.end(); Runner++) {
-    Tester = P1->endpoints.insert((*Runner));
-    if (Tester.second)
-      Log() << Verbose(0) << "Inserting endpoint " << *(*Runner) << " into first polygon." << endl;
-  }
-  P2->endpoints.clear();
-  delete(P2);
-};
-

src/tesselationhelpers.hpp

@@ -72 +72 @@
 bool CheckListOfBaselines(const Tesselation * const TesselStruct);
 
-int CountTrianglePairContainingPolygon(const BoundaryPolygonSet * const P, const TriangleSet * const T);
-bool ArePolygonsEdgeConnected(const BoundaryPolygonSet * const P1, const BoundaryPolygonSet * const P2);
-void CombinePolygons(BoundaryPolygonSet * const P1, BoundaryPolygonSet * &P2);
-
 
 #endif /* TESSELATIONHELPERS_HPP_ */

src/unittests/Makefile.am

@@ -4 +4 @@
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
 
-TESTS = ActOnAllUnitTest AnalysisBondsUnitTests AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest BondGraphUnitTest InfoUnitTest ListOfBondsUnitTest LogUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest StackClassUnitTest VectorUnitTest
+TESTS = ActOnAllUnitTest AnalysisBondsUnitTests AnalysisCorrelationToPointUnitTest AnalysisCorrelationToSurfaceUnitTest AnalysisPairCorrelationUnitTest BondGraphUnitTest ListOfBondsUnitTest LogUnitTest MemoryUsageObserverUnitTest MemoryAllocatorUnitTest StackClassUnitTest VectorUnitTest
 check_PROGRAMS = $(TESTS)
 noinst_PROGRAMS = $(TESTS)
@@ -25 +25 @@
 BondGraphUnitTest_SOURCES = bondgraphunittest.cpp bondgraphunittest.hpp
 BondGraphUnitTest_LDADD = ../libmolecuilder.a
-
-InfoUnitTest_SOURCES = infounittest.cpp infounittest.hpp
-InfoUnitTest_LDADD = ../libmolecuilder.a
 
 ListOfBondsUnitTest_SOURCES = listofbondsunittest.cpp listofbondsunittest.hpp

src/vector.cpp

@@ -480 +480 @@
   else
     return false;
-};
-
-/** Checks whether vector is normal to \a *normal.
- * @return true - vector is normalized, false - vector is not
- */
-bool Vector::IsEqualTo(const Vector * const a) const
-{
-  bool status = true;
-  for (int i=0;i<NDIM;i++) {
-    if (fabs(x[i] - a->x[i]) > MYEPSILON)
-      status = false;
-  }
-  return status;
 };
 

src/vector.hpp

@@ -42 +42 @@
   bool IsOne() const;
   bool IsNormalTo(const Vector * const normal) const;
-  bool IsEqualTo(const Vector * const a) const;
 
   void AddVector(const Vector * const y);

src/verbose.cpp

@@ -1 +1 @@
 using namespace std;
 
-#include "info.hpp"
 #include "verbose.hpp"
 
@@ -10 +9 @@
 ostream& Verbose::print (ostream &ost) const
 {
-  for (int i=Verbosity+Info::verbosity;i--;)
+  for (int i=Verbosity;i--;)
     ost.put('\t');
   //Log() << Verbose(0) << "Verbose(.) called." << endl;
@@ -23 +22 @@
 bool Verbose::DoOutput(int verbosityLevel) const
 {
-  return (verbosityLevel >= Verbosity+Info::verbosity);
+  return (verbosityLevel >= Verbosity);
 };
 

tests/Tesselations/1_2-dimethoxyethane/NonConvexEnvelope-1_2-dimethoxyethane.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="1_2-dimethoxyethane", N=12, E=20, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H10_ H15_ H16", N=12, E=20, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 9.6489 7.0567 6.6101 2
 6.8975 7.0567 5.9709 2

tests/Tesselations/1_2-dimethylbenzene/NonConvexEnvelope-1_2-dimethylbenzene.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="1_2-dimethylbenzene", N=14, E=25, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- C07_ C08_ H09", N=14, E=25, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 8.3296 6.7712 6.0321 3
 8.3296 8.1534 6.0305 3

tests/Tesselations/2-methylcyclohexanone/NonConvexEnvelope-2-methylcyclohexanone.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="2-methylcyclohexanone", N=13, E=22, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H15_ H18_ H19", N=13, E=22, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 9.2731 9.0957 6.144 1
 10.8392 7.1885 6.8694 0

tests/Tesselations/C16_0-Torus/NonConvexEnvelope-C16_0-Torus.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="C16_0-Torus", N=8208, E=16416, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- C818_ C1839_ C1904", N=8208, E=16416, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 57.0669 28.4968 10.0318 2
 53.7124 30.5841 10.0363 2

tests/Tesselations/Makefile.am

@@ -2 +2 @@
 1_2-dimethylbenzene.test \
 2-methylcyclohexanone.test \
-benzene.test \
 cholesterol.test \
 cluster.test \

tests/Tesselations/N_N-dimethylacetamide/NonConvexEnvelope-N_N-dimethylacetamide.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="N_N-dimethylacetamide", N=11, E=18, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- C03_ O06_ H12", N=11, E=18, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 6.4232 7.1074 8.3151 3
 6.5832 7.8674 9.2351 1

tests/Tesselations/cholesterol/NonConvexEnvelope-cholesterol.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="cholesterol", N=44, E=86, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H49_ H50_ H51", N=44, E=86, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 19.4519 9.7871 8.0824 1
 12.9054 5.0485 9.284 1

tests/Tesselations/cluster/NonConvexEnvelope-cluster.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="cluster", N=434, E=782, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- O4864_ O4865_ O5836", N=434, E=782, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 59.3961 67.9193 74.1709 1
 60.8097 66.4885 71.9891 1

tests/Tesselations/cycloheptane/NonConvexEnvelope-cycloheptane.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="cycloheptane", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H08_ H12_ H13", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 5 8.6586 6.1486 0
 5.8635 8.4046 7.6783 0

tests/Tesselations/dimethyl_bromomalonate/NonConvexEnvelope-dimethyl_bromomalonate.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="dimethyl_bromomalonate", N=12, E=20, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H12_ H13_ H14", N=12, E=20, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 8.1538 5 6.6665 1
 6.8226 7.583 6.9158 4

tests/Tesselations/glucose/NonConvexEnvelope-glucose.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="glucose", N=19, E=34, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- C09_ O12_ H17", N=19, E=34, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 9.5866 5 7.577 1
 8.4149 7.4116 8.4659 1

tests/Tesselations/heptan/NonConvexEnvelope-heptan.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="heptan", N=16, E=28, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H07_ H08_ H11", N=16, E=28, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 9.6377 5 6.78 0
 9.6377 5 5 0

tests/Tesselations/isoleucine/NonConvexEnvelope-isoleucine.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="isoleucine", N=17, E=30, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H20_ H21_ H22", N=17, E=30, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 10.8909 7.216 6.6663 5
 9.4763 5.271 6.3191 1

tests/Tesselations/neohexane/NonConvexEnvelope-neohexane.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="neohexane", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H10_ H15_ H20", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 7.1525 6.2503 8.0589 1
 7.1525 8.0303 8.0578 1

tests/Tesselations/proline/NonConvexEnvelope-proline.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="proline", N=13, E=22, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- H10_ H13_ H17", N=13, E=22, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 9.2095 7.1856 6.6953 4
 9.3187 7.948 7.6262 2

tests/Tesselations/putrescine/NonConvexEnvelope-putrescine.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="putrescine", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- N06_ H17_ H18", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 10.8857 5.9511 6.2964 1
 5.5257 8.9311 6.4164 1

tests/Tesselations/round_cluster/NonConvexEnvelope-round_cluster.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="round_cluster", N=467, E=930, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- O633_ O960_ O1013", N=467, E=930, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 41.4883 31.1464 29.9646 2
 35.0153 37.6127 31.0313 4

tests/Tesselations/tartaric_acid/NonConvexEnvelope-tartaric_acid.dat

@@ -1 +1 @@
 TITLE = "3D CONVEX SHELL"
 VARIABLES = "X" "Y" "Z" "U"
-ZONE T="tartaric_acid", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
+ZONE T="0- C05_ O09_ H12", N=14, E=24, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
 10.156 6.9295 6.2926 4
 8.5078 5.7627 5 1