[cgma-dev] r5052 - cgm/trunk/test

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-07-12 11:55:15 -0500 (Tue, 12 Jul 2011)
New Revision: 5052

Modified:
   cgm/trunk/test/attribute_to_buffer.cpp
   cgm/trunk/test/attribute_to_file.cpp
   cgm/trunk/test/makept.cpp
   cgm/trunk/test/modify.cpp
Log:
Remove parallel test from attribute export tests; minor updates for modify and makept.

Modified: cgm/trunk/test/attribute_to_buffer.cpp
===================================================================
--- cgm/trunk/test/attribute_to_buffer.cpp	2011-07-11 20:23:21 UTC (rev 5051)
+++ cgm/trunk/test/attribute_to_buffer.cpp	2011-07-12 16:55:15 UTC (rev 5052)
@@ -4,10 +4,10 @@
 #include "Body.hpp"
 #include "CGMApp.hpp"
 #include "CubitAttribManager.hpp"
-#include "CADefines.hpp"
-#include "TDParallel.hpp"
-#include "CABodies.hpp"
+#include "CAEntityId.hpp"
 
+#include <iostream>
+#include <string>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -37,8 +37,8 @@
   ASSERT(s);
   
   // actuate CA_BODIES attribute and turn on auto flag
-  CGMApp::instance()->attrib_manager()->register_attrib_type(CA_BODIES, "bodies", "BODIES",
-							     CABodies_creator, CUBIT_TRUE,
+  CGMApp::instance()->attrib_manager()->register_attrib_type(CA_ENTITY_ID, "id", "ENTITY_ID",
+							     CAEntityId_creator, CUBIT_TRUE,
 							     CUBIT_TRUE, CUBIT_TRUE, CUBIT_TRUE,
 							     CUBIT_TRUE, CUBIT_FALSE);
   CGMApp::instance()->attrib_manager()->auto_flag(CUBIT_TRUE);
@@ -53,24 +53,6 @@
     s = GeometryQueryTool::instance()->translate( bricks[i], CubitVector(i,0,0) );
     ASSERT(s);
     export_list.append( bricks[i] );
-
-    // add tool data to bodies
-    RefEntity* entity = dynamic_cast<RefEntity*> (bricks[i]);
-    DLIList<int> shared_procs;
-    shared_procs.append(i);
-    TDParallel *td_par = (TDParallel *) entity->get_TD(&TDParallel::is_parallel);
-    if (td_par == NULL) td_par = new TDParallel(entity, NULL, &shared_procs);
-
-    // add tool data to volumes too
-    DLIList<RefVolume*> volumes;
-    (dynamic_cast<TopologyEntity*> (entity))->ref_volumes(volumes);
-    int n_vol = volumes.size();
-    volumes.reset();
-    for (int j = 0; j < n_vol; j++) {
-      RefEntity *vol = volumes.get_and_step();
-      td_par = (TDParallel *) vol->get_TD(&TDParallel::is_parallel);
-      if (td_par == NULL) td_par = new TDParallel(vol, NULL, &shared_procs);
-    }