[cgma-dev] r6075 - cgm/trunk/geom/OCC

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-10-17 10:54:46 -0500 (Thu, 17 Oct 2013)
New Revision: 6075

Modified:
   cgm/trunk/geom/OCC/OCCModifyEngine.cpp
   cgm/trunk/geom/OCC/OCCQueryEngine.cpp
Log:
Passed make check in cgm and meshkit/rgg. I did several changes to finalize this change, it dropped 5_mox1 tests from 64 min on my machine to  28.62 min.

Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2013-10-09 17:24:47 UTC (rev 6074)
+++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp	2013-10-17 15:54:46 UTC (rev 6075)
@@ -1470,11 +1470,7 @@
     }
     BodySM* body = lump->get_body();
     if(body != NULL)
-    {
-      PRINT_ERROR("Can't create compound bodies using existing bodies.\n");
-      PRINT_INFO("Please try unite operation.\n");
-      return (BodySM*) NULL;
-    } 
+      OCCQueryEngine::instance()->delete_body(body, CUBIT_FALSE);
   }
   TopoDS_Compound* Co;
   DLIList<OCCShell*> shells;
@@ -5015,9 +5011,10 @@
       BodySM* bodysm = CAST_TO(tbs.get(), BodySM);
       if (bodysm)
       {
-        bodies.append(bodysm);
         CAST_TO(bodysm, OCCBody)->get_TopoDS_Shape(first_shape);
-        shape_list.append(first_shape);
+        revised_bodies.append(bodysm);
+        revised_shapes.append(first_shape);
+
       }
     } 
   }

Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCQueryEngine.cpp	2013-10-09 17:24:47 UTC (rev 6074)
+++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp	2013-10-17 15:54:46 UTC (rev 6075)
@@ -2791,7 +2791,7 @@
 OCCQueryEngine::delete_body( BodySM* bodysm,
                              bool remove_lower_entities) const
 {
-  OCCBody* occ_body = dynamic_cast<OCCBody*>(bodysm);
+  OCCBody* occ_body = static_cast<OCCBody*>(bodysm);
   if (!occ_body)
     return CUBIT_FAILURE;