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

Re: [cgma-dev] [Meshkit-dev] installing Meshkit
by Paul Wilson 07 Apr '11

07 Apr '11

Hi Steve, I'm curious to know what you think is different about the Mac versions that would cause this kind of issue? (Short of actually debugging the problem - more of an assessment of where the problem might be.) Paul On 04/07/2011 10:48 AM, Steve Jackson wrote: > On Apr 7, 2011, at 10:24 , Tim Tautges wrote: > >> On 04/07/2011 09:21 AM, Avery Bingham wrote: >>> I have a few questions on installing MeshKit. >>> >>> First, has it been installed on a Mac? Second I am having some difficulties getting CGM installed. I use Cubit, but >>> I have a prebuilt version and I cant get the configure file to use the cubit libraries from my installed version. >>> Unfortunately I don't have ACIS or access to the cubit source code. This seems to be a road block to installing >>> MeshKit. Do you have a suggested workaround? >>> >> This should be installable on a mac, though I'm not sure if anybody has actually tested that. > That's a good question. I spent some time trying to build CGM (merge-cubit12 branch) against Cubit 12.2 on Mac OS 10.6, and I got nowhere: I cannot find a way to successfully link against the libcubiti19 file that's inside in the Cubit application. (I can convince the linker to link against this file, but I cannot reference any symbols without producing undefined symbol errors.) This prevents CGM from passing its configure step. > > I haven't time to work on this further, but if anyone with a Mac wants to look at this more closely, they can contact me for details about what I've tried so far. > > (Would it be practical to set up MeskKit to build without CGM, or with a CGM that doesn't have a geometry backend installed? It seems like the greatest burden for a new user is getting CGM set up with an appropriate backend.) > ~S > -- -- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -- Paul Wilson ~ UW-Madison ~ 608-263-0807 ~ cal: http://bit.ly/pphw-cal Associate Professor, Engineering Physics. ~ http://cnerg.engr.wisc.edu Chair, Energy Analysis& Policy Program ~ http://nelson.wisc.edu/eap Note: I will be on sabbatical for the 2010-2011 academic year.

1 0

Re: [cgma-dev] [Meshkit-dev] installing Meshkit
by Tim Tautges 07 Apr '11

07 Apr '11

