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

r4305 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 30 Nov '10

30 Nov '10

Author: janehu Date: 2010-11-30 08:45:38 -0600 (Tue, 30 Nov 2010) New Revision: 4305 Modified: cgm/trunk/test/modify.cpp Log: Error message re-managing according to code changes in OCC. Modified: cgm/trunk/test/modify.cpp =================================================================== --- cgm/trunk/test/modify.cpp 2010-11-30 14:43:59 UTC (rev 4304) +++ cgm/trunk/test/modify.cpp 2010-11-30 14:45:38 UTC (rev 4305) @@ -56,7 +56,7 @@ PRINT_INFO("Operation Failed"); int ret_val = ( CubitMessage::instance()->error_count() ); - if ( ret_val != 9 ) + if ( ret_val != 7 ) { PRINT_ERROR("Errors found during Mergechk session.\n"); } @@ -128,8 +128,7 @@ if(max-11. < 0.000001 && max-11. > -0.000001 && min-11. < 0.000001 && min-11. > -0.000001) test_ref_faces2.append(test_ref_faces.get()); - else - test_ref_faces.step(); + test_ref_faces.step(); } sweep_direction.set(0,0,-6); all_bodies.clean_out(); @@ -576,15 +575,6 @@ new_bodies.clean_out(); face_list.clean_out(); - cp_from_body2->ref_faces(face_list); - for(int i = 0; i < size; i++) - { - CubitVector v = face_list.get()->center_point(); - if(!v.about_equal(vv)) - face_list.remove(); - else - face_list.step(); - } //imprint a point on an edge, split it CubitVector pp1(10,1,8); @@ -601,6 +591,16 @@ n = new_bodies.get()->num_ref_edges();//n = 17 assert( n == 17); + + new_bodies.get()->ref_faces(face_list); + for(int i = 0; i < size; i++) + { + CubitVector v = face_list.get()->center_point(); + if(!v.about_equal(vv)) + face_list.remove(); + else

1 0

r4304 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 30 Nov '10

30 Nov '10

Author: janehu Date: 2010-11-30 08:43:59 -0600 (Tue, 30 Nov 2010) New Revision: 4304 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp Log: Fixed tolerance issue on hexlat2 & 3 for not imprinting edges, and some minor issue with error message managing. Passed all tests. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-11-29 22:02:51 UTC (rev 4303) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-11-30 14:43:59 UTC (rev 4304) @@ -2418,7 +2418,15 @@ CubitBox aBox_e(min, max); aBox_face.Get( min[0], min[1], min[2], max[0], max[1], max[2]); CubitBox aBox_f(min, max); - if (aBox_e <= aBox_f) + //hexlat3 has tolerance issue where aBox_e.x_min is within + //tolerance and greater than aBox_f.x_min, coursing no edge + //imprint of the faces. change to add consideration of tolerance + if (aBox_e.min_x() >= aBox_f.min_x() - TOL && + aBox_e.min_y() >= aBox_f.min_y() - TOL && + aBox_e.min_z() >= aBox_f.min_z() - TOL && + aBox_e.max_x() <= aBox_f.max_x() + TOL && + aBox_e.max_y() <= aBox_f.max_y() + TOL && + aBox_e.max_z() <= aBox_f.max_z() + TOL) { Curve* curve = OCCQueryEngine::instance()->populate_topology_bridge(edge); curve_list.append(curve); @@ -3755,8 +3763,8 @@ new_bodies.append(bodysm); } - if(tbs.size() == 0) - stat = CUBIT_FAILURE; + //if(tbs.size() == 0) + // stat = CUBIT_FAILURE; //ok, we're done with all cuts, delete unnecessaries. if(!keep_old) Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2010-11-29 22:02:51 UTC (rev 4303) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2010-11-30 14:43:59 UTC (rev 4304) @@ -2412,26 +2412,26 @@ TopoDS_Shape* shape = occ_body->get_TopoDS_Shape(); - if (!shape || shape->IsNull()) - return CUBIT_SUCCESS; + if (shape && !shape->IsNull()) + { + //remove the entry from label tree + OCCAttribSet::remove_attribute(*shape) ; - //remove the entry from label tree - OCCAttribSet::remove_attribute(*shape) ; + //remove the entry from the map

1 0

r4259 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 10 Nov '10

10 Nov '10

