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

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

14 Jul '11

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

r5058 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 14 Jul '11

14 Jul '11

Author: janehu Date: 2011-07-14 12:01:26 -0500 (Thu, 14 Jul 2011) New Revision: 5058 Modified: cgm/trunk/test/Makefile.am Log: Updated the makefile for make clean option. Remove bricks2*.occ after checking. Modified: cgm/trunk/test/Makefile.am =================================================================== --- cgm/trunk/test/Makefile.am 2011-07-14 16:56:22 UTC (rev 5057) +++ cgm/trunk/test/Makefile.am 2011-07-14 17:01:26 UTC (rev 5058) @@ -134,6 +134,8 @@ after_webcut.brep \ webcut_sweep.brep \ bricks2.occ \ + bricks22.occ \ + bricks23.occ \ mmgr.log

1 0

r5057 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 14 Jul '11

14 Jul '11

Author: janehu Date: 2011-07-14 11:56:22 -0500 (Thu, 14 Jul 2011) New Revision: 5057 Modified: cgm/trunk/test/attribute_to_file.cpp Log: Updated for bug fix reported in r5056. Modified: cgm/trunk/test/attribute_to_file.cpp =================================================================== --- cgm/trunk/test/attribute_to_file.cpp 2011-07-14 16:55:19 UTC (rev 5056) +++ cgm/trunk/test/attribute_to_file.cpp 2011-07-14 16:56:22 UTC (rev 5057) @@ -27,6 +27,9 @@ #endif #define ASSERT(A) if (!(A)) failed(#A,__FILE__,__LINE__) +CubitBoolean is_files_same(char* filename1, + char* filename2); + void failed( const char* A, const char* FILE, int LINE ) { printf( "Condition failed at %s:%d : %s\n", FILE, LINE, A ); @@ -122,7 +125,61 @@ body_entity_list.reset(); assert (n_body == 2); + export_list.clean_out(); + export_list.append(CAST_TO(body_entity_list.get_and_step(), Body)); + export_list.append(CAST_TO(body_entity_list.get_and_step(), Body)); + s = GeometryQueryTool::instance()->export_solid_model( export_list, "bricks23.occ", + FORMAT, junk, CubitString(__FILE__) ); + ASSERT(s); + + ASSERT(is_files_same("bricks2.occ", "bricks23.occ")); return 0; } +CubitBoolean is_files_same(char* filename1, + char* filename2) +{ + FILE *fp1, *fp2; + char ch1, ch2; + CubitBoolean same = false; + /* open first file */ + if((fp1 = fopen(filename1, "rb"))==NULL) { + printf("Cannot open first file.\n"); + exit(false); + } + /* open second file */ + if((fp2 = fopen(filename2, "rb"))==NULL) { + printf("Cannot open second file.\n"); + exit(false); + } + + /* compare the files */ + while(!feof(fp1)) { + ch1 = fgetc(fp1); + if(ferror(fp1)) {

1 0

r5056 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 14 Jul '11

14 Jul '11

