August 2010 - cgma-dev - mailman3.cels.anl.gov

r4112 - cgm/trunk
by kraftche＠cae.wisc.edu 31 Aug '10

31 Aug '10

Author: kraftche Date: 2010-08-31 09:09:02 -0500 (Tue, 31 Aug 2010) New Revision: 4112 Modified: cgm/trunk/configure.ac Log: Put back -Wall flag. \ I misunderstood some automake documentation Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2010-08-30 22:53:52 UTC (rev 4111) +++ cgm/trunk/configure.ac 2010-08-31 14:09:02 UTC (rev 4112) @@ -10,7 +10,7 @@ [AM_INIT_AUTOMAKE([foreign -Wall])]) AC_DISABLE_SHARED -EXTRA_GNU_FLAGS="-pipe -pedantic" +EXTRA_GNU_FLAGS="-Wall -pipe -pedantic" FATHOM_CHECK_COMPILERS AC_PROG_LIBTOOL LIBS="-lm"

1 0

r4111 - in cgm/trunk: . cgm_apps cgm_apps/examples cgm_apps/examples/driverc++ cgm_apps/examples/facetdriver geom geom/ACIS_SRC geom/Cholla geom/OCC geom/facet geom/facetbool geom/parallel geom/virtual init itaps test util
by kraftche＠cae.wisc.edu 30 Aug '10

30 Aug '10

Author: kraftche Date: 2010-08-30 17:53:52 -0500 (Mon, 30 Aug 2010) New Revision: 4111 Modified: cgm/trunk/Makefile.am cgm/trunk/cgm_apps/Makefile.am cgm/trunk/cgm_apps/examples/Makefile.am cgm/trunk/cgm_apps/examples/driverc++/Makefile.am cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am cgm/trunk/configure.ac cgm/trunk/geom/ACIS_SRC/Makefile.am cgm/trunk/geom/Cholla/Makefile.am cgm/trunk/geom/Makefile.am cgm/trunk/geom/OCC/Makefile.am cgm/trunk/geom/facet/Makefile.am cgm/trunk/geom/facetbool/Makefile.am cgm/trunk/geom/parallel/Makefile.am cgm/trunk/geom/virtual/Makefile.am cgm/trunk/init/Makefile.am cgm/trunk/itaps/Makefile.am cgm/trunk/test/Makefile.am cgm/trunk/util/Makefile.am Log: Misc. fixes and improvements to autotools build: o Enable "silent-rules color-tests parallel-tests" options if using sufficiently new version of automake o Specify -Wall the correct way so that it is enabled for all compilers for which automake knows the correct flag rather than just for g++ o Move some logic duplicated (in some cases incorrectly) in every Makefile.am into configure.ac (-DTEMPLATE_DEFS_INCLUDED and other configured preprocessor macros.) o Replace use of old, deprecated INCLUDES and DEFS variables with AM_CPPFLAGS o Clean up unnecessary per-test CPPFLAGS, LDFLAGS, etc. o Remove unnecessary AUTOMAKE_OPTIONS variable from all but top-level Makefile.am o Make a few odd makefile rules play nice with 'silent-rules' option. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2010-08-30 21:32:51 UTC (rev 4110) +++ cgm/trunk/Makefile.am 2010-08-30 22:53:52 UTC (rev 4111) @@ -56,6 +56,6 @@ # directory until we're doing the install. CFG_FILE = $(DESTDIR)$(cfgdir)/cgm.make install-data-hook: - echo "CGM_INT_INCLUDE = -I$(includedir)" >> $(CFG_FILE) - echo "CGM_INT_LDFLAGS = -L$(libdir)" >> $(CFG_FILE) - echo "CGM_INT_LTFLAGS = -R$(libdir)" >> $(CFG_FILE) + $(AM_V_at)echo "CGM_INT_INCLUDE = -I$(includedir)" >> $(CFG_FILE) + $(AM_V_at)echo "CGM_INT_LDFLAGS = -L$(libdir)" >> $(CFG_FILE) + $(AM_V_at)echo "CGM_INT_LTFLAGS = -R$(libdir)" >> $(CFG_FILE) Modified: cgm/trunk/cgm_apps/Makefile.am =================================================================== --- cgm/trunk/cgm_apps/Makefile.am 2010-08-30 21:32:51 UTC (rev 4110) +++ cgm/trunk/cgm_apps/Makefile.am 2010-08-30 22:53:52 UTC (rev 4111) @@ -1,2 +1 @@ -AUTOMAKE_OPTIONS = foreign SUBDIRS = examples Modified: cgm/trunk/cgm_apps/examples/Makefile.am =================================================================== --- cgm/trunk/cgm_apps/examples/Makefile.am 2010-08-30 21:32:51 UTC (rev 4110) +++ cgm/trunk/cgm_apps/examples/Makefile.am 2010-08-30 22:53:52 UTC (rev 4111) @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = foreign - if build_ACIS ACIS_SUBDIRS = driverc++ else Modified: cgm/trunk/cgm_apps/examples/driverc++/Makefile.am =================================================================== --- cgm/trunk/cgm_apps/examples/driverc++/Makefile.am 2010-08-30 21:32:51 UTC (rev 4110) +++ cgm/trunk/cgm_apps/examples/driverc++/Makefile.am 2010-08-30 22:53:52 UTC (rev 4111) @@ -1,6 +1,5 @@ TESTS = mergechk_merge mergechk_huge EXTRA_DIST = README merge.sat huge.sat $(TESTS) -DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) check_PROGRAMS = mergechk CLEANFILES = mmgr.log Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am =================================================================== --- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am 2010-08-30 21:32:51 UTC (rev 4110) +++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am 2010-08-30 22:53:52 UTC (rev 4111) @@ -1,6 +1,3 @@

