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

Re: [cgma-dev] r5066 - cgm/trunk/geom/OCC
by Rajeev Jain 21 Jul '11

21 Jul '11

Thanks, Jane. Rajeev >________________________________ >From: "jiangtao_ma(a)yahoo.com" <jiangtao_ma(a)yahoo.com> >To: cgma-dev(a)mcs.anl.gov >Sent: Thursday, July 21, 2011 11:18 AM >Subject: [cgma-dev] r5066 - cgm/trunk/geom/OCC > >Author: janehu >Date: 2011-07-21 11:18:05 -0500 (Thu, 21 Jul 2011) >New Revision: 5066 > >Modified: > cgm/trunk/geom/OCC/OCCModifyEngine.cpp > cgm/trunk/geom/OCC/OCCQueryEngine.cpp > cgm/trunk/geom/OCC/OCCQueryEngine.hpp >Log: >Changed unite function to correctly check bounding box intersection, and supporting other code change. Improved rgg/assygen for 7.inp from 3173s to 104 seconds. Passed make check for cgm. > >Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp >=================================================================== >--- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-07-19 17:57:32 UTC (rev 5065) >+++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-07-21 16:18:05 UTC (rev 5066) >@@ -2195,6 +2195,7 @@ > //indicate if there's more faces to be imprinted > CubitBoolean more_face = CUBIT_TRUE; > DLIList<TopoDS_Face*> list_for_delete; >+ CubitBoolean face_created = CUBIT_FALSE; > > //list of face on from_shape that has been imprinted > DLIList<TopoDS_Face*> from_faces; >@@ -2409,7 +2410,10 @@ > face = (OCCSurface*)(OCCQueryEngine::instance()->OccToCGM->find(i))->second; > } > else >+ { >+ face_created = CUBIT_TRUE; > face = OCCQueryEngine::instance()->populate_topology_bridge(from_face); >+ } > OCCSurface* occ_face = CAST_TO(face, OCCSurface); > > DLIList<Curve*> common_curves; >@@ -2494,6 +2498,7 @@ > > CubitVector point_on_surf; > occ_face->closest_point_trimmed(p, point_on_surf); >+ > if(p.distance_between(point_on_surf) > TOL) //edge not on from_face > { > skipped = CUBIT_TRUE; >@@ -2553,7 +2558,7 @@ > added = CUBIT_TRUE; > curve_list.append(curve); > } >- } >+ } > if(added) > { > topo_changed = CUBIT_TRUE; >@@ -2591,7 +2596,12 @@ > } > } > } >- >+ >+ if(face_created) >+ { >+ OCCQueryEngine::instance()->delete_solid_model_entities(occ_face); >+ face_created = CUBIT_FALSE; >+ } > > >

1 0

r5067 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 21 Jul '11

21 Jul '11

Author: janehu Date: 2011-07-21 11:19:03 -0500 (Thu, 21 Jul 2011) New Revision: 5067 Modified: cgm/trunk/test/makept.cpp Log: minor change due to change in unite funtion operation order. Modified: cgm/trunk/test/makept.cpp =================================================================== --- cgm/trunk/test/makept.cpp 2011-07-21 16:18:05 UTC (rev 5066) +++ cgm/trunk/test/makept.cpp 2011-07-21 16:19:03 UTC (rev 5067) @@ -670,8 +670,8 @@ // ARC_CURVE_TYPE box = curve-> bounding_box(); - min.set(7.3329, 7.2333, 42.6377); - max.set(12.24717, 7.2927, 49.1317); + min.set(26.75282, 16.7499, 20.3036); + max.set(33.24717, 23.24399, 20.36297); assert(min.distance_between(box.minimum()) < 0.001 && max.distance_between(box.maximum()) < 0.001); // bounding box

1 0

r5066 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 21 Jul '11

21 Jul '11

