November 2011 - cgma-dev - mailman3.cels.anl.gov

r5227 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 28 Nov '11

28 Nov '11

Author: janehu Date: 2011-11-28 10:11:43 -0600 (Mon, 28 Nov 2011) New Revision: 5227 Removed: cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5132 cgm/trunk/geom/OCC/OCCModifyEngine.hpp_5162 cgm/trunk/geom/OCC/OCCQueryEngine.cpp_5066 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Not intended to check in OCCModifyEngine.cpp yet. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-11-28 16:08:27 UTC (rev 5226) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-11-28 16:11:43 UTC (rev 5227) @@ -2447,7 +2447,6 @@ if (common_curves.size() >= 1) sort_successful = sort_curves(common_curves, temp_edge_lists); -/* if ( common_curves.size() > 2 && (type == CONE_SURFACE_TYPE || type == SPHERE_SURFACE_TYPE || type == TORUS_SURFACE_TYPE ||type == UNDEFINED_SURFACE_TYPE)) @@ -2483,7 +2482,7 @@ //http://www.opencascade.org/org/forum/thread_20672/ for more info } } -*/ + list_of_edges.Clear(); if (common_curves.size() >= 1) { Deleted: cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 2011-11-28 16:08:27 UTC (rev 5226) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 2011-11-28 16:11:43 UTC (rev 5227) @@ -1,9116 +0,0 @@ -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- - -// Filename : OCCModifyEngine.cpp -// -// Purpose : ModifyEngine for OCC geometry -// -// Special Notes : Modeled after GeometryModifyEngine and AcisModifyEngine. -// -// Author : Jane Hu -// -// Creation Date : 1/08 -// -//------------------------------------------------------------------------- -#include "gp_Pnt.hxx" -#include "gp_Ax2.hxx" -#include "gp_Dir.hxx" -#include "gp_Hypr.hxx" -#include "gp_Parab.hxx" -#include "gp_Elips.hxx" -#include "gp_Pln.hxx" -#include "gp_Circ.hxx" -#include "gp_Cylinder.hxx" -#include "gp_Cone.hxx"

1 0

r5226 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 28 Nov '11

28 Nov '11

Author: janehu Date: 2011-11-28 10:08:27 -0600 (Mon, 28 Nov 2011) New Revision: 5226 Added: cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5132 cgm/trunk/geom/OCC/OCCModifyEngine.hpp_5162 cgm/trunk/geom/OCC/OCCQueryEngine.cpp_5066 cgm/trunk/geom/OCC/occ_patches_6.5.1 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Added the patch file for opencascade6.5.1. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-11-27 23:29:02 UTC (rev 5225) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-11-28 16:08:27 UTC (rev 5226) @@ -2447,6 +2447,7 @@ if (common_curves.size() >= 1) sort_successful = sort_curves(common_curves, temp_edge_lists); +/* if ( common_curves.size() > 2 && (type == CONE_SURFACE_TYPE || type == SPHERE_SURFACE_TYPE || type == TORUS_SURFACE_TYPE ||type == UNDEFINED_SURFACE_TYPE)) @@ -2482,7 +2483,7 @@ //http://www.opencascade.org/org/forum/thread_20672/ for more info } } - +*/ list_of_edges.Clear(); if (common_curves.size() >= 1) { Copied: cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 (from rev 5066, cgm/trunk/geom/OCC/OCCModifyEngine.cpp) =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 (rev 0) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp_5066 2011-11-28 16:08:27 UTC (rev 5226) @@ -0,0 +1,9116 @@ +//------------------------------------------------------------------------- +//------------------------------------------------------------------------- + +// Filename : OCCModifyEngine.cpp +// +// Purpose : ModifyEngine for OCC geometry +// +// Special Notes : Modeled after GeometryModifyEngine and AcisModifyEngine. +// +// Author : Jane Hu +// +// Creation Date : 1/08 +// +//------------------------------------------------------------------------- +#include "gp_Pnt.hxx" +#include "gp_Ax2.hxx" +#include "gp_Dir.hxx" +#include "gp_Hypr.hxx" +#include "gp_Parab.hxx" +#include "gp_Elips.hxx" +#include "gp_Pln.hxx" +#include "gp_Circ.hxx" +#include "gp_Cylinder.hxx" +#include "gp_Cone.hxx"

1 0

r5224 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 23 Nov '11

23 Nov '11

Author: janehu Date: 2011-11-23 10:47:25 -0600 (Wed, 23 Nov 2011) New Revision: 5224 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Fixed hexlat hexlat2 in mcnp2cad, so currently out of 47 testcases, 35 are working and 12 are still failing. passed make check in cgm. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-11-22 22:56:17 UTC (rev 5223) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-11-23 16:47:25 UTC (rev 5224) @@ -2408,7 +2408,7 @@ int i = OCCQueryEngine::instance()->OCCMap->Find(from_face); face = (OCCSurface*)(OCCQueryEngine::instance()->OccToCGM->find(i))->second; } - else + if (face == NULL) { face_created = CUBIT_TRUE; face = OCCQueryEngine::instance()->populate_topology_bridge(from_face); @@ -2804,7 +2804,8 @@ } edge_list->clean_out(); delete edge_list; - if(!periodic || count_intersection == 2) + if(!periodic || count_intersection == 2 || + type == PLANE_SURFACE_TYPE) { splitor.Add(myWire.Wire(),from_face); topo_changed = CUBIT_TRUE;

1 0

r5220 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 18 Nov '11

18 Nov '11

Author: janehu Date: 2011-11-18 12:47:06 -0600 (Fri, 18 Nov 2011) New Revision: 5220 Added: cgm/trunk/test/modify.cpp_5163 cgm/trunk/test/r_w.cpp_4775 cgm/trunk/test/subtract.cpp_5170 Modified: cgm/trunk/test/modify.cpp cgm/trunk/test/r_w.cpp cgm/trunk/test/subtract.cpp Log: Updated for code changes in version5219 Modified: cgm/trunk/test/modify.cpp =================================================================== --- cgm/trunk/test/modify.cpp 2011-11-18 18:37:42 UTC (rev 5219) +++ cgm/trunk/test/modify.cpp 2011-11-18 18:47:06 UTC (rev 5220) @@ -796,7 +796,7 @@ assert(free_entities.size() == 0); from_body = gmti->brick(4, 4, 4); - CubitVector v_move9(2,3,2); + CubitVector v_move9(2,5,2); gti->translate(from_body,v_move9); ref_faces.clean_out(); from_body->ref_faces(ref_faces); Copied: cgm/trunk/test/modify.cpp_5163 (from rev 5163, cgm/trunk/test/modify.cpp) =================================================================== --- cgm/trunk/test/modify.cpp_5163 (rev 0) +++ cgm/trunk/test/modify.cpp_5163 2011-11-18 18:47:06 UTC (rev 5220) @@ -0,0 +1,1381 @@ +/** + * \file makept.cpp + * + * \brief makept, another simple C++ driver for CGM + * + * This program acts as a simple driver for CGM. It reads in a geometry, + * and performs varies checks for bodies, surfaces, curves and vertices. + */ + +#undef NDEBUG +#include <cassert> + +#include "GeometryModifyTool.hpp" +#include "GeometryQueryTool.hpp" +#include "OCCQueryEngine.hpp" +#include "CubitMessage.hpp" +#include "Body.hpp" +#include "RefVolume.hpp" +#include "RefFace.hpp" +#include "RefEdge.hpp" +#include "RefVertex.hpp" +#include "CastTo.hpp" +#include "OCCModifyEngine.hpp" +#include "OCCLump.hpp" +#include "OCCBody.hpp" +#include "OCCSurface.hpp" +#include "OCCCurve.hpp" +#include "OCCShell.hpp" +#include "TopoDS_Shape.hxx" +#include "InitCGMA.cpp" +#include "CubitCompat.hpp" +

1 0

r5219 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 18 Nov '11

18 Nov '11

Author: janehu Date: 2011-11-18 12:37:42 -0600 (Fri, 18 Nov 2011) New Revision: 5219 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCModifyEngine.hpp Log: Fixed the mcnp2cad/cone, cone2, cone3 cases, it passed cgm make check, rgg/assygen 7 is still working at speed 9.9 min now. Since it introduces boolean operation for imprint, it's pending for Tim's approval for possible body pointer changes. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2011-11-17 00:32:00 UTC (rev 5218) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2011-11-18 18:37:42 UTC (rev 5219) @@ -554,9 +554,28 @@ //set the Shells TopTools_IndexedMapOfShape M; TopExp::MapShapes(old_shape, TopAbs_SOLID, M); + TopTools_IndexedMapOfShape M_new; + TopExp::MapShapes(new_shape, TopAbs_SOLID, M_new); TopTools_ListOfShape shapes; TopoDS_Shape shape; + 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()) + { + //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 + // supposed to be kept. + updated = CUBIT_TRUE; + OCCQueryEngine::instance()->update_OCC_map(old_shape, new_shape); + } + + DLIList<int> new_solid_nums; + DLIList<int> unfound_nums; for(int ii=1; ii<=M.Extent(); ii++) { TopoDS_Solid solid = TopoDS::Solid(M(ii)); @@ -588,10 +607,38 @@ } else if(op->IsDeleted(solid)) { - TopTools_IndexedMapOfShape M_new; - TopExp::MapShapes(new_shape, TopAbs_SOLID, M_new); if (M_new.Extent()== 1) shape = M_new(1); + else if(M_new.Extent() > 1) + { + GProp_GProps myProps; + BRepGProp::VolumeProperties(solid, myProps); + double bf_mass = myProps.Mass(); + gp_Pnt old_center = myProps.CentreOfMass(); + CubitBoolean found = CUBIT_FALSE; + for(int l = 1; l <= M_new.Extent(); l++) + { + BRepGProp::VolumeProperties(M_new(l), myProps);

1 0

r5210 - in cgm/branches: . dispatch
by jvporter＠wisc.edu 11 Nov '11

11 Nov '11

Author: jvporter Date: 2011-11-11 14:08:56 -0600 (Fri, 11 Nov 2011) New Revision: 5210 Added: cgm/branches/dispatch/ Log: Create a branch to test out dynamic dispatching Property changes on: cgm/branches/dispatch ___________________________________________________________________ Added: svn:ignore + configure Makefile.in Makefile depcomp libtool config.guess config.sub config.log config.status config.lt ltmain.sh config.h.in config.h autom4te.cache missing install-sh aclocal.m4 stamp-* cgm.make Added: svn:mergeinfo + /cgm/branches/cubit:1041-3427 /cgm/branches/merge-cubit12:3424-4774

1 0

buildbot failure in cgm-shared: failed configure
by cgma-dev＠mcs.anl.gov 09 Nov '11

09 Nov '11

1 0

buildbot failure in cgm-distcheck: failed configure
by cgma-dev＠mcs.anl.gov 09 Nov '11

09 Nov '11

1 0

buildbot failure in cgm-cubit: failed configure
by cgma-dev＠mcs.anl.gov 09 Nov '11

09 Nov '11

1 0