1 0

r4110 - cgm/trunk
by kraftche＠cae.wisc.edu 30 Aug '10

30 Aug '10

Author: kraftche Date: 2010-08-30 16:32:51 -0500 (Mon, 30 Aug 2010) New Revision: 4110 Modified: cgm/trunk/configure.ac Log: fix two issues when detecting static OCC libraries Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2010-08-27 15:16:44 UTC (rev 4109) +++ cgm/trunk/configure.ac 2010-08-30 21:32:51 UTC (rev 4110) @@ -394,17 +394,37 @@ [AC_MSG_ERROR([OpenCascade config error: libTKernel not found ])], [-ldl] ) ] ) + + # Common setup for tests below + old_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $OCC_INC_FLAG" + # Check if OpenCascade requires -lpthread + AC_MSG_CHECKING([if OpenCascade requires -lpthread]) + LIBS="$OCC_LIBS $old_LIBS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include "Standard_Mutex.hxx"], [Standard_Mutex mutex; mutex.TryLock();])], + [AC_MSG_RESULT([no])], + [# Try test again with pthreads library + LIBS="$LIBS -lpthread" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include "Standard_Mutex.hxx"], [Standard_Mutex mutex; mutex.TryLock();])], + [AC_MSG_RESULT([yes]); OCC_LIBS="$OCC_LIBS -lpthread"], + [AC_MSG_ERROR([Cannot link libTKKernel with Standard_Mutex])] + )]) + + HAVE_OCC_DEF="-DHAVE_OCC" - # Check for IGES, STEP, and STL support + + # Check for IGES support AC_CHECK_LIB( [TKIGES], [igesread], [HAVE_OCC_DEF="$HAVE_OCC_DEF -DHAVE_OCC_IGES" OCC_LIBS="-lTKIGES -lTKXSBase $OCC_LIBS"], - [], [$OCC_LIBS] ) + [], [-lTKXSBase $OCC_LIBS] ) + + # Check for STEP support AC_MSG_CHECKING([for OpenCascade STEP support (libTKSTEP)]) - old_LIBS="$LIBS" - LIBS="$OCC_STEP_LIBS $OCC_LIBS $LIBS" - CPPFLAGS="$CPPFLAGS $OCC_INC_FLAG" + LIBS="$OCC_STEP_LIBS $OCC_LIBS $old_LIBS" AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include "STEPControl_Reader.hxx"], [STEPControl_Reader reader;])], @@ -412,6 +432,8 @@ OCC_LIBS="$OCC_STEP_LIBS $OCC_LIBS" AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])

