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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-12-21 11:09:28 -0600 (Tue, 21 Dec 2010)
New Revision: 4394

Modified:
   MOAB/trunk/test/perf/perftool.cpp
Log:
add option to perftool to control block size, and clean it up a bit

Modified: MOAB/trunk/test/perf/perftool.cpp
===================================================================
--- MOAB/trunk/test/perf/perftool.cpp	2010-12-20 22:00:22 UTC (rev 4393)
+++ MOAB/trunk/test/perf/perftool.cpp	2010-12-21 17:09:28 UTC (rev 4394)
@@ -21,6 +21,7 @@
 #include <iomanip>
 #include <time.h>
 #include <assert.h>
+#include <list>
 #include "moab/Core.hpp"
 #include "moab/Skinner.hpp"
 #include "moab/ReadUtilIface.hpp"
@@ -31,27 +32,27 @@
 const int DEFAULT_INTERVALS = 50;
 
 void create_regular_mesh( int interval, int dimension );
-void skin_common( int interval, int dim, bool use_adj );
-void skin(const int intervals, const int dim) 
+void skin_common( int interval, int dim, int blocks, bool use_adj );
+void skin( int intervals, int dim, int num ) 
   { std::cout << "Skinning w/out adjacencies:" << std::endl;
-    skin_common( intervals, dim, false ); }
-void skin_adj(const int intervals, const int dim)
+    skin_common( intervals, dim, num, false ); }
+void skin_adj( int intervals, int dim, int num )
   { std::cout << "Skinning with adjacencies:" << std::endl;
-    skin_common( intervals, dim, true ); }
+    skin_common( intervals, dim, num, true ); }
 
-void tag_time( TagType storage, bool direct, int intervals, int dim );
+void tag_time( TagType storage, bool direct, int intervals, int dim, int blocks );
 
-void dense_tag( int intervals, int dim ) 
+void dense_tag( int intervals, int dim, int blocks ) 
   { std::cout << "Dense Tag Time:"; 
-    tag_time( MB_TAG_DENSE, false, intervals, dim ); }
-void sparse_tag( int intervals, int dim )
+    tag_time( MB_TAG_DENSE, false, intervals, dim, blocks ); }
+void sparse_tag( int intervals, int dim, int blocks )
   { std::cout << "Sparse Tag Time:"; 
-    tag_time( MB_TAG_SPARSE, false, intervals, dim ); }
-void direct_tag( int intervals, int dim )
+    tag_time( MB_TAG_SPARSE, false, intervals, dim, blocks ); }
+void direct_tag( int intervals, int dim, int blocks )
   { std::cout << "Direct Tag Time:"; 
-    tag_time( MB_TAG_DENSE, true, intervals, dim ); }
+    tag_time( MB_TAG_DENSE, true, intervals, dim, blocks ); }
 
-typedef void (*test_func_t)( const int, const int );
+typedef void (*test_func_t)( int, int, int );
 const struct {