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

[hongjun at mcs.anl.gov]

Author: hongjun
Date: 2011-09-16 14:20:17 -0500 (Fri, 16 Sep 2011)
New Revision: 5166

Modified:
   MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
   MOAB/trunk/tools/mbzoltan/MBZoltan.hpp
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
Log:
o ghost option is added to add ghost geometry for geomtry partition
o passes make check


Modified: MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
===================================================================
--- MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2011-09-16 18:31:34 UTC (rev 5165)
+++ MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2011-09-16 19:20:17 UTC (rev 5166)
@@ -247,7 +247,8 @@
                                         const int part_dim,
                                         const int obj_weight,
                                         const int edge_weight,
-                                        const bool part_surf) 
+                                        const bool part_surf,
+                                        const bool ghost) 
 {
     // should only be called in serial
   if (mbpc->proc_config().proc_size() != 1) {
@@ -446,7 +447,7 @@
   else {
 #ifdef CGM
     result = write_partition(nparts, entities, assign_parts,
-                             obj_weights, part_surf);
+                             obj_weights, part_surf, ghost);
 #endif
   }
 
@@ -642,7 +643,8 @@
                                     DLIList<RefEntity*> entities,
                                     const int *assignment,
                                     std::vector<double> &obj_weights,
-                                    const bool part_surf)
+                                    const bool part_surf,
+                                    const bool ghost)
 {
   ErrorCode result;
 
@@ -716,7 +718,7 @@
         int merge_id = TDUniqueId::get_unique_id(entity);
         TDParallel *td_par = (TDParallel *) entity->get_TD(&TDParallel::is_parallel);
         if (td_par == NULL) td_par = new TDParallel(entity, NULL, &shared_procs,
-                                                    merge_id, 1);
+                                                    NULL, merge_id, 1);
         
         if (debug) {
           std::cout << "surf" << entity->id() << "_is_partitioned_to_p";
@@ -735,7 +737,7 @@
   }
 
   // partition shared edges and vertex
-  result = partition_child_entities(1, nparts, part_surf); RR;
+  result = partition_child_entities(1, nparts, part_surf, ghost); RR;
   result = partition_child_entities(0, nparts, part_surf); RR;
 
   return MB_SUCCESS;