[MOAB-dev] r5046 - MOAB/trunk/tools/mbzoltan

[hongjun at mcs.anl.gov]

Author: hongjun
Date: 2011-07-07 14:53:47 -0500 (Thu, 07 Jul 2011)
New Revision: 5046

Modified:
   MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
   MOAB/trunk/tools/mbzoltan/MBZoltan.hpp
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
Log:
o Surface geometry partitioning is added in mbzoltan
o Some bugs are fixed in mbpart.cpp
o Passes make check


Modified: MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
===================================================================
--- MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2011-07-07 17:11:03 UTC (rev 5045)
+++ MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2011-07-07 19:53:47 UTC (rev 5046)
@@ -39,6 +39,8 @@
 #include <limits>
 #include "RefEntity.hpp"
 #include "RefFace.hpp"
+#include "RefEdge.hpp"
+#include "RefVertex.hpp"
 #include "Body.hpp"
 #include "TopologyEntity.hpp"
 #include "CastTo.hpp"
@@ -244,7 +246,8 @@
                                         const bool write_as_tags,
                                         const int part_dim,
                                         const int obj_weight,
-                                        const int edge_weight) 
+                                        const int edge_weight,
+                                        const bool part_surf) 
 {
     // should only be called in serial
   if (mbpc->proc_config().proc_size() != 1) {
@@ -300,7 +303,7 @@
     }
     else {
 #ifdef CGM
-      partition_round_robin(3, nparts, false); RR;
+      result = partition_round_robin(nparts); RR;
 #endif
     }
   
@@ -314,6 +317,22 @@
 #ifdef CGM
     result = assemble_graph(part_dim, pts, ids, adjs, length, obj_weights,
                             edge_weights, entities); RR;
+
+    if (debug) {
+      int n_ids = ids.size();
+      entities.reset();
+      int i_leng = 0;
+      for (int i = 0; i < n_ids; i++) {
+        std::cout << "graph_input_ids[" << i << "]=" << ids[i]
+                  << ",obj_weights=" << obj_weights[i]
+                  << ",entity_id=" << entities.get_and_step()->id() << std::endl;
+        for (int j = 0; j < length[i]; j++) {
+          std::cout << "adjs[" << j << "]=" << adjs[i_leng] 
+                    << ",edge_weights=" << edge_weights[i_leng]<< std::endl;
+          i_leng++;
+        }
+      }