[MOAB-dev] r5831 - MOAB/trunk/tools/mbcslam

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-10-24 20:23:40 -0500 (Wed, 24 Oct 2012)
New Revision: 5831

Added:
   MOAB/trunk/tools/mbcslam/m1.vtk
   MOAB/trunk/tools/mbcslam/m2.vtk
Modified:
   MOAB/trunk/tools/mbcslam/Intx2Mesh.cpp
   MOAB/trunk/tools/mbcslam/Makefile.am
   MOAB/trunk/tools/mbcslam/intx_in_plane_test.cpp
Log:
activate intersection in plane test (with triangles)



Modified: MOAB/trunk/tools/mbcslam/Intx2Mesh.cpp
===================================================================
--- MOAB/trunk/tools/mbcslam/Intx2Mesh.cpp	2012-10-24 22:09:26 UTC (rev 5830)
+++ MOAB/trunk/tools/mbcslam/Intx2Mesh.cpp	2012-10-25 01:23:40 UTC (rev 5831)
@@ -38,7 +38,7 @@
   // assume that the edges are on the red triangles
   Range redQuads;
   //Range redEdges;
-  rval = mb->get_entities_by_type(mbs2, MBQUAD, redQuads, false);
+  rval = mb->get_entities_by_type(mbs2, type, redQuads, false);
   if (MB_SUCCESS != rval)
     return;
   // create red edges if they do not exist yet; so when they are looked upon, they are found

Modified: MOAB/trunk/tools/mbcslam/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbcslam/Makefile.am	2012-10-24 22:09:26 UTC (rev 5830)
+++ MOAB/trunk/tools/mbcslam/Makefile.am	2012-10-25 01:23:40 UTC (rev 5831)
@@ -31,9 +31,8 @@
 # check that only libraries are going in $(libdir)
 cfgdir = $(libdir)
 
-TESTS = intx_on_sphere_test  
-#intx_in_plane_test
+TESTS = intx_on_sphere_test  intx_in_plane_test
 check_PROGRAMS = $(TESTS) 
 intx_on_sphere_test_SOURCES = intx_on_sphere_test.cpp
-#intx_in_plane_test_SOURCES = intx_in_plane_test.cpp
+intx_in_plane_test_SOURCES = intx_in_plane_test.cpp
 

Modified: MOAB/trunk/tools/mbcslam/intx_in_plane_test.cpp
===================================================================
--- MOAB/trunk/tools/mbcslam/intx_in_plane_test.cpp	2012-10-24 22:09:26 UTC (rev 5830)
+++ MOAB/trunk/tools/mbcslam/intx_in_plane_test.cpp	2012-10-25 01:23:40 UTC (rev 5831)
@@ -65,8 +65,8 @@
     return 1;
   Intx2MeshInPlane worker(mb);
 
-  worker.SetErrorTolerance( 1.e-8);
-
+  worker.SetErrorTolerance( 1.e-5);
+  worker.SetEntityType(MBTRI);
   rval = worker.intersect_meshes(sf1, sf2, outputSet);
   if (MB_SUCCESS != rval)
     return 1;

Added: MOAB/trunk/tools/mbcslam/m1.vtk
===================================================================
--- MOAB/trunk/tools/mbcslam/m1.vtk	                        (rev 0)
+++ MOAB/trunk/tools/mbcslam/m1.vtk	2012-10-25 01:23:40 UTC (rev 5831)