Author: janehu Date: 2010-11-10 11:52:44 -0600 (Wed, 10 Nov 2010) New Revision: 4259 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp Log: Fix for mcnp2cad/tests/hexlat. The qualified points could be more than 2, so change to use a DLIList instead of using an array of two. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-11-09 21:38:43 UTC (rev 4258) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2010-11-10 17:52:44 UTC (rev 4259) @@ -2704,7 +2704,7 @@ gp_Pnt pt1(0,0,0), pt2(0,0,0); gp_Pnt intsec_pnt[2] = {pt1, pt2} ; - for(int j = 0; j < edge_list->size(); j++) + for(int kk = 0; kk < edge_list->size(); kk++) { TopoDS_Edge* edge = edge_list->get_and_step(); BRepAdaptor_Curve acurve(*edge); @@ -2720,7 +2720,9 @@ double lower_bound2 = acurve2.FirstParameter(); double upper_bound2 = acurve2.LastParameter(); BRepExtrema_DistShapeShape distShapeShape(*edge, from_edge); - CubitBoolean qualified[2] = {CUBIT_FALSE, CUBIT_FALSE}; + DLIList<CubitBoolean> qualified; + //CubitBoolean qualified[2] = {CUBIT_FALSE, CUBIT_FALSE}; + if (distShapeShape.IsDone() && distShapeShape.Value() < TOL) { newP[0] = distShapeShape.PointOnShape1(1); @@ -2737,7 +2739,7 @@ if ((newVal[j]-lower_bound) >= -TOL && (upper_bound - newVal[j]) >= -TOL) { - qualified[j] = CUBIT_TRUE; + qualified.append(CUBIT_TRUE); break; } } @@ -2746,9 +2748,9 @@ } for(int j = 0; j < distShapeShape.NbSolution(); j++) { - if (qualified[j]) + if (qualified.get()) { - qualified[j] = CUBIT_FALSE; + qualified.change_to( CUBIT_FALSE ); Extrema_ExtPC ext(newP[j], acurve2, Precision::Approximation()); double newVal; if (ext.IsDone() && (ext.NbExt() > 0)) { @@ -2758,17 +2760,18 @@ if ((newVal-lower_bound2) >= -TOL && (upper_bound2 - newVal) >= -TOL) { - qualified[j] = CUBIT_TRUE; + qualified.change_to( CUBIT_TRUE);

1 0

r4256 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 09 Nov '10

09 Nov '10

Author: janehu Date: 2010-11-09 10:34:38 -0600 (Tue, 09 Nov 2010) New Revision: 4256 Modified: cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCBody.hpp cgm/trunk/geom/OCC/OCCCurve.cpp cgm/trunk/geom/OCC/OCCCurve.hpp cgm/trunk/geom/OCC/OCCLump.cpp cgm/trunk/geom/OCC/OCCLump.hpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCPoint.cpp cgm/trunk/geom/OCC/OCCPoint.hpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCSurface.cpp cgm/trunk/geom/OCC/OCCSurface.hpp Log: Changed attributes on single lump body to be held within body, when exporting, append it to its lump and when importing, add back to body. Should work the same way as CGM with ACIS. Fixed some momory leaking problems. All testcases passed under make check. Modified: cgm/trunk/geom/OCC/OCCBody.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCBody.cpp 2010-11-08 17:20:37 UTC (rev 4255) +++ cgm/trunk/geom/OCC/OCCBody.cpp 2010-11-09 16:34:38 UTC (rev 4256) @@ -35,6 +35,7 @@ #include "OCCShell.hpp" #include "OCCLump.hpp" #include "OCCModifyEngine.hpp" +#include "OCCAttribSet.hpp" #include <TopExp.hxx> #include <TopTools_IndexedMapOfShape.hxx> @@ -194,23 +195,12 @@ OCCAttribSet::append_attribute(csa, *myTopoDSShape); return; } - int i = 0; - for (i; i < mySheetSurfaces.size();i++) - { - TopoDS_Face * face = mySheetSurfaces.get_and_step()->get_TopoDS_Face(); - OCCAttribSet::append_attribute(csa, *face); - } - for(i = 0; i < myShells.size(); i++) - { - TopoDS_Shell* shell = myShells.get_and_step()->get_TopoDS_Shell(); - OCCAttribSet::append_attribute(csa, *shell); - } - for(i = 0; i < myLumps.size(); i++) - { - OCCLump* lump = CAST_TO(myLumps.get_and_step(), OCCLump); - TopoDS_Solid* solid = lump->get_TopoDS_Solid(); - OCCAttribSet::append_attribute(csa, *solid); - } + DLIList<CubitString*> *string_list = csa->string_data_list(); + DLIList<double*> *doubles = csa->double_data_list(); + DLIList<int*> *ints = csa->int_data_list(); + CubitSimpleAttrib* csa_new = new CubitSimpleAttrib; + csa_new->initialize_from_lists_of_ptrs(string_list, doubles, ints); + csa_list.append_unique(csa_new); } void OCCBody::remove_simple_attribute_virt(CubitSimpleAttrib *csa) @@ -220,74 +210,50 @@ OCCAttribSet::remove_attribute(csa, *myTopoDSShape); return; } - for(int i = 0; i < myShells.size(); i++) + + if (csa == NULL) { - TopoDS_Shell* shell = myShells.get_and_step()->get_TopoDS_Shell();

1 0