Steve, can you try building or installing opencascade on the mac? That should be supported, and would give us a mostly functional cgm there. - tim On 04/07/2011 12:48 PM, Steve Jackson wrote: > On Apr 7, 2011, at 10:24 , Tim Tautges wrote: > >> >> On 04/07/2011 09:21 AM, Avery Bingham wrote: >>> I have a few questions on installing MeshKit. >>> >>> First, has it been installed on a Mac? Second I am having some difficulties getting CGM installed. I use Cubit, but >>> I have a prebuilt version and I cant get the configure file to use the cubit libraries from my installed version. >>> Unfortunately I don't have ACIS or access to the cubit source code. This seems to be a road block to installing >>> MeshKit. Do you have a suggested workaround? >>> >> >> This should be installable on a mac, though I'm not sure if anybody has actually tested that. > > That's a good question. I spent some time trying to build CGM (merge-cubit12 branch) against Cubit 12.2 on Mac OS 10.6, and I got nowhere: I cannot find a way to successfully link against the libcubiti19 file that's inside in the Cubit application. (I can convince the linker to link against this file, but I cannot reference any symbols without producing undefined symbol errors.) This prevents CGM from passing its configure step. > > I haven't time to work on this further, but if anyone with a Mac wants to look at this more closely, they can contact me for details about what I've tried so far. > > (Would it be practical to set up MeskKit to build without CGM, or with a CGM that doesn't have a geometry backend installed? It seems like the greatest burden for a new user is getting CGM set up with an appropriate backend.) > ~S > > -- ================================================================ "You will keep in perfect peace him whose mind is steadfast, because he trusts in you." Isaiah 26:3 Tim Tautges Argonne National Laboratory (tautges(a)mcs.anl.gov) (telecommuting from UW-Madison) phone: (608) 263-8485 1500 Engineering Dr. fax: (608) 263-4499 Madison, WI 53706

1 0

Re: [cgma-dev] [Meshkit-dev] installing Meshkit
by Steve Jackson 07 Apr '11

07 Apr '11

On Apr 7, 2011, at 10:24 , Tim Tautges wrote: > > On 04/07/2011 09:21 AM, Avery Bingham wrote: >> I have a few questions on installing MeshKit. >> >> First, has it been installed on a Mac? Second I am having some difficulties getting CGM installed. I use Cubit, but >> I have a prebuilt version and I cant get the configure file to use the cubit libraries from my installed version. >> Unfortunately I don't have ACIS or access to the cubit source code. This seems to be a road block to installing >> MeshKit. Do you have a suggested workaround? >> > > This should be installable on a mac, though I'm not sure if anybody has actually tested that. That's a good question. I spent some time trying to build CGM (merge-cubit12 branch) against Cubit 12.2 on Mac OS 10.6, and I got nowhere: I cannot find a way to successfully link against the libcubiti19 file that's inside in the Cubit application. (I can convince the linker to link against this file, but I cannot reference any symbols without producing undefined symbol errors.) This prevents CGM from passing its configure step. I haven't time to work on this further, but if anyone with a Mac wants to look at this more closely, they can contact me for details about what I've tried so far. (Would it be practical to set up MeskKit to build without CGM, or with a CGM that doesn't have a geometry backend installed? It seems like the greatest burden for a new user is getting CGM set up with an appropriate backend.) ~S

1 0

r4727 - cgm/branches/merge-cubit12/test
by jiangtao_ma＠yahoo.com 07 Apr '11

07 Apr '11

Author: janehu Date: 2011-04-07 12:28:02 -0500 (Thu, 07 Apr 2011) New Revision: 4727 Added: cgm/branches/merge-cubit12/test/Cylinder_1.brep cgm/branches/merge-cubit12/test/Cylinder_2.brep Log: Added input files for modify.cpp change version 4725. Added: cgm/branches/merge-cubit12/test/Cylinder_1.brep =================================================================== --- cgm/branches/merge-cubit12/test/Cylinder_1.brep (rev 0) +++ cgm/branches/merge-cubit12/test/Cylinder_1.brep 2011-04-07 17:28:02 UTC (rev 4727) @@ -0,0 +1,118 @@ +DBRep_DrawableShape + +CASCADE Topology V1, (c) Matra-Datavision +Locations 0 +Curve2ds 6 +1 0 1000 1 0 +2 0 0 1 0 -0 1 100 +1 6.2831853071795862 -0 0 1 +1 0 -0 0 1 +1 0 0 1 0 +2 0 0 1 0 -0 1 100 +Curves 3 +2 0 0 1000 0 0 1 1 0 -0 -0 1 0 100 +1 100 -2.4492935982947064e-14 0 0 0 1 +2 0 0 0 0 0 1 1 0 -0 -0 1 0 100 +Polygon3D 0 +PolygonOnTriangulations 4 +49 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 1 +p 21.6478440258479 1 0 0.130899693899575 0.261799387799149 0.392699081698724 0.523598775598299 0.654498469497873 0.785398163397448 0.916297857297023 1.0471975511966 1.17809724509617 1.30899693899575 1.43989663289532 1.5707963267949 1.70169602069447 1.83259571459405 1.96349540849362 2.0943951023932 2.22529479629277 2.35619449019234 2.48709418409192 2.61799387799149 2.74889357189107 2.87979326579064 3.01069295969022 3.14159265358979 3.27249234748937 3.40339204138894 3.53429173528852 3.66519142918809 3.79609112308767 3.92699081698724 4.05789051088681 4.18879020478639 4.31968989868596 4.45058959258554 4.58148928648511 4.71238898038469 4.84328867428426 4.97418836818384 5.10508806208341 5.23598775598299 5.36688744988256 5.49778714378213 5.62868683768171 5.75958653158128 5.89048622548086 6.02138591938043 6.15228561328001 6.28318530717959 +2 14 2 +p 100.00000002 1 0 1000 +2 15 1 +p 100.00000002 1 0 1000 +49 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 1 +p 21.6478440258479 1 0 0.130899693899575 0.261799387799149 0.392699081698724 0.523598775598299 0.654498469497873 0.785398163397448 0.916297857297023 1.0471975511966 1.17809724509617 1.30899693899575 1.43989663289532 1.5707963267949 1.70169602069447 1.83259571459405 1.96349540849362 2.0943951023932 2.22529479629277 2.35619449019234 2.48709418409192 2.61799387799149 2.74889357189107 2.87979326579064 3.01069295969022 3.14159265358979 3.27249234748937 3.40339204138894 3.53429173528852 3.66519142918809 3.79609112308767 3.92699081698724 4.05789051088681 4.18879020478639 4.31968989868596 4.45058959258554 4.58148928648511 4.71238898038469 4.84328867428426 4.97418836818384 5.10508806208341 5.23598775598299 5.36688744988256 5.49778714378213 5.62868683768171 5.75958653158128 5.89048622548086 6.02138591938043 6.15228561328001 6.28318530717959 +Surfaces 3 +2 0 0 0 0 0 1 1 0 -0 -0 1 0 100 +1 0 0 1000 0 0 1 1 0 -0 -0 1 0 +1 0 0 0 0 0 1 1 0 -0 -0 1 0 +Triangulations 3 +26 24 1 3.40741737109317 +100 -2.44929359829471e-14 1000 100 -2.44929359829471e-14 1000 86.6025403784439 50 1000 50 86.6025403784439 1000 6.12323399573677e-15 100 1000 -50 86.6025403784439 1000 -86.6025403784438 50 1000 -100 5.66553889764798e-14 1000 -86.6025403784439 -49.9999999999999 1000 -50 -86.6025403784438 1000 -1.83697019872103e-14 -100 1000 50 -86.6025403784439 1000 86.6025403784439 -50 1000 100 -2.44929359829471e-14 0 100 -2.44929359829471e-14 0 86.6025403784439 50 0 50 86.6025403784439 0 6.12323399573677e-15 100 0 -50 86.6025403784439 0 -86.6025403784438 50 0 -100 5.66553889764798e-14 0 -86.6025403784439 -49.9999999999999 0 -50 -86.6025403784438 0 -1.83697019872103e-14 -100 0 50 -86.6025403784439 0 86.6025403784439 -50 0 0 1000 6.28318530717959 1000 0.523598775598299 1000 1.0471975511966 1000 1.5707963267949 1000 2.0943951023932 1000 2.61799387799149 1000 3.14159265358979 1000 3.66519142918809 1000 4.18879020478639 1000 4.71238898038469 1000 5.23598775598299 1000 5.75958653158129 1000 6.283 18530717959 0 0 0 0.523598775598299 0 1.0471975511966 0 1.5707963267949 0 2.0943951023932 0 2.61799387799149 0 3.14159265358979 0 3.66519142918809 0 4.18879020478639 0 4.71238898038469 0 5.23598775598299 0 5.75958653158129 0 6 5 19 7 20 21 7 6 20 8 21 22 8 7 21 9 22 23 9 8 22 10 23 24 10 9 23 1 15 16 11 24 25 11 10 24 12 25 26 12 11 25 3 16 17 13 26 14 13 12 26 2 13 14 3 1 16 4 17 18 4 3 17 5 18 19 5 4 18 6 19 20 +49 48 1 0 +100 -2.44929359829471e-14 1000 99.144486137381 13.0526192220052 1000 96.5925826289068 25.8819045102521 1000 92.3879532511287 38.268343236509 1000 86.6025403784439 50 1000 79.3353340291235 60.8761429008721 1000 70.7106781186548 70.7106781186547 1000 60.8761429008721 79.3353340291235 1000 50 86.6025403784439 1000 38.268343236509 92.3879532511287 1000 25.8819045102521 96.5925826289068 1000 13.0526192220051 99.144486137381 1000 -1.60812264967664e-14 100 1000 -13.0526192220052 99.144486137381 1000 -25.8819045102521 96.5925826289068 1000 -38.268343236509 92.3879532511287 1000 -50 86.6025403784438 1000 -60.8761429008721 79.3353340291235 1000 -70.7106781186547 70.7106781186548 1000 -79.3353340291235 60.8761429008721 1000 -86.6025403784438 50 1000 -92.3879532511286 38.268343236509 1000 -96.5925826289068 25.8819045102521 1000 -99.144486137381 13.0526192220052 1000 -100 1.01064309961486e-13 1000 -99.1444861373811 -13.052619222005 1000 -96.5925826289069 -25.8819045102519 1000 -92.387953 2511287 -38.2683432365088 1000 -86.6025403784439 -49.9999999999999 1000 -79.3353340291236 -60.8761429008719 1000 -70.7106781186549 -70.7106781186546 1000 -60.8761429008722 -79.3353340291234 1000 -50.0000000000002 -86.6025403784437 1000 -38.2683432365092 -92.3879532511286 1000 -25.8819045102523 -96.5925826289068 1000 -13.0526192220054 -99.144486137381 1000 -2.84823227897248e-13 -100 1000 13.0526192220049 -99.1444861373811 1000 25.8819045102518 -96.5925826289069 1000 38.2683432365087 -92.3879532511288 1000 49.9999999999997 -86.602540378444 1000 60.8761429008718 -79.3353340291237 1000 70.7106781186545 -70.710678118655 1000 79.3353340291233 -60.8761429008724 1000 86.6025403784437 -50.0000000000004 1000 92.3879532511285 -38.2683432365094 1000 96.5925826289067 -25.8819045102525 1000 99.144486137381 -13.0526192220056 1000 0 0 1000 100 0 99.144486137381 13.0526192220052 96.5925826289068 25.8819045102521 92.3879532511287 38.268343236509 86.6025403784439 50 79.3353340291235 60.8761429 008721 70.7106781186548 70.7106781186548 60.8761429008721 79.3353340291235 50 86.6025403784438 38.268343236509 92.3879532511287 25.8819045102521 96.5925826289068 13.0526192220051 99.144486137381 -1.4210854715202e-14 100 -13.0526192220052 99.144486137381 -25.8819045102521 96.5925826289068 -38.268343236509 92.3879532511287 -50 86.6025403784438 -60.8761429008721 79.3353340291235 -70.7106781186547 70.7106781186548 -79.3353340291235 60.8761429008721 -86.6025403784438 50 -92.3879532511286 38.268343236509 -96.5925826289068 25.8819045102521 -99.144486137381 13.0526192220052 -100 9.9475983006414e-14 -99.1444861373811 -13.052619222005 -96.5925826289069 -25.8819045102519 -92.3879532511287 -38.2683432365088 -86.6025403784439 -49.9999999999999 -79.3353340291236 -60.8761429008719 -70.7106781186549 -70.7106781186546 -60.8761429008722 -79.3353340291234 -50.0000000000002 -86.6025403784437 -38.2683432365092 -92.3879532511286 -25.8819045102523 -96.5925826289068 -13.0526192220054 -99.1444861373 81 -2.8421709430404e-13 -100 13.0526192220049 -99.1444861373811 25.8819045102518 -96.5925826289069 38.2683432365087 -92.3879532511288 49.9999999999997 -86.602540378444 60.8761429008718 -79.3353340291237 70.7106781186545 -70.710678118655 79.3353340291233 -60.8761429008724 86.6025403784437 -50.0000000000004 92.3879532511285 -38.2683432365094 96.5925826289067 -25.8819045102525 99.144486137381 -13.0526192220056 0 0 49 42 43 49 43 44 49 44 45 49 45 46 49 46 47 49 47 48 49 48 1 49 1 2 49 2 3 49 3 4 49 4 5 49 5 6 49 6 7 49 7 8 49 8 9 49 9 10 49 10 11 49 11 12 49 12 13 49 13 14 49 14 15 49 15 16 49 16 17 49 17 18 49 18 19 49 19 20 49 20 21 49 21 22 49 22 23 49 23 24 49 24 25 49 25 26 49 26 27 49 27 28 49 28 29 49 29 30 49 30 31 49 31 32 49 32 33 49 33 34 49 34 35 49 35 36 49 36 37 49 37 38 49 38 39 49 39 40 49 40 41 49 41 42 +49 48 1 0 +100 -2.44929359829471e-14 0 99.144486137381 13.0526192220052 0 96.5925826289068 25.8819045102521 0 92.3879532511287 38.268343236509 0 86.6025403784439 50 0 79.3353340291235 60.8761429008721 0 70.7106781186548 70.7106781186547 0 60.8761429008721 79.3353340291235 0 50 86.6025403784439 0 38.268343236509 92.3879532511287 0 25.8819045102521 96.5925826289068 0 13.0526192220051 99.144486137381 0 -1.60812264967664e-14 100 0 -13.0526192220052 99.144486137381 0 -25.8819045102521 96.5925826289068 0 -38.268343236509 92.3879532511287 0 -50 86.6025403784438 0 -60.8761429008721 79.3353340291235 0 -70.7106781186547 70.7106781186548 0 -79.3353340291235 60.8761429008721 0 -86.6025403784438 50 0 -92.3879532511286 38.268343236509 0 -96.5925826289068 25.8819045102521 0 -99.144486137381 13.0526192220052 0 -100 1.01064309961486e-13 0 -99.1444861373811 -13.052619222005 0 -96.5925826289069 -25.8819045102519 0 -92.3879532511287 -38.2683432365088 0 -86.6025403784439 -49.9999999999999 0 -79.33533402912 36 -60.8761429008719 0 -70.7106781186549 -70.7106781186546 0 -60.8761429008722 -79.3353340291234 0 -50.0000000000002 -86.6025403784437 0 -38.2683432365092 -92.3879532511286 0 -25.8819045102523 -96.5925826289068 0 -13.0526192220054 -99.144486137381 0 -2.84823227897248e-13 -100 0 13.0526192220049 -99.1444861373811 0 25.8819045102518 -96.5925826289069 0 38.2683432365087 -92.3879532511288 0 49.9999999999997 -86.602540378444 0 60.8761429008718 -79.3353340291237 0 70.7106781186545 -70.710678118655 0 79.3353340291233 -60.8761429008724 0 86.6025403784437 -50.0000000000004 0 92.3879532511285 -38.2683432365094 0 96.5925826289067 -25.8819045102525 0 99.144486137381 -13.0526192220056 0 0 0 0 100 -2.8421709430404e-14 99.144486137381 13.0526192220052 96.5925826289068 25.8819045102521 92.3879532511287 38.268343236509 86.6025403784439 50 79.3353340291235 60.8761429008721 70.7106781186548 70.7106781186548 60.8761429008721 79.3353340291235 50 86.6025403784438 38.268343236509 92.3879532511287 25.8819045102521 96.5925826289068 13.0526192220051 99.144486137381 -1.4210854715202e-14 100 -13.0526192220052 99.144486137381 -25.8819045102521 96.5925826289068 -38.268343236509 92.3879532511287 -50 86.6025403784438 -60.8761429008721 79.3353340291235 -70.7106781186547 70.7106781186548 -79.3353340291235 60.8761429008721 -86.6025403784438 50 -92.3879532511286 38.268343236509 -96.5925826289068 25.8819045102521 -99.144486137381 13.0526192220052 -100 9.9475983006414e-14 -99.1444861373811 -13.052619222005 -96.5925826289069 -25.8819045102519 -92.3879532511287 -38.2683432365088 -86.6025403784439 -49.9999999999999 -79.3353340291236 -60.8761429008719 -70.7106781186549 -70.7106781186546 -60.8761429008722 -79.3353340291234 -50.0000000000002 -86.6025403784437 -38.2683432365092 -92.3879532511286 -25.8819045102523 -96.5925826289068 -13.0526192220054 -99.144486137381 -2.8421709430404e-13 -100 13.0526192220049 -99.1444861373811 25.8819045102518 -96.5925826289069 38.2683432365087 -92.38795325 11288 49.9999999999997 -86.602540378444 60.8761429008718 -79.3353340291237 70.7106781186545 -70.710678118655 79.3353340291233 -60.8761429008724 86.6025403784437 -50.0000000000004 92.3879532511285 -38.2683432365094 96.5925826289067 -25.8819045102525 99.144486137381 -13.0526192220056 0 0 49 42 43 49 43 44 49 44 45 49 45 46 49 46 47 49 47 48 49 48 1 49 1 2 49 2 3 49 3 4 49 4 5 49 5 6 49 6 7 49 7 8 49 8 9 49 9 10 49 10 11 49 11 12 49 12 13 49 13 14 49 14 15 49 15 16 49 16 17 49 17 18 49 18 19 49 19 20 49 20 21 49 21 22 49 22 23 49 23 24 49 24 25 49 25 26 49 26 27 49 27 28 49 28 29 49 29 30 49 30 31 49 31 32 49 32 33 49 33 34 49 34 35 49 35 36 49 36 37 49 37 38 49 38 39 49 39 40 49 40 41 49 41 42 + +TShapes 13 +Ve +1e-07 +100 -2.44929359829471e-14 1000 +0 0 + +0101101 +* +Ed

1 0

r4726 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 07 Apr '11

07 Apr '11

Author: janehu Date: 2011-04-07 12:23:34 -0500 (Thu, 07 Apr 2011) New Revision: 4726 Modified: cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp Log: Fixed a bug in importing OCC geometry: For non-compound type of geometry, directly read-in all structure; for compound type, read in individual sturctures separately. Modified: cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp 2011-04-07 17:22:27 UTC (rev 4725) +++ cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp 2011-04-07 17:23:34 UTC (rev 4726) @@ -1493,6 +1493,12 @@ //All read in shapes are wrapped inside a compound shape. Ignore this one TopoDS_Iterator it(*aShape); + if(aShape->ShapeType() != TopAbs_COMPOUND) + { + imported_entities += populate_topology_bridge(*aShape); + return CUBIT_SUCCESS; + } + for(;it.More();it.Next()) { TopoDS_Shape shape = it.Value(); @@ -1512,6 +1518,12 @@ //All read in shapes are wrapped inside a compound shape. Ignore this one TopoDS_Iterator it(*aShape); + if(aShape->ShapeType() != TopAbs_COMPOUND) + { + imported_entities += populate_topology_bridge(*aShape); + return CUBIT_SUCCESS; + } + for(;it.More();it.Next()) { TopoDS_Shape shape = it.Value();

1 0

r4725 - cgm/branches/merge-cubit12/test
by jiangtao_ma＠yahoo.com 07 Apr '11

07 Apr '11

Author: janehu Date: 2011-04-07 12:22:27 -0500 (Thu, 07 Apr 2011) New Revision: 4725 Modified: cgm/branches/merge-cubit12/test/modify.cpp Log: Added a testcase from CGM trunk, fixed a bug in importing OCC geometry: For non-compound type of geometry, directly read-in all structure; for compound type, read in individual sturctures separately. Modified: cgm/branches/merge-cubit12/test/modify.cpp =================================================================== --- cgm/branches/merge-cubit12/test/modify.cpp 2011-04-07 16:09:33 UTC (rev 4724) +++ cgm/branches/merge-cubit12/test/modify.cpp 2011-04-07 17:22:27 UTC (rev 4725) @@ -1256,5 +1256,27 @@ gti->delete_RefEntity(free_entities.get_and_step()); //So far created volume 80. + + // Read in the geometry from files specified on the command line + argv = "Cylinder_1.brep"; + status = read_geometry(1, &argv, true); + argv = "Cylinder_2.brep"; + status = read_geometry(1, &argv, true); + if (status == CUBIT_FAILURE) exit(1); + //Read in 2 volumes. + + from_bodies.clean_out(); + new_bodies.clean_out(); + gti->bodies(from_bodies); + stat = gmti->imprint(from_bodies, new_bodies, CUBIT_FALSE); + + num_ents_exported=0; + filename = "imprint.brep"; + ref_entity_list.clean_out(); + rsl = gti->export_solid_model(ref_entity_list, filename, filetype, + num_ents_exported, cubit_version); + assert(num_ents_exported == 2); + assert (CAST_TO(ref_entity_list.get(), Body)->num_ref_faces() == 7); + assert (CAST_TO(ref_entity_list.get_and_step(), Body)->num_ref_edges() == 11); return CUBIT_SUCCESS; }

1 0

r4724 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 07 Apr '11

07 Apr '11

Author: janehu Date: 2011-04-07 11:09:33 -0500 (Thu, 07 Apr 2011) New Revision: 4724 Removed: cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp_3424 Log: Deleted: cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp_3424 =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp_3424 2011-04-07 15:36:30 UTC (rev 4723) +++ cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp_3424 2011-04-07 16:09:33 UTC (rev 4724) @@ -1,1789 +0,0 @@ -// File: OCCShapeAttributeSet.cxx -// Created: Thur Jul 10 2008 -// Author: Jane Hu - -#include <Standard_Stream.hxx> -#include <BRepTools.hxx> -#include "OCCShapeAttributeSet.hpp" -#include "CubitSimpleAttrib.hpp" -#include "OCCAttribSet.hpp" -//#include <Poly.hxx> -#include <TopoDS.hxx> -#include <TColStd_Array1OfReal.hxx> -#include <TColStd_HArray1OfInteger.hxx> -#include <TColgp_Array1OfPnt2d.hxx> -#include <BRep_GCurve.hxx> -#include <Handle_BRep_CurveOnClosedSurface.hxx> -#include <Handle_BRep_CurveOnSurface.hxx> -#include <TopAbs_ShapeEnum.hxx> -//#include <BRep_TFace.hxx> -//#include <BRep_TEdge.hxx> -//#include <BRep_TVertex.hxx> -#include <Handle_BRep_GCurve.hxx> -#include <BRep_Tool.hxx> -#include <TDF_ChildIterator.hxx> -#include <Handle_TDataStd_Shape.hxx> -#include <TopTools_LocationSet.hxx> -#include <TopTools_IndexedMapOfShape.hxx> -#include <TopoDS_Iterator.hxx> -//#include <BRep_CurveRepresentation.hxx> -#include <Poly_Polygon3D.hxx> -//#include <BRep_Polygon3D.hxx> -//#include <BRep_PolygonOnSurface.hxx> -//#include <BRep_PolygonOnClosedSurface.hxx> -//#include <BRep_PolygonOnTriangulation.hxx> -//#include <BRep_PolygonOnClosedTriangulation.hxx> -#include <BRep_CurveOnSurface.hxx> -#include <BRep_CurveOnClosedSurface.hxx> -//#include <BRep_ListOfCurveRepresentation.hxx> -//#include <BRep_ListIteratorOfListOfCurveRepresentation.hxx> -#include <BRep_PointOnCurve.hxx> -#include <BRep_PointOnCurveOnSurface.hxx> -#include <BRep_PointOnSurface.hxx> -//#include <BRep_ListIteratorOfListOfPointRepresentation.hxx> -#include <TDF_Label.hxx> -#include <TDataStd_Shape.hxx> -#include <Handle_TDataStd_Name.hxx>

1 0

r4723 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 07 Apr '11

07 Apr '11

Author: janehu Date: 2011-04-07 10:36:30 -0500 (Thu, 07 Apr 2011) New Revision: 4723 Added: cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp_3424 Modified: cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp Log: bug fix for handling attrib's string with space case. Modified: cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp 2011-04-07 15:35:11 UTC (rev 4722) +++ cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp 2011-04-07 15:36:30 UTC (rev 4723) @@ -421,22 +421,15 @@ DLIList<double> doubles; DLIList<int> ints; int c_num, length; - + char s; do { IS >> c_num; //length of name string - IS >> buffer; - if(buffer.length() >= c_num) - type = buffer.substr( 0, c_num ); //attribute name string - else + IS.get(); //' ' + type.clear(); + for(int j = 0; j < c_num; j ++) { - c_num -= buffer.length(); - type.append( buffer ); - do{ - IS >> buffer; - type.push_back(' '); - type.append(buffer.substr( 0, c_num )); - c_num -= (buffer.length() + 1); - }while (c_num > 0); + IS.get(s); + type.push_back(s); } CubitString* string_prt = new CubitString(type.c_str()); @@ -447,19 +440,12 @@ for(int i =0; i < length; i++) { IS >> c_num ; //length of each string - IS >> buffer; - if(buffer.length() >= c_num) - stringdata = buffer.substr( 0, c_num ); - else + IS.get(); //' ' + stringdata.clear(); + for(int j = 0; j < c_num; j ++) { - c_num -= buffer.length(); - stringdata.append( buffer ); - do{ - IS >> buffer; - stringdata.push_back(' '); - stringdata.append(buffer.substr( 0, c_num ));

1 0

r4722 - cgm/branches/merge-cubit12/test
by jiangtao_ma＠yahoo.com 07 Apr '11

07 Apr '11

Author: janehu Date: 2011-04-07 10:35:11 -0500 (Thu, 07 Apr 2011) New Revision: 4722 Modified: cgm/branches/merge-cubit12/test/r_w.cpp cgm/branches/merge-cubit12/test/unite1.occ cgm/branches/merge-cubit12/test/unite4.occ Log: Added some comments on the testcase; Changed for testing on string with space case. Modified: cgm/branches/merge-cubit12/test/r_w.cpp =================================================================== --- cgm/branches/merge-cubit12/test/r_w.cpp 2011-04-06 19:49:20 UTC (rev 4721) +++ cgm/branches/merge-cubit12/test/r_w.cpp 2011-04-07 15:35:11 UTC (rev 4722) @@ -333,6 +333,9 @@ num_ents_exported, cubit_version); assert(num_ents_exported == 1); + //name attributes in unite2.occ is + //CGM_ATTRIB 11 ENTITY_NAME 2 8 volume B 8 volume_B 0 0 + //so it changed to volume_B, and code needs use the second name attrib. bodies.clean_out(); gti->bodies(bodies); //delete all entities @@ -363,6 +366,7 @@ rsl = CubitCompat_export_solid_model(ref_entity_list, filename, filetype, num_ents_exported, cubit_version); assert(num_ents_exported == 1); + //CGM_ATTRIB 11 ENTITY_NAME 2 8 volume A 8 volume_A 0 0 in unite3.occ bodies.clean_out(); gti->bodies(bodies); @@ -391,6 +395,8 @@ num_ents_exported, cubit_version); assert(num_ents_exported == 1); + //CGM_ATTRIB 11 ENTITY_NAME 1 7 volumeA 0 0 in unite5.occ + bodies.clean_out(); gti->bodies(bodies); //delete all entities @@ -421,6 +427,8 @@ num_ents_exported, cubit_version); assert(num_ents_exported == 1); + //CGM_ATTRIB 11 ENTITY_NAME 1 7 volumeB 0 0 in unite6.occ + bodies.clean_out(); gti->bodies(bodies); //delete all entities Modified: cgm/branches/merge-cubit12/test/unite1.occ =================================================================== --- cgm/branches/merge-cubit12/test/unite1.occ 2011-04-06 19:49:20 UTC (rev 4721) +++ cgm/branches/merge-cubit12/test/unite1.occ 2011-04-07 15:35:11 UTC (rev 4722) @@ -594,7 +594,7 @@ * * * -CGM_ATTRIB 11 ENTITY_NAME 1 7 volumeB 0 0 +CGM_ATTRIB 11 ENTITY_NAME 1 8 volume B 0 0

1 0

r4717 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 06 Apr '11

06 Apr '11

Author: janehu Date: 2011-04-06 11:34:36 -0500 (Wed, 06 Apr 2011) New Revision: 4717 Removed: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo cgm/branches/merge-cubit12/geom/OCC/OCCHistory.o Modified: cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp Log: Changes the way CGM attributes are written and read for OCC engine. Passed testcases under cubit 12 trunk test directory. Deleted: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo 2011-04-06 16:32:00 UTC (rev 4716) +++ cgm/branches/merge-cubit12/geom/OCC/OCCHistory.lo 2011-04-06 16:34:36 UTC (rev 4717) @@ -1,12 +0,0 @@ -# OCCHistory.lo - a libtool object file -# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# Name of the PIC object. -pic_object=none - -# Name of the non-PIC object -non_pic_object='OCCHistory.o' - Deleted: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.o =================================================================== (Binary files differ) Modified: cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp 2011-04-06 16:32:00 UTC (rev 4716) +++ cgm/branches/merge-cubit12/geom/OCC/OCCShapeAttributeSet.cpp 2011-04-06 16:34:36 UTC (rev 4717) @@ -420,62 +420,69 @@ DLIList<CubitString*> strings; DLIList<double> doubles; DLIList<int> ints; + int c_num, length; + do { + IS >> c_num; //length of name string IS >> buffer; - std::string::size_type i = buffer.find_first_of("*"); - type = buffer.substr( 0, i ); + if(buffer.length() >= c_num) + type = buffer.substr( 0, c_num ); //attribute name string + else + { + c_num -= buffer.length(); + type.append( buffer ); + do{ + IS >> buffer; + type.push_back(' '); + type.append(buffer.substr( 0, c_num )); + c_num -= (buffer.length() + 1); + }while (c_num > 0); + }

1 0