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

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2011-05-20 13:21:04 -0500 (Fri, 20 May 2011)
New Revision: 4856

Removed:
   cgm/trunk/geom/OCC/occ_attrib_history.hpp
Modified:
   cgm/trunk/geom/OCC/OCCBody.cpp
   cgm/trunk/geom/OCC/OCCSurface.cpp
Log:
Fix for mcnp2cad testcases cylinder2, cylinder3, fill2, fill3. Remove occ_attrib_history.hpp as it's not suitable in OCC. Passed make check in cgm.

Modified: cgm/trunk/geom/OCC/OCCBody.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCBody.cpp	2011-05-20 15:10:23 UTC (rev 4855)
+++ cgm/trunk/geom/OCC/OCCBody.cpp	2011-05-20 18:21:04 UTC (rev 4856)
@@ -256,7 +256,7 @@
   for(int i = 0 ; i < csa_list.size(); i ++)
   {
     CubitSimpleAttrib* csa = csa_list.get_and_step();
-    if(*csa->string_data_list()->get() == name)
+    if(csa->string_data_list()->size() > 0 && *csa->string_data_list()->get() == name)
       csas.append(csa);
   }
   return CUBIT_SUCCESS;

Modified: cgm/trunk/geom/OCC/OCCSurface.cpp
===================================================================
--- cgm/trunk/geom/OCC/OCCSurface.cpp	2011-05-20 15:10:23 UTC (rev 4855)
+++ cgm/trunk/geom/OCC/OCCSurface.cpp	2011-05-20 18:21:04 UTC (rev 4856)
@@ -312,7 +312,8 @@
         }
   return CUBIT_SUCCESS;
   }
-  return CUBIT_FAILURE;
+  //return as Acis did.
+  return CUBIT_SUCCESS;
 }
 
 //-------------------------------------------------------------------------

Deleted: cgm/trunk/geom/OCC/occ_attrib_history.hpp
===================================================================
--- cgm/trunk/geom/OCC/occ_attrib_history.hpp	2011-05-20 15:10:23 UTC (rev 4855)
+++ cgm/trunk/geom/OCC/occ_attrib_history.hpp	2011-05-20 18:21:04 UTC (rev 4856)
@@ -1,91 +0,0 @@
-//-------------------------------------------------------------------------
-// Filename      : occ_attrib_history.hpp
-//
-// Purpose       : Attributes needed to track subdivisions, 
-//                 merges, copy, and geometry-changing events
-//
-//-------------------------------------------------------------------------
-
-#ifndef OCC_ATTRIB_HISTORY_HPP
-#define OCC_ATTRIB_HISTORY_HPP
-
-// ********** BEGIN OCC INCLUDES             **********
-// ********** END OCC INCLUDES               **********
-
-// ********** BEGIN CUBIT INCLUDES            **********
-#include <set>
-// ********** END CUBIT INCLUDES              **********