Author: janehu Date: 2011-07-21 11:18:05 -0500 (Thu, 21 Jul 2011) New Revision: 5066 Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.hpp Log: Changed unite function to correctly check bounding box intersection, and supporting other code change. Improved rgg/assygen for 7.inp from 3173s to 104 seconds. Passed make check for cgm. Modified: cgm/trunk/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-07-19 17:57:32 UTC (rev 5065) +++ cgm/trunk/geom/OCC/OCCModifyEngine.cpp 2011-07-21 16:18:05 UTC (rev 5066) @@ -2195,6 +2195,7 @@ //indicate if there's more faces to be imprinted CubitBoolean more_face = CUBIT_TRUE; DLIList<TopoDS_Face*> list_for_delete; + CubitBoolean face_created = CUBIT_FALSE; //list of face on from_shape that has been imprinted DLIList<TopoDS_Face*> from_faces; @@ -2409,7 +2410,10 @@ face = (OCCSurface*)(OCCQueryEngine::instance()->OccToCGM->find(i))->second; } else + { + face_created = CUBIT_TRUE; face = OCCQueryEngine::instance()->populate_topology_bridge(from_face); + } OCCSurface* occ_face = CAST_TO(face, OCCSurface); DLIList<Curve*> common_curves; @@ -2494,6 +2498,7 @@ CubitVector point_on_surf; occ_face->closest_point_trimmed(p, point_on_surf); + if(p.distance_between(point_on_surf) > TOL) //edge not on from_face { skipped = CUBIT_TRUE; @@ -2553,7 +2558,7 @@ added = CUBIT_TRUE; curve_list.append(curve); } - } + } if(added) { topo_changed = CUBIT_TRUE; @@ -2591,7 +2596,12 @@ } } } - + + if(face_created) + { + OCCQueryEngine::instance()->delete_solid_model_entities(occ_face); + face_created = CUBIT_FALSE; + }

1 0

Fwd: tests on stp geometry in cgm
by Hong-Jun Kim 19 Jul '11

19 Jul '11

Hi, Jane As iulian mentioned from the following e-mail, I suspect there are some problems to get sense of edges respect to the parent face geometry in OCC kernel. When "iGeom_getEgFcSense" function is called, I think it should return a sense of edge respect to the face edge loop, but it returns wrong results for some edges. I am making a test code to check this problem, but in the mean time, can I check if I think wrong or get any comments about it from you? Thanks. ----------------------------- Hong-Jun Kim Post-doc researcher MCS, Argonne National Laboratory 9700 S. Cass Ave. B240/R2147 Argonne, IL 60439 630-252-4791 hongjun(a)mcs.anl.gov ----------------------------- ----- Forwarded Message ----- > From: "Iulian Grindeanu" <iulian(a)mcs.anl.gov> > To: "jiangtao ma" <jiangtao_ma(a)yahoo.com> > Cc: "Tim Tautges" <tautges(a)mcs.anl.gov>, "Hong-Jun Kim" <hongjun(a)mcs.anl.gov> > Sent: Saturday, March 19, 2011 4:52:38 PM > Subject: tests on stp geometry in cgm > Hi Jane, > There are some problems with the orientation of faces and edges in > some stp models. > To show them, I am using a test in itaps folder in cgm > Please find attached testorient.cc, Makefile.am, brick.stp and > simpletet.stp > You should save them to a working version of cgm with occ, in > cgm/itaps folder. > > There, run first make check > > this should pass > > Then, run > testorient_occ brick.stp > and > testorient_occ simpletet.stp > > these will not pass > > The test is checking if the normal to a face corresponds to > orientation of each edge within the face. > (if you go along a boundary edge, in the sense of the edge with > respect to the face, and normal to the > face is pointing up, the interior of the face should be to the left) > > For that, it is evaluating the middle of each edge, the normal to the > face at that point, the tangent to the edge; > a vector pointing to the interior is computed, and a point at a small > distance on that vector is projected to the face. > It should be close to the surface; > > For simpletet.stp, it uncovered another possible error. There, the > first 2 of those points computed are outside the face, but they are > reported inside, because the projection distance is 0 (the faces here > are all planar) > > > I introduced another method in our camal drivers, which is trying to > overcome this orientation problem. If this orientation can be > corrected in cgm/occ, we can simplify the camal drivers. > > Thanks, > Iulian

1 0

r5061 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 15 Jul '11

15 Jul '11

