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

[hongjun at mcs.anl.gov]

Author: hongjun
Date: 2011-05-23 11:42:30 -0500 (Mon, 23 May 2011)
New Revision: 4860

Modified:
   cgm/trunk/geom/parallel/CGMReadParallel.cpp
   cgm/trunk/geom/parallel/CGMReadParallel.hpp
Log:
o Cleaned up codes
o Use # of bridges to check if it is merged entity
o Add debug codes
o Passes make check


Modified: cgm/trunk/geom/parallel/CGMReadParallel.cpp
===================================================================
--- cgm/trunk/geom/parallel/CGMReadParallel.cpp	2011-05-23 05:08:55 UTC (rev 4859)
+++ cgm/trunk/geom/parallel/CGMReadParallel.cpp	2011-05-23 16:42:30 UTC (rev 4860)
@@ -4,7 +4,6 @@
 #include "CubitMessage.hpp"
 #include "DLList.hpp"
 #include "RefEntity.hpp"
-//#include "RefVolume.hpp"
 #include "RefFace.hpp"
 #include "RefEdge.hpp"
 #include "RefVertex.hpp"
@@ -12,11 +11,11 @@
 #include "Body.hpp"
 #include "CastTo.hpp"
 #include "CubitUtil.hpp"
-#include "CubitAttrib.hpp"
 #include "CADefines.hpp"
 #include "CABodies.hpp"
 #include "TDParallel.hpp"
 #include "CAMergePartner.hpp"
+#include "TDUniqueId.hpp"
 
 #include "TopologyBridge.hpp"
 #include "GeometryQueryTool.hpp"
@@ -24,7 +23,7 @@
 #include "CGMParallelConventions.h"
 #include "CGMParallelComm.hpp"
 
-const bool debug = false;
+const bool CGM_read_parallel_debug = false;
 
 enum CGMParallelActions {PA_READ=0, PA_BROADCAST, PA_DELETE_NONLOCAL,
 			 PA_SCATTER, PA_SCATTER_DELETE, PA_BALANCE,
@@ -226,7 +225,7 @@
 							     CUBIT_TRUE, CUBIT_FALSE);
   CGMApp::instance()->attrib_manager()->auto_flag(CUBIT_TRUE);
   
-  if (debug) {
+  if (CGM_read_parallel_debug) {
     DEBUG_FLAG(90, CUBIT_TRUE);
     DEBUG_FLAG(138, CUBIT_TRUE);
   }
@@ -235,7 +234,7 @@
   bool i_read = false;
   std::vector<int>::iterator vit;
   int i;
-  //DLIList<RefEntity*> surf_entity_list, body_entity_list;
+
   for (i = 1, vit = pa_vec.begin(); vit != pa_vec.end(); vit++, i++) {
     CubitStatus result = CUBIT_SUCCESS;