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

[iulian at mcs.anl.gov]

Author: iulian
Date: 2013-02-16 10:28:56 -0600 (Sat, 16 Feb 2013)
New Revision: 6009

Modified:
   cgm/trunk/geom/parallel/CABodies.cpp
   cgm/trunk/geom/parallel/CABodies.hpp
   cgm/trunk/geom/parallel/CGMReadParallel.cpp
Log:
revert some changes from revision 6004 back to 2003
buildbot was not happy


Modified: cgm/trunk/geom/parallel/CABodies.cpp
===================================================================
--- cgm/trunk/geom/parallel/CABodies.cpp	2013-02-15 22:22:31 UTC (rev 6008)
+++ cgm/trunk/geom/parallel/CABodies.cpp	2013-02-16 16:28:56 UTC (rev 6009)
@@ -10,11 +10,18 @@
 #include "CastTo.hpp"
 #include "TDParallel.hpp"
 
-CubitAttrib* CABodies_creator(RefEntity* entity, const CubitSimpleAttrib& p_csa)
+CubitAttrib* CABodies_creator(RefEntity* entity, CubitSimpleAttrib *p_csa)
 {
   CABodies *new_attrib = NULL;
-  CubitSimpleAttrib csa = p_csa;
-  new_attrib = new CABodies(entity, &csa);
+  if (NULL == p_csa)
+  {
+    new_attrib = new CABodies(entity);
+  }
+  else
+  {
+    new_attrib = new CABodies(entity, p_csa);
+  }
+
   return new_attrib;
 }
 
@@ -31,43 +38,31 @@
 		     (attribOwnerEntity ? attribOwnerEntity->id() : 0));
   }
 
-  std::vector<int> i_list = csa_ptr->int_data_list();
+  DLIList<int*> *i_list = csa_ptr->int_data_list();
 
   // first, the ints
-  if (i_list.size() > 0)
-  {
-    m_interface = i_list[0]; // is interface
+  i_list->reset();
+  
+  m_interface = *(i_list->get_and_step()); // is interface
 
-    if (i_list.size() > 1)
-    {
-      m_uniqueID = i_list[1]; // unique ID
+  m_uniqueID = *(i_list->get_and_step()); // unique ID
 
-      if(i_list.size() > 2)
-      {
-        // shared bodies
-        int num_list = i_list[2];
-        for (int i = 0; i < num_list; i++)