Author: janehu Date: 2011-07-15 12:28:55 -0500 (Fri, 15 Jul 2011) New Revision: 5061 Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp Log: To avoid unnecessary binding of the TopoShape, directly set the new_shape in the Shape_Label_Map, fixed assygen failure problem in meshkit/rgg. Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2011-07-15 14:21:12 UTC (rev 5060) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2011-07-15 17:28:55 UTC (rev 5061) @@ -3594,8 +3594,14 @@ return -1; //update the attribute label tree - copy_attributes(old_shape, new_shape); - OCCAttribSet::remove_attribute(old_shape); + int current_id = OCCMap->Find(old_shape); + std::map<int, TDF_Label>::iterator it_lab = + Shape_Label_Map->find(current_id); + if(it_lab != Shape_Label_Map->end()) + { + TDF_Label aLabel = (*it_lab).second; + Handle_TDataXtd_Shape attr_shape = TDataXtd_Shape::Set(aLabel, new_shape); + } //update CGM-OCC map int k = OCCMap->Find(old_shape);

1 0

Re: [cgma-dev] r5052 - cgm/trunk/test
by Jane Hu 15 Jul '11

15 Jul '11

I see meshkit it built correctly with OCC6.5, but rgg/assygen test failed. I am now looking into it. Jane On Fri, Jul 15, 2011 at 9:31 AM, Jane Hu <janejhu(a)gmail.com> wrote: > Please do a reconfiguration on OCC6.5 build, I think your error is due to > makefile update issues. > > I also see some warning of "Generated a sliver surface", which when I look > closer, it's actually creating surfaces with negative area. I plan to look > into it recently. I think it related to surface's normal direction with > respect to loop direction problem. > > Jane > > > On Thu, Jul 14, 2011 at 6:11 PM, Hong-Jun Kim <hongjun(a)mcs.anl.gov> wrote: > >> Even though there are wrong loop direction returns in current OCC, it is >> working for parallel meshing with great import/export speed improvement with >> OCC6.3. (With OCC6.5, I have some errors with "make check") >> >> Thank you for your work and let me ask more questions about surface loop >> direction after checking something. >> >> ----------------------------- >> Hong-Jun Kim >> Post-doc researcher >> MCS, Argonne National Laboratory >> 9700 S. Cass Ave. B240/R2147 >> Argonne, IL 60439 >> 630-252-4791 >> hongjun(a)mcs.anl.gov >> ----------------------------- >> >> ----- Original Message ----- >> From: "Jane Hu" <janejhu(a)gmail.com> >> To: "Hong-Jun Kim" <hongjun(a)mcs.anl.gov> >> Cc: cgma-dev(a)mcs.anl.gov >> Sent: Thursday, July 14, 2011 12:03:27 PM >> Subject: Re: [cgma-dev] r5052 - cgm/trunk/test >> >> Hi, HongJun: >> >> With r5056 that I just checked in, it should work for your concern. Please >> double check that it works for your parallel work. >> >> Thanks. >> >> Jane >> >> >> >> >> On Tue, Jul 12, 2011 at 12:23 PM, Hong-Jun Kim < hongjun(a)mcs.anl.gov > >> wrote: >> >> >> This seems not checked if attributes are really restored after importing >> geometry again. >> I think entity ids have to be checked restored correctly. >> >> Hong-Jun >> >> >> >> >> >> ----- Original Message ----- >> From: "jiangtao ma" < jiangtao_ma(a)yahoo.com > >> To: cgma-dev(a)mcs.anl.gov >> Sent: Tuesday, July 12, 2011 11:55:15 AM >> Subject: [cgma-dev] r5052 - cgm/trunk/test >> >> Author: janehu >> Date: 2011-07-12 11:55:15 -0500 (Tue, 12 Jul 2011) >> New Revision: 5052 >> >> Modified: >> cgm/trunk/test/attribute_to_buffer.cpp >> cgm/trunk/test/attribute_to_file.cpp >> cgm/trunk/test/makept.cpp >> cgm/trunk/test/modify.cpp >> Log: >> Remove parallel test from attribute export tests; minor updates for modify >> and makept. >> >> Modified: cgm/trunk/test/attribute_to_buffer.cpp >> =================================================================== >> --- cgm/trunk/test/attribute_to_buffer.cpp 2011-07-11 20:23:21 UTC (rev >> 5051) >> +++ cgm/trunk/test/attribute_to_buffer.cpp 2011-07-12 16:55:15 UTC (rev >> 5052) >> @@ -4,10 +4,10 @@ >> #include "Body.hpp" >> #include "CGMApp.hpp" >> #include "CubitAttribManager.hpp" >> -#include "CADefines.hpp" >> -#include "TDParallel.hpp" >> -#include "CABodies.hpp" >> +#include "CAEntityId.hpp" >> >> +#include <iostream> >> +#include <string> >> #include <stdio.h> >> #include <stdlib.h> >> >> @@ -37,8 +37,8 @@ >> ASSERT(s); >> >> // actuate CA_BODIES attribute and turn on auto flag >> - CGMApp::instance()->attrib_manager()->register_attrib_type(CA_BODIES, >> "bodies", "BODIES", >> - CABodies_creator, CUBIT_TRUE, >> + CGMApp::instance()->attrib_manager()->register_attrib_type(CA_ENTITY_ID, >> "id", "ENTITY_ID", >> + CAEntityId_creator, CUBIT_TRUE, >> CUBIT_TRUE, CUBIT_TRUE, CUBIT_TRUE, >> CUBIT_TRUE, CUBIT_FALSE); >> CGMApp::instance()->attrib_manager()->auto_flag(CUBIT_TRUE); >> @@ -53,24 +53,6 @@ >> s = GeometryQueryTool::instance()->translate( bricks[i], >> CubitVector(i,0,0) ); >> ASSERT(s); >> export_list.append( bricks[i] ); >> - >> - // add tool data to bodies >> - RefEntity* entity = dynamic_cast<RefEntity*> (bricks[i]); >> - DLIList<int> shared_procs; >> - shared_procs.append(i); >> - TDParallel *td_par = (TDParallel *) >> entity->get_TD(&TDParallel::is_parallel); >> - if (td_par == NULL) td_par = new TDParallel(entity, NULL, >> &shared_procs); >> - >> - // add tool data to volumes too >> - DLIList<RefVolume*> volumes; >> - (dynamic_cast<TopologyEntity*> (entity))->ref_volumes(volumes); >> - int n_vol = volumes.size(); >> - volumes.reset(); >> - for (int j = 0; j < n_vol; j++) { >> - RefEntity *vol = volumes.get_and_step(); >> - td_par = (TDParallel *) vol->get_TD(&TDParallel::is_parallel); >> - if (td_par == NULL) td_par = new TDParallel(vol, NULL, &shared_procs); >> - } >> >> >

