Changes in src/Tesselation/tesselationhelpers.cpp [a2a2f7:b8d215]

File:

• src/Tesselation/tesselationhelpers.cpp (modified) (8 diffs)

src/Tesselation/tesselationhelpers.cpp

@@ -235 +235 @@
   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(3, "DEBUG: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << ".");
+  LOG(5, "DEBUG: RelativeNewSphereCenter is " << helper << ", RelativeOldSphereCenter is " << RelativeOldSphereCenter << " and resulting angle is " << alpha << ".");
   radius = helper.distance(RelativeOldSphereCenter);
   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(4, "DEBUG: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << ".");
+    LOG(6, "DEBUG: Distance between old and new center is " << radius << " and between new center and baseline center is " << helper.Norm() << ".");
     return alpha;
   } else {
-    LOG(3, "DEBUG: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << ".");
+    LOG(5, "DEBUG: NewSphereCenter " << RelativeNewSphereCenter << " is too close to RelativeOldSphereCenter" << RelativeOldSphereCenter << ".");
     return 2.*M_PI;
   }
@@ -278 +278 @@
   }
 
-  LOG(1, "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << ".");
+  LOG(4, "INFO: " << point << " has angle " << phi << " with respect to reference " << reference << ".");
 
   return phi;
@@ -289 +289 @@
  * \param *c third vector
  * \param *d fourth vector
- * \return \f$ \frac{1}{6} \cdot ((a-d) \times (a-c) \cdot  (a-b)) \f$
+ * \return \f$ \frac{1}{6} | (a-d) \cdot  \bigl ( (b-d) \times (c-d) \bigr ) | \f$
  */
 double CalculateVolumeofGeneralTetraeder(const Vector &a, const Vector &b, const Vector &c, const Vector &d)
@@ -302 +302 @@
   for (int j=0;j<3;j++)
     TetraederVector[j].SubtractVector(d);
-  Point = TetraederVector[0];
-  Point.VectorProduct(TetraederVector[1]);
-  volume = 1./6. * fabs(Point.ScalarProduct(TetraederVector[2]));
+  Point = TetraederVector[1];
+  Point.VectorProduct(TetraederVector[2]);
+  volume = 1./6. * fabs(Point.ScalarProduct(TetraederVector[0]));
   return volume;
 };
@@ -545 +545 @@
   Normal.VectorProduct(OtherBaseline);
   Normal.Normalize();
-  LOG(1, "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << ".");
+  LOG(3, "First direction is " << Baseline << ", second direction is " << OtherBaseline << ", normal of intersection plane is " << Normal << ".");
 
   // project one offset point of OtherBase onto this plane (and add plane offset vector)
@@ -559 +559 @@
   *Intersection = line1.getIntersection(line2);
   Normal = (*Intersection) - (Base->endpoints[0]->node->getPosition());
-  LOG(1, "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(Baseline)/Baseline.NormSquared()) << ".");
+  LOG(3, "Found closest point on " << *Base << " at " << *Intersection << ", factor in line is " << fabs(Normal.ScalarProduct(Baseline)/Baseline.NormSquared()) << ".");
 
   return Intersection;
@@ -751 +751 @@
     *tecplot << endl;
     // print connectivity
-    LOG(1, "The following triangles were created:");
+    LOG(4, "DEBUG: The following triangles were created:");
     for (TriangleMap::const_iterator runner = TesselStruct->TrianglesOnBoundary.begin(); runner != TesselStruct->TrianglesOnBoundary.end(); runner++) {
-      LOG(1, " " << runner->second->endpoints[0]->node->getName() << "<->" << runner->second->endpoints[1]->node->getName() << "<->" << runner->second->endpoints[2]->node->getName());
+      LOG(4, " " << runner->second->endpoints[0]->node->getName() << "<->" << runner->second->endpoints[1]->node->getName() << "<->" << runner->second->endpoints[2]->node->getName());
       *tecplot << LookupList[runner->second->endpoints[0]->node->getNr()] << " " << LookupList[runner->second->endpoints[1]->node->getNr()] << " " << LookupList[runner->second->endpoints[2]->node->getNr()] << endl;
     }
@@ -778 +778 @@
   for (PointMap::const_iterator PointRunner = TesselStruct->PointsOnBoundary.begin(); PointRunner != TesselStruct->PointsOnBoundary.end(); PointRunner++) {
     point = PointRunner->second;
-    LOG(1, "INFO: Current point is " << *point << ".");
+    LOG(2, "INFO: Current point is " << *point << ".");
 
     // calculate mean concavity over all connected line