Author: janehu Date: 2011-07-14 11:55:19 -0500 (Thu, 14 Jul 2011) New Revision: 5056 Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCShapeAttributeSet.cpp Log: Fixed the bug when using the imported file to export, the single lump body attribute is missing. Testcase update for this in attribute_to_file.cpp. Passed make check. Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCAttribSet.cpp 2011-07-13 19:53:02 UTC (rev 5055) +++ cgm/trunk/geom/OCC/OCCAttribSet.cpp 2011-07-14 16:55:19 UTC (rev 5056) @@ -321,6 +321,9 @@ { //find the same type attribute first TDF_Label child = it1.Value(); + if (child.NbAttributes() == 0) + continue; + num_children ++; if(!csa) Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2011-07-13 19:53:02 UTC (rev 5055) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2011-07-14 16:55:19 UTC (rev 5056) @@ -18,6 +18,14 @@ //#include <Standard_SStream.hxx> //#include <Standard_String.hxx> //#include <stringbuf> +#if OCC_VERSION_MINOR < 5 + #include "TDataStd_Shape.hxx" + typedef TDataStd_Shape TDataXtd_Shape; + typedef Handle_TDataStd_Shape Handle_TDataXtd_Shape; +#else + #include "TDataXtd_Shape.hxx" +#endif + #include "BRep_Tool.hxx" #include "gp_Pnt.hxx" #include "gp_Ax1.hxx" @@ -1891,6 +1899,13 @@ if( OccToCGM->find(current_id) == OccToCGM->end() ) { OCCMap->UnBind(bare_shape); + std::map<int, TDF_Label>::iterator it = + Shape_Label_Map->find(current_id); + if(it != Shape_Label_Map->end()) + { + TDF_Label aLabel = (*it).second; + Handle_TDataXtd_Shape attr_shape = TDataXtd_Shape::Set(aLabel, sh); + } shape_found = true; } } Modified: cgm/trunk/geom/OCC/OCCShapeAttributeSet.cpp ===================================================================

1 0

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

12 Jul '11

I'll look into it. Currently I found the single lump body attribute seems lost, other ids are all kept. I'll look into details. 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

r5053 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 12 Jul '11

12 Jul '11

Author: janehu Date: 2011-07-12 12:32:07 -0500 (Tue, 12 Jul 2011) New Revision: 5053 Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp cgm/trunk/geom/OCC/OCCAttribSet.hpp cgm/trunk/geom/OCC/OCCBody.cpp cgm/trunk/geom/OCC/OCCCurve.cpp cgm/trunk/geom/OCC/OCCDrawTool.cpp cgm/trunk/geom/OCC/OCCLoop.cpp cgm/trunk/geom/OCC/OCCLump.cpp cgm/trunk/geom/OCC/OCCModifyEngine.cpp cgm/trunk/geom/OCC/OCCPoint.hpp cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.hpp cgm/trunk/geom/OCC/OCCShapeAttributeSet.cpp cgm/trunk/geom/OCC/OCCShapeAttributeSet.hpp cgm/trunk/geom/OCC/OCCShell.cpp cgm/trunk/geom/OCC/OCCSurface.cpp Log: Added a map of an OCC shape and its attribute label structure to improved read and write speed, and related suporting changes. passed all testcases under cgm make check. Modified: cgm/trunk/geom/OCC/OCCAttribSet.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCAttribSet.cpp 2011-07-12 16:55:15 UTC (rev 5052) +++ cgm/trunk/geom/OCC/OCCAttribSet.cpp 2011-07-12 17:32:07 UTC (rev 5053) @@ -28,6 +28,8 @@ #include "TDataXtd_Shape.hxx" #endif +#include "TDF_Label.hxx" +#include "TopTools_DataMapOfShapeInteger.hxx" #include "TCollection_ExtendedString.hxx" #include "Handle_TDataStd_Name.hxx" #include "Handle_TDataStd_ExtStringArray.hxx" @@ -40,26 +42,23 @@ #include "TopoDS_Shape.hxx" #include "TDF_ChildIterator.hxx" #include <vector> +typedef std::map<int, TDF_Label>::value_type labType; void OCCAttribSet::FindShape(TopoDS_Shape& shape, TDF_Label& aLabel, CubitBoolean& found) { - for (TDF_ChildIterator it1(OCCQueryEngine::instance()->mainLabel, CUBIT_FALSE); - it1.More(); it1.Next()) + found = CUBIT_FALSE; + if(!OCCQueryEngine::instance()->OCCMap->IsBound(shape)) + return; + + int k = OCCQueryEngine::instance()->OCCMap->Find(shape); + std::map<int, TDF_Label>::iterator it = + OCCQueryEngine::instance()->Shape_Label_Map->find(k); + if(it != OCCQueryEngine::instance()->Shape_Label_Map->end()) { - //find the same shape attribute first - aLabel = it1.Value(); - - Handle_TDataXtd_Shape attr_shape; - TopoDS_Shape old_shape; - if(aLabel.FindAttribute(TDataXtd_Shape::GetID(), attr_shape)) - old_shape = attr_shape->Get(aLabel); - if(old_shape.IsPartner(shape)) - { - found = CUBIT_TRUE; - break; - } + aLabel = (*it).second; + found = CUBIT_TRUE; } }

1 0

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

12 Jul '11

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

r5052 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 12 Jul '11

12 Jul '11

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

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

07 Jul '11

Author: hongjun Date: 2011-07-07 15:48:10 -0500 (Thu, 07 Jul 2011) New Revision: 5048 Modified: cgm/trunk/geom/parallel/CGMReadParallel.cpp cgm/trunk/geom/parallel/CGMReadParallel.hpp Log: o Partitioned geometry by mbzoltan partitioner can be supported in parallel CGM o As a result, round-robin(embedded), body-only and body and surface partitioning(by mbzoltan partitioner) are supported o Parent bodies of partitioned surfaces are also distributed to processors o Passes make check Modified: cgm/trunk/geom/parallel/CGMReadParallel.cpp =================================================================== --- cgm/trunk/geom/parallel/CGMReadParallel.cpp 2011-07-07 20:38:17 UTC (rev 5047) +++ cgm/trunk/geom/parallel/CGMReadParallel.cpp 2011-07-07 20:48:10 UTC (rev 5048) @@ -59,6 +59,8 @@ if (NULL == m_pcomm) m_pcomm = new CGMParallelComm(); } + m_round_robin = false; + m_partition_static = false; m_scatter = false; m_rank = m_pcomm->proc_config().proc_rank(); m_proc_size = m_pcomm->proc_config().proc_size(); @@ -117,7 +119,7 @@ } // static partition, use chaco else if (partition_tag_name == "PAR_PARTITION_STATIC") { - + m_partition_static = true; } // dynamic partition, use zoltan else if (partition_tag_name == "PAR_PARTITION_DYNAMIC") { @@ -267,8 +269,7 @@ //================== case PA_BALANCE: if (CGM_read_parallel_debug) std::cout << "Balancing entities." << std::endl; - - result = balance(); + if (m_round_robin) result = balance_round_robin(); if (CUBIT_SUCCESS != result) return result; if (CGM_read_parallel_debug) PRINT_INFO("Balancing entities done.\n"); @@ -406,7 +407,7 @@ return result; } -CubitStatus CGMReadParallel::balance() +CubitStatus CGMReadParallel::balance_round_robin() { // get bodies int i, j; @@ -560,35 +561,60 @@ return CUBIT_FAILURE; } - if (td_par->get_charge_proc() != m_rank) delete_body_list.append(entity); + if (td_par->get_charge_proc() != m_rank) { // candidate to be deleted + // check child surfaces + DLIList<RefFace*> face_list; + (dynamic_cast<TopologyEntity*> (entity))->ref_faces(face_list); + bool b_partitioned_surf = false;

1 0

r5043 - cgm/trunk/util
by iulian＠mcs.anl.gov 01 Jul '11

01 Jul '11

Author: iulian Date: 2011-07-01 14:55:21 -0500 (Fri, 01 Jul 2011) New Revision: 5043 Modified: cgm/trunk/util/CubitFile.hpp Log: avoid the crash on 32 bit by padding some extra bytes in the CCubitFile class; it should help on 64 bit too. This header file should be replaced with 12.2 version, when available Modified: cgm/trunk/util/CubitFile.hpp =================================================================== --- cgm/trunk/util/CubitFile.hpp 2011-06-30 22:31:50 UTC (rev 5042) +++ cgm/trunk/util/CubitFile.hpp 2011-07-01 19:55:21 UTC (rev 5043) @@ -291,6 +291,10 @@ UnsignedInt32 mintNumModels; SModelData* mpaModelData; } mModelBuff; + char buff[16];// used to pad for the difference between sizeof(CCubitFile) + // and actual size of object from cubit library + // it seems that we have headers from 12.0, and library + // is 12.2 }; } // namespace NCubitFile

1 0