1 0

Re: [cgma-dev] r5052 - cgm/trunk/test
by Jane Hu 15 Jul '11

15 Jul '11

Please do a reconfiguration on OCC6.5 build, I think your error is due to makefile update issues. I also see some warning of "Generated a sliver surface", which when I look closer, it's actually creating surfaces with negative area. I plan to look into it recently. I think it related to surface's normal direction with respect to loop direction problem. Jane On Thu, Jul 14, 2011 at 6:11 PM, Hong-Jun Kim <hongjun(a)mcs.anl.gov> wrote: > Even though there are wrong loop direction returns in current OCC, it is > working for parallel meshing with great import/export speed improvement with > OCC6.3. (With OCC6.5, I have some errors with "make check") > > Thank you for your work and let me ask more questions about surface loop > direction after checking something. > > ----------------------------- > Hong-Jun Kim > Post-doc researcher > MCS, Argonne National Laboratory > 9700 S. Cass Ave. B240/R2147 > Argonne, IL 60439 > 630-252-4791 > hongjun(a)mcs.anl.gov > ----------------------------- > > ----- Original Message ----- > From: "Jane Hu" <janejhu(a)gmail.com> > To: "Hong-Jun Kim" <hongjun(a)mcs.anl.gov> > Cc: cgma-dev(a)mcs.anl.gov > Sent: Thursday, July 14, 2011 12:03:27 PM > Subject: Re: [cgma-dev] r5052 - cgm/trunk/test > > Hi, HongJun: > > With r5056 that I just checked in, it should work for your concern. Please > double check that it works for your parallel work. > > Thanks. > > Jane > > > > > On Tue, Jul 12, 2011 at 12:23 PM, Hong-Jun Kim < hongjun(a)mcs.anl.gov > > wrote: > > > This seems not checked if attributes are really restored after importing > geometry again. > I think entity ids have to be checked restored correctly. > > Hong-Jun > > > > > > ----- Original Message ----- > From: "jiangtao ma" < jiangtao_ma(a)yahoo.com > > To: cgma-dev(a)mcs.anl.gov > Sent: Tuesday, July 12, 2011 11:55:15 AM > Subject: [cgma-dev] r5052 - cgm/trunk/test > > Author: janehu > Date: 2011-07-12 11:55:15 -0500 (Tue, 12 Jul 2011) > New Revision: 5052 > > Modified: > cgm/trunk/test/attribute_to_buffer.cpp > cgm/trunk/test/attribute_to_file.cpp > cgm/trunk/test/makept.cpp > cgm/trunk/test/modify.cpp > Log: > Remove parallel test from attribute export tests; minor updates for modify > and makept. > > Modified: cgm/trunk/test/attribute_to_buffer.cpp > =================================================================== > --- cgm/trunk/test/attribute_to_buffer.cpp 2011-07-11 20:23:21 UTC (rev > 5051) > +++ cgm/trunk/test/attribute_to_buffer.cpp 2011-07-12 16:55:15 UTC (rev > 5052) > @@ -4,10 +4,10 @@ > #include "Body.hpp" > #include "CGMApp.hpp" > #include "CubitAttribManager.hpp" > -#include "CADefines.hpp" > -#include "TDParallel.hpp" > -#include "CABodies.hpp" > +#include "CAEntityId.hpp" > > +#include <iostream> > +#include <string> > #include <stdio.h> > #include <stdlib.h> > > @@ -37,8 +37,8 @@ > ASSERT(s); > > // actuate CA_BODIES attribute and turn on auto flag > - CGMApp::instance()->attrib_manager()->register_attrib_type(CA_BODIES, > "bodies", "BODIES", > - CABodies_creator, CUBIT_TRUE, > + CGMApp::instance()->attrib_manager()->register_attrib_type(CA_ENTITY_ID, > "id", "ENTITY_ID", > + CAEntityId_creator, CUBIT_TRUE, > CUBIT_TRUE, CUBIT_TRUE, CUBIT_TRUE, > CUBIT_TRUE, CUBIT_FALSE); > CGMApp::instance()->attrib_manager()->auto_flag(CUBIT_TRUE); > @@ -53,24 +53,6 @@ > s = GeometryQueryTool::instance()->translate( bricks[i], CubitVector(i,0,0) > ); > ASSERT(s); > export_list.append( bricks[i] ); > - > - // add tool data to bodies > - RefEntity* entity = dynamic_cast<RefEntity*> (bricks[i]); > - DLIList<int> shared_procs; > - shared_procs.append(i); > - TDParallel *td_par = (TDParallel *) > entity->get_TD(&TDParallel::is_parallel); > - if (td_par == NULL) td_par = new TDParallel(entity, NULL, &shared_procs); > - > - // add tool data to volumes too > - DLIList<RefVolume*> volumes; > - (dynamic_cast<TopologyEntity*> (entity))->ref_volumes(volumes); > - int n_vol = volumes.size(); > - volumes.reset(); > - for (int j = 0; j < n_vol; j++) { > - RefEntity *vol = volumes.get_and_step(); > - td_par = (TDParallel *) vol->get_TD(&TDParallel::is_parallel); > - if (td_par == NULL) td_par = new TDParallel(vol, NULL, &shared_procs); > - } > >