1 0

r4097 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 18 Aug '10

18 Aug '10

Author: janehu Date: 2010-08-18 13:04:55 -0500 (Wed, 18 Aug 2010) New Revision: 4097 Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp Log: This is the correct version for backing up this file. Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2010-08-18 17:02:14 UTC (rev 4096) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2010-08-18 18:04:55 UTC (rev 4097) @@ -13,6 +13,7 @@ // Creation Date : 7/17/00 // //------------------------------------------------------------------------- +#include <Standard_Version.hxx> #include <Standard_Stream.hxx> //#include <Standard_SStream.hxx> //#include <Standard_String.hxx> @@ -39,11 +40,15 @@ #include "Handle_Poly_Triangulation.hxx" #include "GCPnts_TangentialDeflection.hxx" #include "BRepAdaptor_Curve.hxx" -#include "STEPControl_Reader.hxx" -#include "IGESControl_Reader.hxx" -#include "STEPControl_Writer.hxx" -#include "IGESControl_Writer.hxx" -#include "STEPControl_StepModelType.hxx" +#ifdef HAVE_OCC_STEP +# include "STEPControl_Reader.hxx" +# include "STEPControl_Writer.hxx" +# include "STEPControl_StepModelType.hxx" +#endif +#ifdef HAVE_OCC_IGES +# include "IGESControl_Reader.hxx" +# include "IGESControl_Writer.hxx" +#endif #include "IFSelect_ReturnStatus.hxx" #include "BndLib_Add3dCurve.hxx" #include "Poly_Polygon3D.hxx" @@ -116,10 +121,6 @@ OCCQueryEngine* OCCQueryEngine::instance_ = NULL; -const int OCCQueryEngine::OCCQE_MAJOR_VERSION = 6; -const int OCCQueryEngine::OCCQE_MINOR_VERSION = 2; -const int OCCQueryEngine::OCCQE_SUBMINOR_VERSION = 0; - typedef std::map<int, TopologyBridge*>::value_type valType; int OCCQueryEngine::iTotalTBCreated = 0; int OCCQueryEngine::total_coedges = 0; @@ -177,29 +178,22 @@ int OCCQueryEngine::get_major_version() { - return OCCQE_MAJOR_VERSION; + return OCC_VERSION_MAJOR; }

1 0

r4096 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 18 Aug '10

18 Aug '10

Author: janehu Date: 2010-08-18 12:02:14 -0500 (Wed, 18 Aug 2010) New Revision: 4096 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCSurface.cpp Log: Back up most files into previous version. These changes are a trial to fix unite problem in other mcnp2cad testing, but seems not good yet for a fix. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2010-08-18 16:59:26 UTC (rev 4095) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2010-08-18 17:02:14 UTC (rev 4096) @@ -52,14 +52,13 @@ #include "BRepGProp.hxx" #include "Standard_Boolean.hxx" #include "LocOpe_SplitShape.hxx" -#include "TopoDS_Compound.hxx" //------------------------------------------------------------------------- // Purpose : A constructor with a list of lumps that are attached. // // Special Notes : // //------------------------------------------------------------------------- -OCCBody::OCCBody(TopoDS_Compound *theShape, CubitBoolean isSheetBody, +OCCBody::OCCBody(TopoDS_CompSolid *theShape, CubitBoolean isSheetBody, OCCSurface* surface, OCCShell* shell) { myTopoDSShape = theShape; @@ -83,45 +82,45 @@ myLumps += my_lumps; } -void OCCBody::set_TopoDS_Shape( TopoDS_Compound theshape) +void OCCBody::set_TopoDS_Shape( TopoDS_CompSolid theshape) { if(theshape.IsEqual(*myTopoDSShape)) return; - TopoDS_Compound * the_comp = new TopoDS_Compound(theshape); + TopoDS_CompSolid * the_comp = new TopoDS_CompSolid(theshape); if(myTopoDSShape) - delete (TopoDS_Compound*)myTopoDSShape; + delete (TopoDS_CompSolid*)myTopoDSShape; myTopoDSShape = the_comp; } OCCBody::OCCBody(DLIList<Lump*>& my_lumps) { myLumps += my_lumps; - TopoDS_Compound* new_top = make_Compound(my_lumps); + TopoDS_CompSolid* new_top = make_CompSolid(my_lumps); myTopoDSShape = new_top; IsSheetBody = CUBIT_FALSE; myShell = NULL; update_bounding_box(); } -TopoDS_Compound* OCCBody::make_Compound(DLIList<Lump*>& my_lumps) +TopoDS_CompSolid* OCCBody::make_CompSolid(DLIList<Lump*>& my_lumps)

