[MOAB-dev] r1290 - in MOAB/trunk: . tools/mbperf tools/spheredecomp tools/surfplot

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2007-09-25 14:41:38 -0500 (Tue, 25 Sep 2007)
New Revision: 1290

Modified:
   MOAB/trunk/configure.in
   MOAB/trunk/tools/mbperf/mbperf.cpp
   MOAB/trunk/tools/spheredecomp/SphereDecomp.cpp
   MOAB/trunk/tools/surfplot/Makefile.am
   MOAB/trunk/tools/surfplot/surfplot.cpp
Log:
o fix tool build errors resulting from API changes
o fix out-of-tree build of surfplot tool.
o default to building all tools that don't have external dependencies
   (everything except mbchaco, mbzoltan, and qvdual)


Modified: MOAB/trunk/configure.in
===================================================================
--- MOAB/trunk/configure.in	2007-09-25 17:34:22 UTC (rev 1289)
+++ MOAB/trunk/configure.in	2007-09-25 19:41:38 UTC (rev 1290)
@@ -190,18 +190,18 @@
 AC_HELP_STRING([--disable-tools],[Disable all tools by default])],
                          [ENABLE_TOOLS=$enableval],[ENABLE_TOOLS=] )
   # Individual tools
-MB_OPTIONAL_TOOL([mbconvert],                 [yes])
-MB_OPTIONAL_TOOL([hexmodops],                 [no] )
-MB_OPTIONAL_TOOL([mbchaco],                   [no] )
-MB_OPTIONAL_TOOL([mbperf],                    [no] )
-MB_OPTIONAL_TOOL([qvdual],                    [no] )
-MB_OPTIONAL_TOOL([mbsize],                    [no] )
-MB_OPTIONAL_TOOL([mbskin],                    [no] )
-MB_OPTIONAL_TOOL([mbtagprop],                 [no] )
-MB_OPTIONAL_TOOL([spheredecomp],              [no] )
-MB_OPTIONAL_TOOL([mbsurfplot],                [no] )
-MB_OPTIONAL_TOOL([mbzoltan],                  [no] )
-MB_OPTIONAL_TOOL([dagmc],                     [no] )
+MB_OPTIONAL_TOOL([mbconvert],    [yes])
+MB_OPTIONAL_TOOL([hexmodops],    [yes])
+MB_OPTIONAL_TOOL([mbchaco],      [no] )
+MB_OPTIONAL_TOOL([mbperf],       [yes])
+MB_OPTIONAL_TOOL([qvdual],       [no] )
+MB_OPTIONAL_TOOL([mbsize],       [yes])
+MB_OPTIONAL_TOOL([mbskin],       [yes])
+MB_OPTIONAL_TOOL([mbtagprop],    [yes])
+MB_OPTIONAL_TOOL([spheredecomp], [yes])
+MB_OPTIONAL_TOOL([mbsurfplot],   [yes])
+MB_OPTIONAL_TOOL([mbzoltan],     [no] )
+MB_OPTIONAL_TOOL([dagmc],        [yes])
 
 
 ################################################################################

Modified: MOAB/trunk/tools/mbperf/mbperf.cpp
===================================================================
--- MOAB/trunk/tools/mbperf/mbperf.cpp	2007-09-25 17:34:22 UTC (rev 1289)
+++ MOAB/trunk/tools/mbperf/mbperf.cpp	2007-09-25 19:41:38 UTC (rev 1290)
@@ -525,7 +525,7 @@
   // create a sequence to hold the node coordinates
   // get the current number of entities and start at the next slot
   std::vector<double*> coord_arrays;
-  MBErrorCode result = readMeshIface->get_node_arrays(3, num_verts, 1, vstart, coord_arrays);
+  MBErrorCode result = readMeshIface->get_node_arrays(3, num_verts, 1, 0, vstart, coord_arrays);
   assert(MB_SUCCESS == result && 1 == vstart &&
          coord_arrays[0] && coord_arrays[1] && coord_arrays[2]);
     // memcpy the coordinate data into place
@@ -534,7 +534,7 @@
   memcpy(coord_arrays[2], &coords[2*num_verts], sizeof(double)*num_verts);
   
   MBEntityHandle *conn = 0;
-  result = readMeshIface->get_element_array(num_elems, 8, MBHEX, 1, estart, conn);
+  result = readMeshIface->get_element_array(num_elems, 8, MBHEX, 1, 0, estart, conn);
   assert(MB_SUCCESS == result);
   memcpy(conn, connect, num_elems*8*sizeof(MBEntityHandle));
   result = readMeshIface->update_adjacencies(estart, num_elems, 8, conn);

Modified: MOAB/trunk/tools/spheredecomp/SphereDecomp.cpp
===================================================================
--- MOAB/trunk/tools/spheredecomp/SphereDecomp.cpp	2007-09-25 17:34:22 UTC (rev 1289)
+++ MOAB/trunk/tools/spheredecomp/SphereDecomp.cpp	2007-09-25 19:41:38 UTC (rev 1290)
@@ -431,8 +431,11 @@
   result = mbImpl->get_connectivity(&this_ent, 1, this_conn); RR;
   
     // get relative orientation
+  std::vector<int> conn_tet_indices(this_conn.size());
+  for (size_t i = 0; i < this_conn.size(); ++i)
+    conn_tet_indices[i] = std::find(tet_conn, tet_conn+4, this_conn[i]) - tet_conn;
   int sense, side_no, offset;
-  int success = MBCN::SideNumber(tet_conn, MBTET, &this_conn[0],
+  int success = MBCN::SideNumber(MBTET, &conn_tet_indices[0],
                                  this_conn.size(), dim, side_no, sense, offset);
   if (-1 == success) return MB_FAILURE;
   

Modified: MOAB/trunk/tools/surfplot/Makefile.am
===================================================================
--- MOAB/trunk/tools/surfplot/Makefile.am	2007-09-25 17:34:22 UTC (rev 1289)
+++ MOAB/trunk/tools/surfplot/Makefile.am	2007-09-25 19:41:38 UTC (rev 1290)
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 DEFS = $(DEFINES)
-INCLUDES += -I$(top_builddir) -I$(top_builddir)
+INCLUDES += -I$(top_srcdir) -I$(top_builddir)
 bin_PROGRAMS = mbsurfplot
 mbsurfplot_SOURCES = surfplot.cpp
 LDADD = $(top_builddir)/libMOAB.la

Modified: MOAB/trunk/tools/surfplot/surfplot.cpp
===================================================================
--- MOAB/trunk/tools/surfplot/surfplot.cpp	2007-09-25 17:34:22 UTC (rev 1289)
+++ MOAB/trunk/tools/surfplot/surfplot.cpp	2007-09-25 19:41:38 UTC (rev 1290)
@@ -4,6 +4,7 @@
 #include <iostream>
 #include <fstream>
 #include <limits>
+#include <math.h>
 
 /* Exit values */
 #define USAGE_ERROR 1