1 0

r5060 - cgm/trunk/geom/parallel
by hongjun＠mcs.anl.gov 15 Jul '11

15 Jul '11

Author: hongjun Date: 2011-07-15 09:21:12 -0500 (Fri, 15 Jul 2011) New Revision: 5060 Modified: cgm/trunk/geom/parallel/CGMReadParallel.cpp cgm/trunk/geom/parallel/CGMReadParallel.hpp Log: o removed unused parallel actions o private members for partition method are changed from bool to enum o passes make check Modified: cgm/trunk/geom/parallel/CGMReadParallel.cpp =================================================================== --- cgm/trunk/geom/parallel/CGMReadParallel.cpp 2011-07-14 22:51:03 UTC (rev 5059) +++ cgm/trunk/geom/parallel/CGMReadParallel.cpp 2011-07-15 14:21:12 UTC (rev 5060) @@ -27,9 +27,7 @@ const bool CGM_read_parallel_debug = false; enum CGMParallelActions {PA_READ=0, PA_BROADCAST, PA_DELETE_NONLOCAL, - PA_SCATTER, PA_SCATTER_DELETE, PA_BALANCE, - PA_CHECK_GIDS_SERIAL, PA_RESOLVE_SHARED_ENTS, - PA_EXCHANGE_GHOSTS}; + PA_SCATTER, PA_SCATTER_DELETE, PA_BALANCE}; enum CGMPartitionActions {PT_GEOM_DIM=0, PT_PAR_PART}; @@ -37,11 +35,7 @@ "PARALLEL READ", "PARALLEL BROADCAST", "PARALLEL DELETE NONLOCAL", - "PARALLEL SCATTER", - "PARALLEL CHECK_GIDS_SERIAL", - "PARALLEL GET_FILESET_ENTS", - "PARALLEL RESOLVE_SHARED_ENTS", - "PARALLEL EXCHANGE_GHOSTS" + "PARALLEL SCATTER" }; const char* CGMReadParallel::CGMparallelOptsNames[] = { "NONE", "READ", "READ_DELETE", "BCAST", @@ -59,8 +53,7 @@ if (NULL == m_pcomm) m_pcomm = new CGMParallelComm(); } - m_round_robin = false; - m_partition_static = false; + m_bal_method = ROUND_ROBIN; m_scatter = false; m_rank = m_pcomm->proc_config().proc_rank(); m_proc_size = m_pcomm->proc_config().proc_size(); @@ -99,7 +92,7 @@ if (FO_ENTITY_NOT_FOUND == result || partition_tag_name.empty()) { partition_tag_name = "GEOM_DIMENSION"; - m_round_robin = true; + m_bal_method = ROUND_ROBIN; geom_dim = 3; } else { @@ -119,16 +112,16 @@ } // static partition, use chaco else if (partition_tag_name == "PAR_PARTITION_STATIC") {