1 0

r4095 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 18 Aug '10

18 Aug '10

Author: janehu Date: 2010-08-18 11:59:26 -0500 (Wed, 18 Aug 2010) New Revision: 4095 Modified: cgm/trunk/geom/OCC/OCCBody.hpp cgm/trunk/geom/OCC/OCCDrawTool.cpp cgm/trunk/geom/OCC/OCCLump.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.hpp cgm/trunk/geom/OCC/OCCShell.cpp Log: Back up most files into previous version. These changes are a trial to fix unite problem in other mcnp2cad testing, but seems not good yet for a fix. Modified: cgm/trunk/geom/OCC/OCCBody.hpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.hpp 2010-08-18 14:11:47 UTC (rev 4094) +++ cgm/trunk/geom/OCC/OCCBody.hpp 2010-08-18 16:59:26 UTC (rev 4095) @@ -24,6 +24,7 @@ #include "OCCAttribSet.hpp" #include "CubitBox.hpp" +#include <TopoDS_CompSolid.hxx> // ********** END CUBIT INCLUDES ********** // ********** BEGIN FORWARD DECLARATIONS ********** @@ -41,15 +42,13 @@ class BRepAlgoAPI_BooleanOperation; class BRepBuilderAPI_MakeShape; class LocOpe_SplitShape; -class TopoDS_Compound; // ********** END FORWARD DECLARATIONS ********** class OCCBody : public BodySM { public: - // Currently, the compound should only consists solids. - OCCBody(TopoDS_Compound *theShape, CubitBoolean isSheetBody = CUBIT_FALSE, + OCCBody(TopoDS_CompSolid *theShape, CubitBoolean isSheetBody = CUBIT_FALSE, OCCSurface* surface = NULL, OCCShell* shell = NULL); OCCBody(DLIList<Lump*>& my_lumps); @@ -69,8 +68,8 @@ //- This function returns a pointer to the geometric modeling engine //- associated with the object. - TopoDS_Compound *get_TopoDS_Shape() {return myTopoDSShape; } - void set_TopoDS_Shape( TopoDS_Compound theshape); + TopoDS_CompSolid *get_TopoDS_Shape() {return myTopoDSShape; } + void set_TopoDS_Shape( TopoDS_CompSolid theshape); virtual CubitStatus get_transforms( CubitTransformMatrix &tfm ); //R CubitStatus @@ -186,7 +185,7 @@ virtual CubitBoolean is_sheet_body(){return IsSheetBody;} - TopoDS_Compound* make_Compound(DLIList<Lump*>& my_lumps); + TopoDS_CompSolid* make_CompSolid(DLIList<Lump*>& my_lumps); protected: private: @@ -194,7 +193,7 @@ //List of the attached lumps for the traversal functions.

1 0

r4094 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 18 Aug '10

18 Aug '10

