[MOAB-dev] r4383 - in MOAB/trunk: . src src/io test tools tools/vtkMOABReader

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-12-17 17:03:47 -0600 (Fri, 17 Dec 2010)
New Revision: 4383

Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/test/scdseq_test.cpp
   MOAB/trunk/tools/Makefile.am
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.h
Log:
Introducing a new structured mesh interface to MOAB.  The primary means to using this interface
is through the ScdInterface and ScdBox classes, declared in moab/ScdInterface.hpp.  One gets
an instance of this interface through the Interface::query_interface function, using
"ScdInterface" for the interface name (destruction of the interface is through the release_interface
method).

See the ScdInterface.hpp header for a general description of the structured mesh interface.

I'm also including a few assorted changes to the tools/vtkMOABReader tool, though these don't build
properly yet, but that tool is off by default, so this shouldn't affect anybody.

Passes make check, including a completely rewritten scdseq_test.





Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2010-12-17 15:49:43 UTC (rev 4382)
+++ MOAB/trunk/configure.ac	2010-12-17 23:03:47 UTC (rev 4383)
@@ -539,6 +539,7 @@
 MB_OPTIONAL_TOOL([mbconvert],    [yes])
 MB_OPTIONAL_TOOL([hexmodops],    [yes])
 MB_OPTIONAL_TOOL([qvdual],       [no] )
+MB_OPTIONAL_TOOL([vtkMOABReader],[no] )
 MB_OPTIONAL_TOOL([mbsize],       [yes])
 MB_OPTIONAL_TOOL([mbskin],       [yes])
 MB_OPTIONAL_TOOL([mbtagprop],    [yes])
@@ -748,7 +749,7 @@
     xyes|x)
       VTK_LIB_DIR=
       VTK_INC_DIR=
-      for dir in /usr/include/vtk /usr/local/include/vtk /include/vtk /usr/include/vtk-5.0; do
+      for dir in /usr/include/vtk /usr/local/include/vtk /include/vtk /usr/include/vtk-5.0 /usr/include/vtk-5.2; do
         if test "x" = "x$VTK_INC_DIR"; then
           AC_CHECK_FILE([${dir}/vtkRenderer.h],[VTK_INC_DIR="-I$dir"])
         fi
@@ -972,6 +973,192 @@
 fi
 
 ################################################################################
+#                                   X
+################################################################################
+AC_PATH_X
+AC_PATH_XTRA
+if test "xyes" = "x$no_x"; then
+  X_MISSING=yes
+fi
+
+
+################################################################################
+#                                  VTK
+################################################################################
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  
+  AC_ARG_WITH([vtk],
+  [AC_HELP_STRING([--with-vtk=DIR], [Specify directory containing VTK])],
+  [VTK_DIR=$withval
+   DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-vtk=\"${withval}\""
+  ],[VTK_DIR=])
+
+  VTK_INCLUDES=  
+  case "x$VTK_DIR" in
+    xno)
+      VTK_MISSING=yes
+      ;;