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

r4653 - cgm/branches/merge-cubit12/geom/OCC
by jiangtao_ma＠yahoo.com 25 Mar '11

25 Mar '11

Author: janehu Date: 2011-03-25 14:40:47 -0500 (Fri, 25 Mar 2011) New Revision: 4653 Added: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.cpp cgm/branches/merge-cubit12/geom/OCC/OCCHistory.hpp cgm/branches/merge-cubit12/geom/OCC/occ_attrib_history.cpp cgm/branches/merge-cubit12/geom/OCC/occ_attrib_history.hpp Log: Added file prototypes for history tracking. Added: cgm/branches/merge-cubit12/geom/OCC/OCCHistory.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCHistory.cpp (rev 0) +++ cgm/branches/merge-cubit12/geom/OCC/OCCHistory.cpp 2011-03-25 19:40:47 UTC (rev 4653) @@ -0,0 +1,580 @@ + +#include "OCCHistory.hpp" +#include "OCCQueryEngine.hpp" +#include "CubitMessage.hpp" +#include "RefEntity.hpp" +#include "occ_attrib_history.hpp" +#include "CGMHistory.hpp" +#include "GeometryQueryTool.hpp" + +/*Here's a brief description of how the history is created in the + * OCC port: + * 1. Create an OCCHistory object. + * + * 2. TopologyBridges are given to the port for modification. From + * the TopologyBridges, get all associated parent and child TopologyBridges. + * From each TopologyBridge, get a) the corresponding RefEntity + * and b) the corresponding TopoDS_Shape(s). + * + * 3. On every OCC TopoDS_Shape, attach an attrib_history attribute. + * The attrib_history basically holds a unique 'tracking' integer. + * + * 4. Populate the refentity_tracking_id_map in the OCCHistory object, with + * pairs, where each pair consists of a RefEntity pointer and it's associated + * tracking id, in #3. + * + * 5. OCC performs the operation(s), making callbacks into the + * occ_attrib_history's overloaded functions. It does the following: + * -For split_owner callbacks, where A is split into A and B, + * put a history attrib on B and add A's tracking integer to B. + * -For merge_owner callbacks, where A and B are merged into A, + * add B's tracking id to A. Now A will have 2 tracking ids + * associated with it. + * -In the copying callback macros, if B has been copied from A, give B + * the tracking id that was in A. + * -For the other callbacks, replace_owner, lop_change_owner, and + * replace_owner_geometry, add an OCCEvent to the OCCHistory object's + * event list. + * + * 6. Once the operation has ended and TopologyBridges have been created + * from the new TopoDS_Shape's (populate_topology_bridges has been called), for + * each TopologyBridge, create a pair consisting of + * a set of tracking ids and a TopologyBridge pointer. + * + * 7. Find pairs in #6 that have any tracking id in common in their sets. + * If you find multiple pairs who's sets in size, you have a subdivision-absorption + * event (n->m). If you only find a single pair that has a set with

1 0

r4652 - in cgm/branches/merge-cubit12: geom/OCC test
by jiangtao_ma＠yahoo.com 25 Mar '11

25 Mar '11