Author: janehu Date: 2010-08-18 09:11:47 -0500 (Wed, 18 Aug 2010) New Revision: 4094 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCBody.hpp cgm/trunk/geom/OCC/OCCDrawTool.cpp cgm/trunk/geom/OCC/OCCLump.cpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.hpp cgm/trunk/geom/OCC/OCCShell.cpp cgm/trunk/geom/OCC/OCCSurface.cpp Log: Fix a special case for imprint operation for INP-box3 case in mcnp2cad. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2010-08-17 20:39:08 UTC (rev 4093) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2010-08-18 14:11:47 UTC (rev 4094) @@ -52,13 +52,14 @@ #include "BRepGProp.hxx" #include "Standard_Boolean.hxx" #include "LocOpe_SplitShape.hxx" +#include "TopoDS_Compound.hxx" //------------------------------------------------------------------------- // Purpose : A constructor with a list of lumps that are attached. // // Special Notes : // //------------------------------------------------------------------------- -OCCBody::OCCBody(TopoDS_CompSolid *theShape, CubitBoolean isSheetBody, +OCCBody::OCCBody(TopoDS_Compound *theShape, CubitBoolean isSheetBody, OCCSurface* surface, OCCShell* shell) { myTopoDSShape = theShape; @@ -82,45 +83,45 @@ myLumps += my_lumps; } -void OCCBody::set_TopoDS_Shape( TopoDS_CompSolid theshape) +void OCCBody::set_TopoDS_Shape( TopoDS_Compound theshape) { if(theshape.IsEqual(*myTopoDSShape)) return; - TopoDS_CompSolid * the_comp = new TopoDS_CompSolid(theshape); + TopoDS_Compound * the_comp = new TopoDS_Compound(theshape); if(myTopoDSShape) - delete (TopoDS_CompSolid*)myTopoDSShape; + delete (TopoDS_Compound*)myTopoDSShape; myTopoDSShape = the_comp; } OCCBody::OCCBody(DLIList<Lump*>& my_lumps) { myLumps += my_lumps; - TopoDS_CompSolid* new_top = make_CompSolid(my_lumps); + TopoDS_Compound* new_top = make_Compound(my_lumps); myTopoDSShape = new_top; IsSheetBody = CUBIT_FALSE; myShell = NULL; update_bounding_box(); } -TopoDS_CompSolid* OCCBody::make_CompSolid(DLIList<Lump*>& my_lumps) +TopoDS_Compound* OCCBody::make_Compound(DLIList<Lump*>& my_lumps)

1 0

r4081 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 11 Aug '10

11 Aug '10

