[MOAB-dev] r4158 - MOAB/trunk/test/perf

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-09-25 10:19:54 -0500 (Sat, 25 Sep 2010)
New Revision: 4158

Modified:
   MOAB/trunk/test/perf/Makefile.am
   MOAB/trunk/test/perf/perf.cpp
   MOAB/trunk/test/perf/tstt_perf_binding.cpp
Log:
Fixing a few bugs in tstt_perf_binding that allow it to be used (sort of) with other iMesh implementations.

Add better memory reporting to perf.



Modified: MOAB/trunk/test/perf/Makefile.am
===================================================================
--- MOAB/trunk/test/perf/Makefile.am	2010-09-25 08:57:24 UTC (rev 4157)
+++ MOAB/trunk/test/perf/Makefile.am	2010-09-25 15:19:54 UTC (rev 4158)
@@ -5,7 +5,7 @@
             
 LDADD = $(top_builddir)/src/libMOAB.la
 
-check_PROGRAMS = perf seqperf adj_time
+check_PROGRAMS = perf seqperf adj_time tstt_perf_binding
 noinst_PROGRAMS = point_in_elem
 
 perf_SOURCES = perf.cpp
@@ -13,4 +13,12 @@
 adj_time_SOURCES = adj_time.cpp
 point_in_elem_SOURCES = point_in_elem.cpp
 
+if ENABLE_imesh
+  LDADD += $(top_builddir)/itaps/imesh/libiMesh.la
+  AM_CPPFLAGS += -I$(top_srcdir)/itaps/imesh -I$(top_srcdir)/itaps -I$(top_builddir)/itaps -I$(top_builddir)/itaps/imesh
+  check_PROGRAMS += tstt_perf_binding
+  tstt_perf_binding_DEPENDENCIES = $(top_builddir)/itaps/imesh/libiMesh.la
+  tstt_perf_binding_SOURCES = tstt_perf_binding.cpp
+endif
 
+

Modified: MOAB/trunk/test/perf/perf.cpp
===================================================================
--- MOAB/trunk/test/perf/perf.cpp	2010-09-25 08:57:24 UTC (rev 4157)
+++ MOAB/trunk/test/perf/perf.cpp	2010-09-25 15:19:54 UTC (rev 4158)
@@ -46,9 +46,9 @@
 double LENGTH = 1.0;
 
 void testA(const int nelem, const double *coords);
-void testB(const int nelem, const double *coords, const EntityHandle *connect);
+void testB(const int nelem, const double *coords, int *connect);
 void testC(const int nelem, const double *coords);
-void print_time(const bool print_em, double &tot_time, double &utime, double &stime);
+void print_time(const bool print_em, double &tot_time, double &utime, double &stime, long &imem, long &rmem);
 void query_vert_to_elem();
 void query_elem_to_vert();
 void query_struct_elem_to_vert();
@@ -103,7 +103,8 @@
 void build_coords(const int nelem, double *&coords) 
 {
   double ttime0, ttime1, utime1, stime1;
-  print_time(false, ttime0, utime1, stime1);
+  long imem, rmem;
+  print_time(false, ttime0, utime1, stime1, imem, rmem);
     // allocate the memory