[MOAB-dev] r5419 - in MOAB/trunk: . config src src/io src/parallel src/parallel/moab tools/vtkMOABReader

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-03-09 09:40:32 -0600 (Fri, 09 Mar 2012)
New Revision: 5419

Modified:
   MOAB/trunk/config/damsel.m4
   MOAB/trunk/configure.ac
   MOAB/trunk/src/ReaderWriterSet.cpp
   MOAB/trunk/src/io/Makefile.am
   MOAB/trunk/src/io/WriteDamsel.cpp
   MOAB/trunk/src/io/WriteDamsel.hpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/tools/vtkMOABReader/vtkMOABMesh.cpp
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
Log:
- Updating WriteDamsel to work with prototype implementation; most users shouldn't
  need to enable damsel, so this shouldn't affect them.
- Adding tag_reduce functionality.  This isn't tested yet, but the other tests
  pass, so I'm committing to back it up.
- Some robustness fixes to Paraview plugin; it still isn't functional, but it's
  getting there.



Modified: MOAB/trunk/config/damsel.m4
===================================================================
--- MOAB/trunk/config/damsel.m4	2012-03-09 15:25:11 UTC (rev 5418)
+++ MOAB/trunk/config/damsel.m4	2012-03-09 15:40:32 UTC (rev 5419)
@@ -51,22 +51,22 @@
   LDFLAGS="$DAMSEL_LDFLAGS $LDFLAGS"
   
    # Check for C library
-#  AC_CHECK_HEADERS( [damsel.h], [], [HAVE_DAMSEL=no] )
-#  CPPFLAGS="$old_CPPFLAGS"
-#  LDFLAGS="$old_LDFLAGS"
+  AC_CHECK_HEADERS( [damsel.h], [], [HAVE_DAMSEL=no] )
+  CPPFLAGS="$old_CPPFLAGS"
+  LDFLAGS="$old_LDFLAGS"
 
-#  if test "x$HAVE_DAMSEL" = "xno"; then
-#    if test "x$DAMSEL_ARG" != "x"; then 
-#      AC_MSG_ERROR("Damsel not found or not working")
-#    else
-#      AC_MSG_CHECKING([unsuccessful, Damsel support disabled])
-#      AC_MSG_RESULT([])
-#    fi
-#    DAMSEL_CPPFLAGS=
-#    DAMSEL_LDFLAGS=
-#  else
-#    DAMSEL_LIBS="-ldamsel"
-#  fi
+  if test "x$HAVE_DAMSEL" = "xno"; then
+    if test "x$DAMSEL_ARG" != "x"; then 
+      AC_MSG_ERROR("Damsel not found or not working")
+    else
+      AC_MSG_CHECKING([unsuccessful, Damsel support disabled])
+      AC_MSG_RESULT([])
+    fi
+    DAMSEL_CPPFLAGS=
+    DAMSEL_LDFLAGS=
+  else
+    DAMSEL_LIBS="-ldamsel"
+  fi
 
 fi
 

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2012-03-09 15:25:11 UTC (rev 5418)
+++ MOAB/trunk/configure.ac	2012-03-09 15:40:32 UTC (rev 5419)
@@ -410,7 +410,7 @@
 FATHOM_CHECK_DAMSEL
 LDFLAGS="$old_LDFLAGS"
 if test "xno" != "x$HAVE_DAMSEL"; then