Author: janehu Date: 2010-08-11 12:50:09 -0500 (Wed, 11 Aug 2010) New Revision: 4081 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: make sure modify.cpp still works. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-08-11 17:43:49 UTC (rev 4080) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-08-11 17:50:09 UTC (rev 4081) @@ -3508,17 +3508,18 @@ BRepAlgoAPI_Common intersector(*from_shape, *tool_shape); TopTools_ListOfShape shapes; shapes.Assign(intersector.Modified(*tool_shape)); - if (shapes.IsEmpty()) - { - PRINT_INFO("The %d body did not have common part with the tool_body.\n", i+1); - continue; - } + if ( shapes.Extent() > 1) { PRINT_ERROR("Tool has multiple intersection with the shape, make it simpler. \n"); continue; } - TopoDS_Shape common_shape = shapes.First(); + TopoDS_Shape common_shape; + if (shapes.IsEmpty()) + common_shape = intersector.Shape(); + else + common_shape = shapes.First(); + if (is_volume[i] == CUBIT_TRUE && (common_shape.TShape()->ShapeType() == TopAbs_SHELL || common_shape.TShape()->ShapeType() == TopAbs_FACE ||

1 0

r4080 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 11 Aug '10

11 Aug '10

Author: janehu Date: 2010-08-11 12:43:49 -0500 (Wed, 11 Aug 2010) New Revision: 4080 Modified: cgm/trunk/test/modify.cpp Log: Get rid of volume id's since they are changing each time adding testcase. Modified: cgm/trunk/test/modify.cpp =================================================================== --- cgm/trunk/test/modify.cpp 2010-08-11 17:20:39 UTC (rev 4079) +++ cgm/trunk/test/modify.cpp 2010-08-11 17:43:49 UTC (rev 4080) @@ -404,8 +404,6 @@ //GeometryModifyEngine *gme = gmti->get_engine(occ_surfaces.get()); new_bodies.clean_out(); gmti->create_solid_bodies_from_surfs(face_list, new_bodies); - //Created volume(s): 13 - //Destroyed volume(s): 6 to 11 ref_entity_list.clean_out(); num_ents_exported=0; @@ -505,8 +503,6 @@ new_bodies.clean_out(); rsl = gmti->subtract(from_body2, from_bodies, new_bodies, CUBIT_TRUE, CUBIT_FALSE); - //Updated volume(s): 23 - //Destroyed volume(s): 24 //new bodies has one body, new body has 10 ref-faces, 5 of them are remaining //with old id, 5 of them are new faces. assert(new_bodies.size() == 1); @@ -516,8 +512,6 @@ new_bodies.clean_out(); rsl = gmti->subtract(tool_body,from_bodies, new_bodies, CUBIT_TRUE, CUBIT_FALSE); - //Created volume(s): 26, 27 - //Destroyed volume(s): 23, 25 d = new_bodies.step_and_get()->measure(); //d = 50 v = new_bodies.get()->center_point(); //v = (7.5, 5, .05) n = new_bodies.get()->num_ref_faces(); @@ -555,7 +549,6 @@ from_bodies.append(cp_from_body); new_bodies.clean_out(); CubitStatus stat = gmti->imprint(from_bodies, ref_edges, new_bodies, CUBIT_FALSE, CUBIT_TRUE ); - //Updated volume(s): 30 assert(new_bodies.get()->num_ref_faces() == 8); //test edge imprint on surface @@ -576,7 +569,6 @@ ref_edges.step_and_get()->ref_vertices(vertices); new_bodies.clean_out(); stat = gmti->imprint(unimprint_faces, ref_edges, new_bodies, CUBIT_FALSE); - //Updated volume(s): 31 assert(new_bodies.get()->num_ref_faces() == 6); new_bodies.clean_out(); @@ -603,13 +595,11 @@ from_bodies.append(cp_from_body2); new_bodies.clean_out(); stat = gmti->imprint(from_bodies, vectors, new_bodies, CUBIT_FALSE);

1 0

r4079 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 11 Aug '10

11 Aug '10

Author: janehu Date: 2010-08-11 12:20:39 -0500 (Wed, 11 Aug 2010) New Revision: 4079 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Take account for intersect function to get lower dimensional shapes. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-08-11 17:17:43 UTC (rev 4078) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-08-11 17:20:39 UTC (rev 4079) @@ -3506,8 +3506,37 @@ TopoDS_Shape* from_shape = shape_list.get_and_step(); BodySM* from_body = from_bodies.get_and_step(); BRepAlgoAPI_Common intersector(*from_shape, *tool_shape); - TopoDS_Shape common_shape = intersector.Shape(); - check_operation(common_shape, from_shape, is_volume[i], has_changed, + TopTools_ListOfShape shapes; + shapes.Assign(intersector.Modified(*tool_shape)); + if (shapes.IsEmpty()) + { + PRINT_INFO("The %d body did not have common part with the tool_body.\n", i+1); + continue; + } + if ( shapes.Extent() > 1) + { + PRINT_ERROR("Tool has multiple intersection with the shape, make it simpler. \n"); + continue; + } + TopoDS_Shape common_shape = shapes.First(); + if (is_volume[i] == CUBIT_TRUE && + (common_shape.TShape()->ShapeType() == TopAbs_SHELL || + common_shape.TShape()->ShapeType() == TopAbs_FACE || + common_shape.TShape()->ShapeType() == TopAbs_EDGE || + common_shape.TShape()->ShapeType() == TopAbs_VERTEX)) + { + has_changed = CUBIT_TRUE; + *from_shape = common_shape; + } + else if(is_volume[i] == CUBIT_FALSE && + (common_shape.TShape()->ShapeType() == TopAbs_EDGE || + common_shape.TShape()->ShapeType() == TopAbs_VERTEX)) + { + has_changed = CUBIT_TRUE; + *from_shape = common_shape; + } + else + check_operation(common_shape, from_shape, is_volume[i], has_changed, &intersector, keep_old); if(from_shape->IsNull() )

1 0