[MOAB-dev] r5082 - in MOAB/trunk: . doc examples examples/itaps itaps/imesh tools/vtkMOABReader

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-08-04 13:07:50 -0500 (Thu, 04 Aug 2011)
New Revision: 5082

Added:
   MOAB/trunk/examples/itaps/
   MOAB/trunk/examples/itaps/125hex.vtk
   MOAB/trunk/examples/itaps/FindConnectF.F
   MOAB/trunk/examples/itaps/Makefile.am
   MOAB/trunk/examples/itaps/TagIterateC.c
   MOAB/trunk/examples/itaps/TagIterateF.F
   MOAB/trunk/itaps/imesh/MOAB_iMesh_extensions_tests.cpp
Modified:
   MOAB/trunk/RELEASE_NOTES
   MOAB/trunk/configure.ac
   MOAB/trunk/doc/MOAB-UG.doc
   MOAB/trunk/examples/Makefile.am
   MOAB/trunk/examples/README
   MOAB/trunk/examples/SetsNTags.cpp
   MOAB/trunk/itaps/imesh/MBIter.hpp
   MOAB/trunk/itaps/imesh/Makefile.am
   MOAB/trunk/itaps/imesh/iMesh-Defs.inc.in
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
   MOAB/trunk/itaps/imesh/iMesh_extensions.h
   MOAB/trunk/itaps/imesh/iMesh_f.h
   MOAB/trunk/itaps/imesh/testc_cbind.c
   MOAB/trunk/tools/vtkMOABReader/Makefile.am
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
Log:
This commit adds iMesh access to tag_iterate, and the ability to create dense tags through iMesh.
See the itaps/imesh/iMesh_extensions.h function for details of these functions and how to use them.

Three new iMesh extension functions are added: iMesh_createTagWithOptions, iMesh_stepIter, and iMesh_tagIterate.
The first two were needed before the tagIterate function could be used.  Unit test and example codes are also added
to test this.

Besides changes for the above, this commit also has the following changes:

iMesh_f.h: change iMesh_EntityIterator to iBase_EntityIterator, same for array-based version.
iMesh-Defs.inc.in: add @PNETCDF_LIBS@ to IMESH_LIBS
itaps/imesh/Makefile.am: added more -I locations, and new MOAB_iMesh_extensions_tests test program
tools/vtkMOABReader/Makefile.am: added another library to LDADD
configure.ac: replaced check for vtkRenderer.h with one for vtkRenderingInstantiator.h, that seems to be a 
  better header to look for; also added another default location to check for vtk; also added examples/itaps
  to the list of makefiles to create
examples/SetsNTags.cpp: changed to namespace'd MOAB calls

Passes make check in serial and parallel.



Modified: MOAB/trunk/RELEASE_NOTES
===================================================================
--- MOAB/trunk/RELEASE_NOTES	2011-08-04 17:45:20 UTC (rev 5081)
+++ MOAB/trunk/RELEASE_NOTES	2011-08-04 18:07:50 UTC (rev 5082)
@@ -1,4 +1,7 @@
-Version 4.1: (in progress)
+Version 4.5: (in progress)
+* ITAPS: added iMesh_stepIter, iMesh_tagIterate, iMesh_createTagWithOptions (see iMesh_extensions.h)
+
+Version 4.1:
 * Structured mesh API (see src/moab/ScdInterface.hpp)
 * Parallel read of netcdf-based .nc files using pnetcdf (see doc/metadata_info.pdf)
 * Updated ParaView plugin (see tools/vtkMOABReader/README for details)

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2011-08-04 17:45:20 UTC (rev 5081)
+++ MOAB/trunk/configure.ac	2011-08-04 18:07:50 UTC (rev 5082)
@@ -706,11 +706,11 @@
       VTK_INC_DIR=
       for dir in  /usr/local/include/vtk /usr/local/include/vtk-* /usr/include/vtk  /usr/include/vtk-*; do
         if test "x" = "x$VTK_INC_DIR"; then
-          AC_CHECK_FILE([${dir}/vtkRenderer.h],[VTK_INC_DIR="-I$dir"])
+          AC_CHECK_FILE([${dir}/vtkRenderingInstantiator.h],[VTK_INC_DIR="-I$dir"])
         fi
       done
       if test x = x"$VTK_INC_DIR"; then
-        AC_CHECK_HEADER([vtkRenderer.h],[],
+        AC_CHECK_HEADER([vtkRenderingInstantiator.h],[],
                         [AC_MSG_ERROR([VTK includes not found])])
       else
         VTK_INCLUDES="$VTK_INC_DIR"
@@ -732,14 +732,14 @@
     x?*)
       VTK_LIB_DIR=
       VTK_INC_DIR=
-      for dir in ${WITH_VTK}/include/vtk ${VTK_DIR}/include/vtk/Rendering ${WITH_VTK}/include ${WITH_VTK}/include/paraview-* ${WITH_VTK}; do
+      for dir in ${WITH_VTK}/include/vtk ${VTK_DIR}/include/vtk/Rendering ${WITH_VTK}/include ${WITH_VTK}/include/paraview-* ${WITH_VTK}/VTK ${WITH_VTK}; do
         if test "x" = "x$VTK_INC_DIR"; then
-          AC_CHECK_FILE([${dir}/vtkRenderer.h],[VTK_INC_DIR="-I$dir"])
+          AC_CHECK_FILE([${dir}/vtkRenderingInstantiator.h],[VTK_INC_DIR="-I$dir"])
         fi
       done
       if test "x" = "x$VTK_INC_DIR"; then
         # Check for non-installed VTK source
-        AC_CHECK_FILE([${VTK_DIR}/Rendering/vtkRenderer.h],[
+        AC_CHECK_FILE([${VTK_DIR}/Rendering/vtkRenderingInstantiator.h],[
           for subdir in . Common Filtering GenericFiltering Graphics Hybrid Imaging Parallel Patented Rendering Utilities Utilities/vtkexpat Utilities/expat Utilities/DICOMParser Utilties/vtkpng Utilities/vtkzlib Utilities/freetype/include/freetype Wrapping; do
   	  AC_MSG_CHECKING([for directory ${WITH_VTK}/$subdir])
   	  if test -d ${WITH_VTK}/$subdir; then
@@ -754,7 +754,7 @@