Author: janehu Date: 2012-08-28 17:41:19 -0500 (Tue, 28 Aug 2012) New Revision: 5711 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp Log: Updated for special case in mcnp2cad when a 2-lump body unite with others and becomes a single lump body. Passed cgm make check. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-08-28 22:40:49 UTC (rev 5710) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-08-28 22:41:19 UTC (rev 5711) @@ -607,13 +607,14 @@ CubitBoolean updated = CUBIT_FALSE; if(!old_shape.IsNull() && old_shape.ShapeType() == TopAbs_COMPOUND && !new_shape.IsNull() && new_shape.ShapeType() == TopAbs_COMPOUND && - !old_shape.IsSame(new_shape) && M.Extent() == M_new.Extent()) + !old_shape.IsSame(new_shape)) { //By updating underling solids, shells etc., the old_shape will get changed. //trying to make sure the the number of each entity in the old and new //shapes are the same, which means that nothing is delete, that we can //update the map here. Otherwise, when deleting solids, it'll delete the - //the old body and create new body. This is Ok for general boolean operation //except imprint when booleans are called, usually the original body are + //the old body and create new body. This is Ok for general boolean operation + //except imprint when booleans are called, usually the original body are // supposed to be kept. updated = CUBIT_TRUE; OCCQueryEngine::instance()->update_OCC_map(old_shape, new_shape);