June 2012 - cgma-dev - mailman3.cels.anl.gov

Re: [cgma-dev] CGMA with ACIS
by Jane Hu 18 Jun '12

18 Jun '12

Hi, Eliza: I think you are right, CGMA I think is compatible with Acis19 and under, Cubit is compatible with Acis19 too. CGMA currently doesn't maintain the interface to Acis, Cubit is maintaining it. Hope it helps. Jane On Sun, Jun 17, 2012 at 9:29 PM, peng peng <eliza_zheng(a)126.com> wrote: > Hi > I wondered whether CGMA could be compiled with ACIS R21, because > the related header files and libraries of CGMA couldn't be found in ACIS > R21, what should I do? I have consulted with Spatial, they said old version > is not available now. Could you help me? > > Thanks. > > eliza > > > >

1 0

CGMA with ACIS
by peng peng 17 Jun '12

17 Jun '12

Hi I wondered whether CGMA could be compiled with ACIS R21, because the related header files and libraries of CGMA couldn't be found in ACIS R21, what should I do? I have consulted with Spatial, they said old version is not available now. Could you help me? Thanks. eliza

1 0

r5578 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 14 Jun '12

14 Jun '12

Author: janehu Date: 2012-06-14 13:10:19 -0500 (Thu, 14 Jun 2012) New Revision: 5578 Modified: cgm/trunk/geom/OCC/OCCBody.cpp Log: Recheck in the changes just made to avoid unnacessary warnings. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2012-06-14 18:04:19 UTC (rev 5577) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2012-06-14 18:10:19 UTC (rev 5578) @@ -85,7 +85,7 @@ assert(myTopoDSShape->ShapeType() == TopAbs_COMPOUND); return myTopoDSShape; } - return 0; + return (TopoDS_Compound*)NULL; } void OCCBody::get_TopoDS_Shape(TopoDS_Shape *& shape)

1 0

r5577 - cgm/branches/merge-cubit13.1/geom/OCC
by jiangtao_ma＠yahoo.com 14 Jun '12

14 Jun '12

Author: janehu Date: 2012-06-14 13:04:19 -0500 (Thu, 14 Jun 2012) New Revision: 5577 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp Log: Fix the Mac problems for testcases, thanks to Rajeev. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-06-14 17:55:25 UTC (rev 5576) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-06-14 18:04:19 UTC (rev 5577) @@ -85,6 +85,7 @@ assert(myTopoDSShape->ShapeType() == TopAbs_COMPOUND); return myTopoDSShape; } + return (TopoDS_Compound*)NULL; } void OCCBody::get_TopoDS_Shape(TopoDS_Shape *& shape)

1 0

r5576 - cgm/trunk/geom/OCC
by jain＠mcs.anl.gov 14 Jun '12

14 Jun '12

Author: jain Date: 2012-06-14 12:55:25 -0500 (Thu, 14 Jun 2012) New Revision: 5576 Modified: cgm/trunk/geom/OCC/OCCBody.cpp Log: Fix testgeom_occ, subtract and other tests that were failing on MacOSX only, the fuction should have returned a value on all branches. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2012-06-14 15:37:03 UTC (rev 5575) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2012-06-14 17:55:25 UTC (rev 5576) @@ -85,6 +85,7 @@ assert(myTopoDSShape->ShapeType() == TopAbs_COMPOUND); return myTopoDSShape; } + return 0; } void OCCBody::get_TopoDS_Shape(TopoDS_Shape *& shape)

1 0

r5574 - cgm/branches/merge-cubit13.1/util
by jain＠mcs.anl.gov 14 Jun '12

14 Jun '12