Author: janehu Date: 2011-03-25 14:32:00 -0500 (Fri, 25 Mar 2011) New Revision: 4652 Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.hpp cgm/branches/merge-cubit12/test/makept.cpp cgm/branches/merge-cubit12/test/modify.cpp cgm/branches/merge-cubit12/test/operation.cpp Log: Updated cubit12 branch for prototypes of history track; made some minor changes. make check passed 10 testcases, failed makept, modify and test_occ. Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp 2011-03-25 18:16:55 UTC (rev 4651) +++ cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp 2011-03-25 19:32:00 UTC (rev 4652) @@ -295,6 +295,15 @@ bodies.append(myBodyPtr); } +BodySM* OCCLump::get_body() const +{ + if(mySheetSurface) + return mySheetSurface->my_body(); + if(myShell) + return myShell->my_body(); + return myBodyPtr; +} + void OCCLump::get_children_virt(DLIList<TopologyBridge*> &shellsms) { if (mySheetSurface) Modified: cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp 2011-03-25 18:16:55 UTC (rev 4651) +++ cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp 2011-03-25 19:32:00 UTC (rev 4652) @@ -140,7 +140,7 @@ virtual void get_parents_virt( DLIList<TopologyBridge*>& parents ); virtual void get_children_virt( DLIList<TopologyBridge*>& children ); - inline BodySM* get_body() const { return myBodyPtr; } + BodySM* get_body() const; inline void remove_body() {myBodyPtr = 0;} Modified: cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2011-03-25 18:16:55 UTC (rev 4651) +++ cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp 2011-03-25 19:32:00 UTC (rev 4652) @@ -131,6 +131,7 @@ #include "OCCCurve.hpp" #include "OCCPoint.hpp" #include "OCCAttribSet.hpp" +#include "OCCHistory.hpp" #include "CubitFileIOWrapper.hpp" #include "Body.hpp" #include "GfxDebug.hpp" @@ -1737,6 +1738,17 @@ //=============================================================================== BodySM* OCCModifyEngine::copy_body ( BodySM* bodyPtr ) const {

1 0

Re: [cgma-dev] help with tarballs
by Mark Miller 24 Mar '11

24 Mar '11

Hi All, Ok, this was indeed pilot error; the result of using tar's -m option (which sets modification time to time the file was extracted) to untar the tarball. Mark On Thu, 2011-03-24 at 08:47, Mark Miller wrote: > Hold on. I think this may be pilot error. I'll confirm... > > Mark > > On Thu, 2011-03-24 at 08:44, Mark Miller wrote: > > In last 24 hours, cgm-nightly tarball has changed such that I cannot > > build without also having autoconf-2.62. In addition, untar dir name > > changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, > > however, the version number has apparently not changed. > > > > What are right URLs to download specific past released versions and > > specific, past nightly versions? > > > > Mark -- Mark C. Miller, Lawrence Livermore National Laboratory ================!!LLNL BUSINESS ONLY!!================ miller86(a)llnl.gov urgent: miller86(a)pager.llnl.gov T:8-6 (925)-423-5901 M/W/Th:7-12,2-7 (530)-753-8511

1 0

Re: [cgma-dev] help with tarballs
by Tim Tautges 24 Mar '11

24 Mar '11

For now, continue to point to the latest nightly tarball; we autotest nightly, so that should catch most things. If it's more than a few weeks we can put an RC somewhere. - tim On 03/24/2011 11:00 AM, Mark Miller wrote: > So, how can I point to specific tarballs known to work for me in the > past? Should I just store away my own copy somewhere else? > > Mark > > On Thu, 2011-03-24 at 08:54, Jason Kraftcheck wrote: >> On 03/24/2011 10:44 AM, Mark Miller wrote: >>> In last 24 hours, cgm-nightly tarball has changed such that I cannot >>> build without also having autoconf-2.62. >> >> If you need autoconf at all then the tarball was not generated correctly. >> >> - jason >> >> >>> In addition, untar dir name >>> changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, >>> however, the version number has apparently not changed. >>> >>> What are right URLs to download specific past released versions and >>> specific, past nightly versions? >>> >>> Mark >>> -- ================================================================ "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] help with tarballs
by Mark Miller 24 Mar '11

24 Mar '11

So, how can I point to specific tarballs known to work for me in the past? Should I just store away my own copy somewhere else? Mark On Thu, 2011-03-24 at 08:54, Jason Kraftcheck wrote: > On 03/24/2011 10:44 AM, Mark Miller wrote: > > In last 24 hours, cgm-nightly tarball has changed such that I cannot > > build without also having autoconf-2.62. > > If you need autoconf at all then the tarball was not generated correctly. > > - jason > > > > In addition, untar dir name > > changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, > > however, the version number has apparently not changed. > > > > What are right URLs to download specific past released versions and > > specific, past nightly versions? > > > > Mark > > -- Mark C. Miller, Lawrence Livermore National Laboratory ================!!LLNL BUSINESS ONLY!!================ miller86(a)llnl.gov urgent: miller86(a)pager.llnl.gov T:8-6 (925)-423-5901 M/W/Th:7-12,2-7 (530)-753-8511

1 0

Re: [cgma-dev] help with tarballs
by Tim Tautges 24 Mar '11

24 Mar '11

At best, right now CGM's release process is almost non-existent. We're hoping to change that in the next couple of weeks, though, with the release of cgm-12.2. It's waiting on a few improvements to the OCC port. - tim On 03/24/2011 10:44 AM, Mark Miller wrote: > In last 24 hours, cgm-nightly tarball has changed such that I cannot > build without also having autoconf-2.62. In addition, untar dir name > changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, > however, the version number has apparently not changed. > > What are right URLs to download specific past released versions and > specific, past nightly versions? > > Mark > -- ================================================================ "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] help with tarballs
by Mark Miller 24 Mar '11

24 Mar '11

This is what I am seeing when I try to make now that I didn't see before yesterday... + make -j2 CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/sh /scratch/visit/itaps/1.2RC/tools/cgm-10.2.3/missing --run autoconf cd . && /bin/sh /scratch/visit/itaps/1.2RC/tools/cgm-10.2.3/missing --run automake-1.11 --foreign /scratch/visit/itaps/1.2RC/tools/cgm-10.2.3/missing: line 52: automake-1.11: command not found WARNING: `automake-1.11' is missing on your system. You should only need it if you modified `Makefile.am', `acinclude.m4' or `configure.ac'. You might want to install the `Automake' and `Perl' packages. Grab them from any GNU archive site. aclocal.m4:20: warning: this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'. configure.ac:10: error: Autoconf version 2.62 or higher is required aclocal.m4:518: AM_INIT_AUTOMAKE is expanded from... configure.ac:10: the top level On Thu, 2011-03-24 at 08:44, Mark Miller wrote: > In last 24 hours, cgm-nightly tarball has changed such that I cannot > build without also having autoconf-2.62. In addition, untar dir name > changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, > however, the version number has apparently not changed. > > What are right URLs to download specific past released versions and > specific, past nightly versions? > > Mark -- Mark C. Miller, Lawrence Livermore National Laboratory ================!!LLNL BUSINESS ONLY!!================ miller86(a)llnl.gov urgent: miller86(a)pager.llnl.gov T:8-6 (925)-423-5901 M/W/Th:7-12,2-7 (530)-753-8511

1 0

Re: [cgma-dev] help with tarballs
by Jason Kraftcheck 24 Mar '11

24 Mar '11

On 03/24/2011 10:44 AM, Mark Miller wrote: > In last 24 hours, cgm-nightly tarball has changed such that I cannot > build without also having autoconf-2.62. If you need autoconf at all then the tarball was not generated correctly. - jason > In addition, untar dir name > changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, > however, the version number has apparently not changed. > > What are right URLs to download specific past released versions and > specific, past nightly versions? > > Mark > -- "A foolish consistency is the hobgoblin of little minds" - Ralph Waldo Emerson

1 0

Re: [cgma-dev] help with tarballs
by Mark Miller 24 Mar '11

24 Mar '11

Hold on. I think this may be pilot error. I'll confirm... Mark On Thu, 2011-03-24 at 08:44, Mark Miller wrote: > In last 24 hours, cgm-nightly tarball has changed such that I cannot > build without also having autoconf-2.62. In addition, untar dir name > changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, > however, the version number has apparently not changed. > > What are right URLs to download specific past released versions and > specific, past nightly versions? > > Mark -- Mark C. Miller, Lawrence Livermore National Laboratory ================!!LLNL BUSINESS ONLY!!================ miller86(a)llnl.gov urgent: miller86(a)pager.llnl.gov T:8-6 (925)-423-5901 M/W/Th:7-12,2-7 (530)-753-8511

1 0

help with tarballs
by Mark Miller 24 Mar '11

24 Mar '11

In last 24 hours, cgm-nightly tarball has changed such that I cannot build without also having autoconf-2.62. In addition, untar dir name changed from cgma-10.2.3 to cgm-10.2.3 (missing the 'a'). Ironically, however, the version number has apparently not changed. What are right URLs to download specific past released versions and specific, past nightly versions? Mark -- Mark C. Miller, Lawrence Livermore National Laboratory ================!!LLNL BUSINESS ONLY!!================ miller86(a)llnl.gov urgent: miller86(a)pager.llnl.gov T:8-6 (925)-423-5901 M/W/Th:7-12,2-7 (530)-753-8511

1 0