[cgma-dev] r5060 - cgm/trunk/geom/parallel

[hongjun at mcs.anl.gov]

Author: hongjun
Date: 2011-07-15 09:21:12 -0500 (Fri, 15 Jul 2011)
New Revision: 5060

Modified:
   cgm/trunk/geom/parallel/CGMReadParallel.cpp
   cgm/trunk/geom/parallel/CGMReadParallel.hpp
Log:
o removed unused parallel actions
o private members for partition method are changed from bool to enum
o passes make check


Modified: cgm/trunk/geom/parallel/CGMReadParallel.cpp
===================================================================
--- cgm/trunk/geom/parallel/CGMReadParallel.cpp	2011-07-14 22:51:03 UTC (rev 5059)
+++ cgm/trunk/geom/parallel/CGMReadParallel.cpp	2011-07-15 14:21:12 UTC (rev 5060)
@@ -27,9 +27,7 @@
 const bool CGM_read_parallel_debug = false;
 
 enum CGMParallelActions {PA_READ=0, PA_BROADCAST, PA_DELETE_NONLOCAL,
-			 PA_SCATTER, PA_SCATTER_DELETE, PA_BALANCE,
-			 PA_CHECK_GIDS_SERIAL, PA_RESOLVE_SHARED_ENTS,
-			 PA_EXCHANGE_GHOSTS};
+			 PA_SCATTER, PA_SCATTER_DELETE, PA_BALANCE};
 
 enum CGMPartitionActions {PT_GEOM_DIM=0, PT_PAR_PART};
 
@@ -37,11 +35,7 @@
   "PARALLEL READ",
   "PARALLEL BROADCAST", 
   "PARALLEL DELETE NONLOCAL",
-  "PARALLEL SCATTER",
-  "PARALLEL CHECK_GIDS_SERIAL",
-  "PARALLEL GET_FILESET_ENTS",
-  "PARALLEL RESOLVE_SHARED_ENTS",
-  "PARALLEL EXCHANGE_GHOSTS"
+  "PARALLEL SCATTER"
 };
 
 const char* CGMReadParallel::CGMparallelOptsNames[] = { "NONE", "READ", "READ_DELETE", "BCAST", 
@@ -59,8 +53,7 @@
     if (NULL == m_pcomm) m_pcomm = new CGMParallelComm();
   }
 
-  m_round_robin = false;
-  m_partition_static = false;
+  m_bal_method = ROUND_ROBIN;
   m_scatter = false;
   m_rank = m_pcomm->proc_config().proc_rank();
   m_proc_size = m_pcomm->proc_config().proc_size();
@@ -99,7 +92,7 @@
 
   if (FO_ENTITY_NOT_FOUND == result || partition_tag_name.empty()) {
     partition_tag_name = "GEOM_DIMENSION";
-    m_round_robin = true;
+    m_bal_method = ROUND_ROBIN;
     geom_dim = 3;
   }
   else {
@@ -119,16 +112,16 @@
     }
     // static partition, use chaco
     else if (partition_tag_name == "PAR_PARTITION_STATIC") {