1 0

Re: [cgma-dev] r5052 - cgm/trunk/test
by Hong-Jun Kim 14 Jul '11

14 Jul '11

Even though there are wrong loop direction returns in current OCC, it is working for parallel meshing with great import/export speed improvement with OCC6.3. (With OCC6.5, I have some errors with "make check") Thank you for your work and let me ask more questions about surface loop direction after checking something. ----------------------------- Hong-Jun Kim Post-doc researcher MCS, Argonne National Laboratory 9700 S. Cass Ave. B240/R2147 Argonne, IL 60439 630-252-4791 hongjun(a)mcs.anl.gov ----------------------------- ----- Original Message ----- From: "Jane Hu" <janejhu(a)gmail.com> To: "Hong-Jun Kim" <hongjun(a)mcs.anl.gov> Cc: cgma-dev(a)mcs.anl.gov Sent: Thursday, July 14, 2011 12:03:27 PM Subject: Re: [cgma-dev] r5052 - cgm/trunk/test Hi, HongJun: With r5056 that I just checked in, it should work for your concern. Please double check that it works for your parallel work. Thanks. Jane On Tue, Jul 12, 2011 at 12:23 PM, Hong-Jun Kim < hongjun(a)mcs.anl.gov > wrote: This seems not checked if attributes are really restored after importing geometry again. I think entity ids have to be checked restored correctly. Hong-Jun ----- Original Message ----- From: "jiangtao ma" < jiangtao_ma(a)yahoo.com > To: cgma-dev(a)mcs.anl.gov Sent: Tuesday, July 12, 2011 11:55:15 AM Subject: [cgma-dev] r5052 - cgm/trunk/test Author: janehu Date: 2011-07-12 11:55:15 -0500 (Tue, 12 Jul 2011) New Revision: 5052 Modified: cgm/trunk/test/attribute_to_buffer.cpp cgm/trunk/test/attribute_to_file.cpp cgm/trunk/test/makept.cpp cgm/trunk/test/modify.cpp Log: Remove parallel test from attribute export tests; minor updates for modify and makept. Modified: cgm/trunk/test/attribute_to_buffer.cpp =================================================================== --- cgm/trunk/test/attribute_to_buffer.cpp 2011-07-11 20:23:21 UTC (rev 5051) +++ cgm/trunk/test/attribute_to_buffer.cpp 2011-07-12 16:55:15 UTC (rev 5052) @@ -4,10 +4,10 @@ #include "Body.hpp" #include "CGMApp.hpp" #include "CubitAttribManager.hpp" -#include "CADefines.hpp" -#include "TDParallel.hpp" -#include "CABodies.hpp" +#include "CAEntityId.hpp" +#include <iostream> +#include <string> #include <stdio.h> #include <stdlib.h> @@ -37,8 +37,8 @@ ASSERT(s); // actuate CA_BODIES attribute and turn on auto flag - CGMApp::instance()->attrib_manager()->register_attrib_type(CA_BODIES, "bodies", "BODIES", - CABodies_creator, CUBIT_TRUE, + CGMApp::instance()->attrib_manager()->register_attrib_type(CA_ENTITY_ID, "id", "ENTITY_ID", + CAEntityId_creator, CUBIT_TRUE, CUBIT_TRUE, CUBIT_TRUE, CUBIT_TRUE, CUBIT_TRUE, CUBIT_FALSE); CGMApp::instance()->attrib_manager()->auto_flag(CUBIT_TRUE); @@ -53,24 +53,6 @@ s = GeometryQueryTool::instance()->translate( bricks[i], CubitVector(i,0,0) ); ASSERT(s); export_list.append( bricks[i] ); - - // add tool data to bodies - RefEntity* entity = dynamic_cast<RefEntity*> (bricks[i]); - DLIList<int> shared_procs; - shared_procs.append(i); - TDParallel *td_par = (TDParallel *) entity->get_TD(&TDParallel::is_parallel); - if (td_par == NULL) td_par = new TDParallel(entity, NULL, &shared_procs); - - // add tool data to volumes too - DLIList<RefVolume*> volumes; - (dynamic_cast<TopologyEntity*> (entity))->ref_volumes(volumes); - int n_vol = volumes.size(); - volumes.reset(); - for (int j = 0; j < n_vol; j++) { - RefEntity *vol = volumes.get_and_step(); - td_par = (TDParallel *) vol->get_TD(&TDParallel::is_parallel); - if (td_par == NULL) td_par = new TDParallel(vol, NULL, &shared_procs); - }

1 0

r5059 - cgm/trunk/geom/parallel
by hongjun＠mcs.anl.gov 14 Jul '11

14 Jul '11

Author: hongjun Date: 2011-07-14 17:51:03 -0500 (Thu, 14 Jul 2011) New Revision: 5059 Modified: cgm/trunk/geom/parallel/Makefile.am Log: o HAVE_OCC definition is added not to compile read/write buffer functions only for OCC kernel o passes make check Modified: cgm/trunk/geom/parallel/Makefile.am =================================================================== --- cgm/trunk/geom/parallel/Makefile.am 2011-07-14 17:01:26 UTC (rev 5058) +++ cgm/trunk/geom/parallel/Makefile.am 2011-07-14 22:51:03 UTC (rev 5059) @@ -2,7 +2,8 @@ -I$(top_srcdir)/geom \ -I$(top_srcdir)/geom/ACIS \ -I$(ACIS_DIR)/include \ - $(MPI_INCLUDE) + $(MPI_INCLUDE) \ + $(HAVE_OCC_DEF) if USE_MPI AM_CPPFLAGS += -DUSE_MPI

1 0