[MOAB-dev] r4901 - in MOAB/trunk: src src/moab test

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-06-01 01:29:26 -0500 (Wed, 01 Jun 2011)
New Revision: 4901

Modified:
   MOAB/trunk/src/FBEngine.cpp
   MOAB/trunk/src/GeomTopoTool.cpp
   MOAB/trunk/src/SmoothCurve.cpp
   MOAB/trunk/src/SmoothCurve.hpp
   MOAB/trunk/src/moab/FBEngine.hpp
   MOAB/trunk/test/mbfacet_test.cpp
Log:
changes in splitting, in order to make it more robust
SmoothCurve also has a member pointing to gtt tool
use area coordinate for a pierced triangle to decide to split it or not
delay deleting the original remeshed triangles and edges until after
the smoothing is done 
a new edge is formed for every edge of the polyline (maybe too many edges 
are formed)



Modified: MOAB/trunk/src/FBEngine.cpp
===================================================================
--- MOAB/trunk/src/FBEngine.cpp	2011-05-31 20:52:26 UTC (rev 4900)
+++ MOAB/trunk/src/FBEngine.cpp	2011-06-01 06:29:26 UTC (rev 4901)
@@ -18,7 +18,9 @@
 
 // this is just to replace MBI with moab interface, which is _mbImpl in this class
 #define MBI _mbImpl
-#define MBERRORR(rval, STR) { if (MB_SUCCESS != rval) { std::cout<<STR<<std::endl; return rval; } }
+#define MBERRORR(rval, STR) { if (MB_SUCCESS != rval) { \
+      std::cout<<STR<<std::endl;       \
+      return rval; } }
 
 namespace moab {
 
@@ -82,7 +84,7 @@
 }
 
 ErrorCode area_coordinates(Interface * mbi, EntityHandle tri, CartVect & pnt,
-    double * area_coord, EntityHandle & boundary_handle, bool & onBoundary)
+    double * area_coord, EntityHandle & boundary_handle)
 {
 
   int nnodes;
@@ -102,7 +104,6 @@
     area_coord[1] = 0.;
     area_coord[2] = 0.;
     boundary_handle = conn3[0];
-    onBoundary = true;
     return MB_SUCCESS;
   }
   if (r1.length() < tolerance_segment) {
@@ -110,7 +111,6 @@
     area_coord[1] = 1.;
     area_coord[2] = 0.;
     boundary_handle = conn3[1];
-    onBoundary = true;
     return MB_SUCCESS;
   }
   if (r1.length() < tolerance_segment) {
@@ -118,7 +118,6 @@
     area_coord[1] = 0.;
     area_coord[2] = 1.;
     boundary_handle = conn3[2];
-    onBoundary = true;
     return MB_SUCCESS;
   }
 
@@ -137,13 +136,12 @@
       > tolerance_segment) {
     MBERRORR(MB_FAILURE, "point outside triangle");