Author: jain Date: 2012-06-14 10:27:09 -0500 (Thu, 14 Jun 2012) New Revision: 5574 Modified: cgm/branches/merge-cubit13.1/util/CubitDynamicLoader.hpp Log: Getting rid of 'error: extra ';' error message Modified: cgm/branches/merge-cubit13.1/util/CubitDynamicLoader.hpp =================================================================== --- cgm/branches/merge-cubit13.1/util/CubitDynamicLoader.hpp 2012-06-13 14:25:32 UTC (rev 5573) +++ cgm/branches/merge-cubit13.1/util/CubitDynamicLoader.hpp 2012-06-14 15:27:09 UTC (rev 5574) @@ -53,7 +53,7 @@ // handle to check for load failures extern CUBIT_UTIL_EXPORT LibraryHandle InvalidLibraryHandle; -}; +} #endif

1 0

r5573 - cgm/branches/merge-cubit13.1/geom/OCC
by jiangtao_ma＠yahoo.com 13 Jun '12

13 Jun '12

Author: janehu Date: 2012-06-13 09:25:32 -0500 (Wed, 13 Jun 2012) New Revision: 5573 Added: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp_5528 cgm/branches/merge-cubit13.1/geom/OCC/OCCSurface.cpp_5466 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCLump.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCQueryEngine.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCSurface.cpp Log: Fixed mcnp2cad failed cases, brings it to still 7 failed ones out of 47 cases. Added some logics when boolean operation yields a void entitiy as well as entity map updates for compound situation. Passed cgm make check. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-06-13 14:17:37 UTC (rev 5572) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCBody.cpp 2012-06-13 14:25:32 UTC (rev 5573) @@ -646,14 +646,17 @@ for(; it.More(); it.Next()) { shape = it.Value(); - OCCQueryEngine::instance()->copy_attributes(old_shape, shape); + OCCQueryEngine::instance()->copy_attributes(solid, shape); } shape = shapes.First(); } + else if(op->IsDeleted(solid)) { - if (M_new.Extent()== 1) + if (M_new.Extent()== 1 && ii == 1) shape = M_new(1); + else if(M_new.Extent()== 1 && ii > 1) + shape.Nullify(); else if(M_new.Extent() > 1) { GProp_GProps myProps; Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCLump.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCLump.cpp 2012-06-13 14:17:37 UTC (rev 5572) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCLump.cpp 2012-06-13 14:25:32 UTC (rev 5573) @@ -385,6 +385,15 @@ shapes.Assign(op->Generated(*get_TopoDS_Solid())); if(shapes.Extent() > 1) { + //update all attributes first. + TopTools_ListIteratorOfListOfShape it; + it.Initialize(shapes); + for(; it.More(); it.Next()) + { + shape = it.Value(); + OCCQueryEngine::instance()->copy_attributes(*get_TopoDS_Solid(), + shape); + } shape = shapes.First(); } else if (shapes.Extent() == 1) @@ -475,6 +484,14 @@ else if(shapes.Extent() > 1) { + //update all attributes first. + TopTools_ListIteratorOfListOfShape it;

1 0

r5569 - in cgm/trunk/geom: . Cholla facet facetbool
by jvporter＠wisc.edu 12 Jun '12

12 Jun '12

Author: jvporter Date: 2012-06-12 15:38:40 -0500 (Tue, 12 Jun 2012) New Revision: 5569 Modified: cgm/trunk/geom/Cholla/Cholla.cpp cgm/trunk/geom/Cholla/FacetDataUtil.cpp cgm/trunk/geom/Cholla/FacetEvalTool.cpp cgm/trunk/geom/SurfaceOverlapTool.cpp cgm/trunk/geom/facet/FacetQueryEngine.cpp cgm/trunk/geom/facetbool/FBIntersect.cpp Log: Fix more printf warnings Modified: cgm/trunk/geom/Cholla/Cholla.cpp =================================================================== --- cgm/trunk/geom/Cholla/Cholla.cpp 2012-06-12 19:54:25 UTC (rev 5568) +++ cgm/trunk/geom/Cholla/Cholla.cpp 2012-06-12 20:38:40 UTC (rev 5569) @@ -1901,11 +1901,11 @@ { int kk; for(kk=0; kk<3; kk++); - fprintf(fp, "(%d) %.6lf %.6lf %.6lf\n", edge_ptr->id(), P0.x(), P0.y(), P0.z()); - fprintf(fp, " %.6lf %.6lf %.6lf\n", Pi[0].x(), Pi[0].y(), Pi[0].z()); - fprintf(fp, " %.6lf %.6lf %.6lf\n", Pi[1].x(), Pi[1].y(), Pi[1].z()); - fprintf(fp, " %.6lf %.6lf %.6lf\n", Pi[2].x(), Pi[2].y(), Pi[2].z()); - fprintf(fp, " %.6lf %.6lf %.6lf\n", P1.x(), P1.y(), P1.z()); + fprintf(fp, "(%d) %.6f %.6f %.6f\n", edge_ptr->id(), P0.x(), P0.y(), P0.z()); + fprintf(fp, " %.6f %.6f %.6f\n", Pi[0].x(), Pi[0].y(), Pi[0].z()); + fprintf(fp, " %.6f %.6f %.6f\n", Pi[1].x(), Pi[1].y(), Pi[1].z()); + fprintf(fp, " %.6f %.6f %.6f\n", Pi[2].x(), Pi[2].y(), Pi[2].z()); + fprintf(fp, " %.6f %.6f %.6f\n", P1.x(), P1.y(), P1.z()); } edge_ptr->control_points( Pi, 4 ); } Modified: cgm/trunk/geom/Cholla/FacetDataUtil.cpp =================================================================== --- cgm/trunk/geom/Cholla/FacetDataUtil.cpp 2012-06-12 19:54:25 UTC (rev 5568) +++ cgm/trunk/geom/Cholla/FacetDataUtil.cpp 2012-06-12 20:38:40 UTC (rev 5569) @@ -1270,7 +1270,7 @@ { pt = point_list.get_and_step(); pt->set_id(ii); - fprintf(fp, "%d %lf %lf %lf\n", ii, pt->x(), pt->y(), pt->z() ); + fprintf(fp, "%d %f %f %f\n", ii, pt->x(), pt->y(), pt->z() ); } CubitFacet *facet; @@ -1800,7 +1800,7 @@ CubitVector loc_on_edge; CubitBoolean is_on_edge; double dist = edge->dist_to_edge(pt->coordinates(), loc_on_edge, is_on_edge); - PRINT_INFO("edge %d dist = %lf is_on_edge = %d\n", edge->id(), dist, is_on_edge); + PRINT_INFO("edge %d dist = %f is_on_edge = %d\n", edge->id(), dist, is_on_edge); } dview(); pt = pt; Modified: cgm/trunk/geom/Cholla/FacetEvalTool.cpp =================================================================== --- cgm/trunk/geom/Cholla/FacetEvalTool.cpp 2012-06-12 19:54:25 UTC (rev 5568) +++ cgm/trunk/geom/Cholla/FacetEvalTool.cpp 2012-06-12 20:38:40 UTC (rev 5569) @@ -2308,7 +2308,7 @@ if (normal_ptr) {

1 0

r5568 - cgm/trunk/geom/virtual
by jvporter＠wisc.edu 12 Jun '12

12 Jun '12

Author: jvporter Date: 2012-06-12 14:54:25 -0500 (Tue, 12 Jun 2012) New Revision: 5568 Modified: cgm/trunk/geom/virtual/CompositeCurve.cpp cgm/trunk/geom/virtual/CompositePoint.cpp cgm/trunk/geom/virtual/CompositeSurface.cpp cgm/trunk/geom/virtual/PartitionSurface.cpp Log: Fix constructor initialization order Modified: cgm/trunk/geom/virtual/CompositeCurve.cpp =================================================================== --- cgm/trunk/geom/virtual/CompositeCurve.cpp 2012-06-12 19:34:03 UTC (rev 5567) +++ cgm/trunk/geom/virtual/CompositeCurve.cpp 2012-06-12 19:54:25 UTC (rev 5568) @@ -32,14 +32,8 @@ // Creation Date : 12/19/01 //------------------------------------------------------------------------- CompositeCurve::CompositeCurve( Curve* curve ) - : hiddenSet(0), - firstCoEdge(0), - startPoint(0), - endPoint(0), - startNext(0), - endNext(0), - stitchNext(0), - HadBridgeRemoved(0) + : HadBridgeRemoved(0), hiddenSet(0), firstCoEdge(0), startPoint(0), + endPoint(0), startNext(0), endNext(0), stitchNext(0) { compGeom = new CompositeGeom(1); compGeom->append( curve, CUBIT_FORWARD ); @@ -49,15 +43,8 @@ } CompositeCurve::CompositeCurve( CompositeGeom* geometry ) - : compGeom( geometry ), - hiddenSet( 0 ), - firstCoEdge( 0 ), - startPoint( 0 ), - endPoint( 0 ), - startNext( 0 ), - endNext( 0 ), - stitchNext(0), - HadBridgeRemoved(0) + : HadBridgeRemoved(0), compGeom(geometry), hiddenSet(0), firstCoEdge(0), + startPoint(0), endPoint(0), startNext(0), endNext(0), stitchNext(0) { for( int i = 0; i < compGeom->num_entities(); i++ ) { @@ -77,14 +64,8 @@ // Creation Date : 02/27/04 //------------------------------------------------------------------------- CompositeCurve::CompositeCurve( CompositePoint* point ) - : hiddenSet(0), - firstCoEdge(0), - startPoint(0), - endPoint(0), - startNext(0), - endNext(0), - stitchNext(0), - HadBridgeRemoved(0)

1 0

r5567 - cgm/trunk/geom
by jvporter＠wisc.edu 12 Jun '12

12 Jun '12

Author: jvporter Date: 2012-06-12 14:34:03 -0500 (Tue, 12 Jun 2012) New Revision: 5567 Modified: cgm/trunk/geom/CAEntityId.cpp cgm/trunk/geom/GeomMeasureTool.cpp cgm/trunk/geom/GeometryQueryTool.cpp Log: Remove some more warnings Modified: cgm/trunk/geom/CAEntityId.cpp =================================================================== --- cgm/trunk/geom/CAEntityId.cpp 2012-06-12 18:48:25 UTC (rev 5566) +++ cgm/trunk/geom/CAEntityId.cpp 2012-06-12 19:34:03 UTC (rev 5567) @@ -63,9 +63,11 @@ DLIList<double*> *d_list = csa_ptr->double_data_list(); if (d_list && d_list->size() > 0) { +#ifndef NDEBUG RefEdge *edge = CAST_TO(new_attrib_owner, RefEdge); assert(d_list->size() == 3 && edge && edge->start_vertex() == edge->end_vertex()); +#endif d_list->reset(); boundingXYZ = new CubitVector(*d_list->get_and_step(), *d_list->get_and_step(), Modified: cgm/trunk/geom/GeomMeasureTool.cpp =================================================================== --- cgm/trunk/geom/GeomMeasureTool.cpp 2012-06-12 18:48:25 UTC (rev 5566) +++ cgm/trunk/geom/GeomMeasureTool.cpp 2012-06-12 19:34:03 UTC (rev 5567) @@ -1899,7 +1899,6 @@ DLIList <RefFace*> &surfs_with_narrow_regions) { int j; - double tol_sq = tol*tol; int ii, jj; DLIList <RefFace*> ref_faces, temp_faces; @@ -1991,7 +1990,6 @@ int num_incs = (int)(edge_length/small_curve_size) + 1; double start, end; cur_edge->get_param_range(start, end); - double dt = small_curve_size*((end-start)/edge_length); double t = start; bool one_bad = false; for(j=0; j<num_incs && ret == true; j++) @@ -2268,8 +2266,6 @@ { int ret = 0; double tol_sq = tol*tol; - double small_step = 5.0*tol; - double small_step_sq = small_step*small_step; double max_dist_sq = 0.0; RefVertex *e1_start_vert = e1->start_vertex(); RefVertex *e1_end_vert = e1->end_vertex(); @@ -2474,8 +2470,6 @@ e2_vert_list.reset(); for(i=e1_pos_list.size(); i--;) { - CubitVector *e1_pos = e1_pos_list.get_and_step();

1 0