[MOAB-dev] r4470 - in MOAB/trunk: . src src/moab tools/refiner tools/vtkMOABReader

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-01-25 15:05:19 -0600 (Tue, 25 Jan 2011)
New Revision: 4470

Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/src/GeomTopoTool.cpp
   MOAB/trunk/src/MBTagConventions.hpp
   MOAB/trunk/src/moab/GeomTopoTool.hpp
   MOAB/trunk/tools/refiner/Makefile.am
   MOAB/trunk/tools/refiner/test_mesh_refiner.cpp
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
Log:
- Adding more functionality in GeomTopoTool
- Including parallel tags in MBTagConventions, sometimes we want these even from serial code
- more search paths for vtk
- a bit more testing of refiner



Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2011-01-25 19:33:28 UTC (rev 4469)
+++ MOAB/trunk/configure.ac	2011-01-25 21:05:19 UTC (rev 4470)
@@ -716,7 +716,7 @@
     x?*)
       VTK_LIB_DIR=
       VTK_INC_DIR=
-      for dir in ${WITH_VTK}/include/vtk ${VTK_DIR}/include/vtk/Rendering ${WITH_VTK}/include ${WITH_VTK}; do
+      for dir in ${WITH_VTK}/include/vtk ${VTK_DIR}/include/vtk/Rendering ${WITH_VTK}/include ${WITH_VTK}/include/paraview-* ${WITH_VTK}; do
         if test "x" = "x$VTK_INC_DIR"; then
           AC_CHECK_FILE([${dir}/vtkRenderer.h],[VTK_INC_DIR="-I$dir"])
         fi

Modified: MOAB/trunk/src/GeomTopoTool.cpp
===================================================================
--- MOAB/trunk/src/GeomTopoTool.cpp	2011-01-25 19:33:28 UTC (rev 4469)
+++ MOAB/trunk/src/GeomTopoTool.cpp	2011-01-25 21:05:19 UTC (rev 4470)
@@ -31,489 +31,546 @@
 // forward and reverse volumes, respectively.  If a surface
 // is non-manifold in a single volume, the same volume will
 // be listed for both the forward and reverse slots.
-const char GEOM_SENSE_2_TAG_NAME[] = "GEOM_SENSE_2";
+    const char GEOM_SENSE_2_TAG_NAME[] = "GEOM_SENSE_2";
 
-const char GEOM_SENSE_N_ENTS_TAG_NAME[] = "GEOM_SENSE_N_ENTS";
-const char GEOM_SENSE_N_SENSES_TAG_NAME[] = "GEOM_SENSE_N_SENSES";
+    const char GEOM_SENSE_N_ENTS_TAG_NAME[] = "GEOM_SENSE_N_ENTS";
+    const char GEOM_SENSE_N_SENSES_TAG_NAME[] = "GEOM_SENSE_N_SENSES";
 
-GeomTopoTool::GeomTopoTool(Interface *impl, bool find_geoments)
- : mdbImpl(impl), 
-   sense2Tag(0), 
-   senseNEntsTag(0), 
-   senseNSensesTag(0), 
-   obbTree(impl), 
-   contiguous(true),
-   oneVolRootSet(0)
-{
-   ErrorCode result = mdbImpl->tag_create(GEOM_DIMENSION_TAG_NAME, 4,
-         MB_TAG_SPARSE, geomTag, NULL);
-   if (MB_SUCCESS != result && MB_ALREADY_ALLOCATED != result) {
-      std::cerr << "Error: Failed to create geometry dimension tag."
-            << std::endl;
-   }
+    GeomTopoTool::GeomTopoTool(Interface *impl, bool find_geoments)
+            : mdbImpl(impl), 
+              sense2Tag(0), 
+              senseNEntsTag(0), 
+              senseNSensesTag(0), 
+              obbTree(impl),