[cgma-dev] Cubit 14
Paul Wilson
wilsonp at engr.wisc.edu
Tue Feb 4 15:23:41 CST 2014
Hi all,
Perhaps this sheds some light on the situation:
wilsonp at TodlawXPS ~/UW/research/software/cgm > find branches tags -depth
-maxdepth 1
branches/cubit
branches/cubit14.0
branches/merge-cubit12.2
branches/cgm13.1
branches/Version12.2
branches/merge-cubit13.1
branches/dispatch
branches/cubit13.1
branches/merge-cubit12
branches
tags/12.2.0b1
tags/13.1.0
tags/cubit10.2
tags/12.2.0
tags/13.1.1
tags
wilsonp at TodlawXPS ~/UW/research/software/cgm > find . -name "cgm_version.h"
./trunk/cgm_version.h
./tags/13.1.0/cgm_version.h
./tags/13.1.1/cgm_version.h
./branches/merge-cubit12.2/cgm_version.h
As you can see, there are many branches and tags, but only three of them
plus the trunk have the cgm_version.h file.
If I then search all the code for the use of CGM_MAJOR_VERSION, I get
the following:
trunk/cgm_version.h:1:#define CGM_MAJOR_VERSION 14
tags/12.2.0b1/geom/GeometryQueryTool.hpp:1059: static const int
CGM_MAJOR_VERSION;
tags/12.2.0b1/geom/GeometryQueryTool.cpp:91:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
tags/13.1.0/cgm_version.h:1:#define CGM_MAJOR_VERSION 13
tags/cubit10.2/geom/GeometryQueryTool.hpp:826: static const int
CGM_MAJOR_VERSION;
tags/cubit10.2/geom/GeometryQueryTool.cpp:81:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
tags/12.2.0/geom/GeometryQueryTool.hpp:1059: static const int
CGM_MAJOR_VERSION;
tags/12.2.0/geom/GeometryQueryTool.cpp:91:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
tags/13.1.1/cgm_version.h:1:#define CGM_MAJOR_VERSION 13
branches/cubit/geom/GeometryQueryTool.hpp:1037: static const int
CGM_MAJOR_VERSION;
branches/cubit/geom/GeometryQueryTool.cpp:91:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
branches/cubit14.0/geom/GeometryQueryTool.hpp:1075: static const int
CGM_MAJOR_VERSION;
branches/cubit14.0/geom/GeometryQueryTool.cpp:96:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 13;
branches/merge-cubit12.2/cgm_version.h:1:#define CGM_MAJOR_VERSION 12
branches/cgm13.1/geom/GeometryQueryTool.hpp:1117: static const int
CGM_MAJOR_VERSION;
branches/cgm13.1/geom/GeometryQueryTool.cpp:95:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 13;
branches/Version12.2/geom/GeometryQueryTool.hpp:1059: static const int
CGM_MAJOR_VERSION;
branches/Version12.2/geom/GeometryQueryTool.cpp:91:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
branches/merge-cubit13.1/geom/GeometryQueryTool.hpp:1077: static const
int CGM_MAJOR_VERSION;
branches/merge-cubit13.1/geom/GeometryQueryTool.cpp:95:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 13;
branches/dispatch/geom/GeometryQueryTool.hpp:1059: static const int
CGM_MAJOR_VERSION;
branches/dispatch/geom/GeometryQueryTool.cpp:91:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
branches/cubit13.1/geom/GeometryQueryTool.hpp:1077: static const int
CGM_MAJOR_VERSION;
branches/cubit13.1/geom/GeometryQueryTool.cpp:95:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
branches/merge-cubit12/geom/GeometryQueryTool.hpp:1059: static const
int CGM_MAJOR_VERSION;
branches/merge-cubit12/geom/GeometryQueryTool.cpp:91:const int
GeometryQueryTool::CGM_MAJOR_VERSION = 10;
Note: this variable does not appear to be used within CGM, although
there is probably some value in updating some of these locations that
currently carry the wrong value.
If I then search for CGM_MAJOR_VERSION in MOAB, I get:
wilsonp at TodlawXPS ~/UW/research/software/moab (master) > ack-grep
CGM_MAJOR_VERSION
src/io/ReadCGM.cpp
318:#if CGM_MAJOR_VERSION>13
329:#if CGM_MAJOR_VERSION>13
340:#if CGM_MAJOR_VERSION>13
380:#if CGM_MAJOR_VERSION>13
484:#if CGM_MAJOR_VERSION>12
So... it appears we may be the primary (only?) users of this variable as
the primary (only?) users of ReadCGM.
It seems that this could be resolved by a combination of removing some
outdated branches and backporting cgm_version.h into those branches that
remain.
Let us know how we can help?
Paul
On 01/29/2014 02:42 PM, Tim Tautges (ANL) wrote:
> Jane's off this week on personal leave, so we probably won't hear from
> her until next week.
>
> But, keep in mind that a) ReadCGM is part of MOAB, so that's in the
> mix too, and b) we can check for that file in the configure process
> and set a cpp variable accordingly.
>
> - tim
>
> On 01/29/2014 09:49 AM, Grindeanu, Iulian R. wrote:
>> Jane ? maybe there should be a better way of managing
>> versions/branches/releases/tags?
>> I can't answer any of those questions Andy and David have. I know
>> that there is a plan to move cgm on bitbucket, but the
>> releases/branches/tags will all be ported as they are now.
>> Iulian
>> _
>> ______________________________________
>> From: Andrew Davis [davisa at engr.wisc.edu]
>> Sent: Wednesday, January 29, 2014 9:27 AM
>> To: Grindeanu, Iulian R.; Paul Wilson; cgma-dev at mcs.anl.gov
>> Subject: Re: [cgma-dev] Cubit 14
>>
>> Hi Iulian
>>
>> cgmurl I can see, I doubt I have ever used it, why is there more than
>> one for cubit12.2?
>>
>> Also I was using 13.1 from branches (no cgm_version.h) , not 13.1.1
>> from tags (which has cgm_version.h)
>>
>> Out of curiosity, should there not be a 13.1.1 on branches? Perhaps now
>> that 13.1 is out of date you could replace it with
>> 13.1.1? Same for 12.2-merge?
>>
>> Andy
>>
>>
>> On 01/29/2014 09:19 AM, Grindeanu, Iulian R. wrote:
>>> buildbot uses these:
>>> cgmurl =
>>> 'https://svn.mcs.anl.gov/repos/ITAPS/cgm/branches/merge-cubit12.2'
>>> for cubit 12.2
>>>
>>> cgmurlt1311 = 'https://svn.mcs.anl.gov/repos/ITAPS/cgm/tags/13.1.1'
>>> for cubit 13.1
>>>
>>> cgmurltrunk = 'https://svn.mcs.anl.gov/repos/ITAPS/cgm/trunk'
>>> for Cubit14.0
>>>
>>> What versions are you using?
>>> What is not compiling for you?
>>>
>>> Iulian
>>> ________________________________________
>>> From: Paul Wilson [wilsonp at engr.wisc.edu]
>>> Sent: Wednesday, January 29, 2014 9:15 AM
>>> To: Andrew Davis; Grindeanu, Iulian R.; cgma-dev at mcs.anl.gov
>>> Subject: Re: [cgma-dev] Cubit 14
>>>
>>> Hi Andy,
>>>
>>> Can you remind me of the specific symptom? Is it the existence of the
>>> version file that needs to be backported (perhaps not), or is it the
>>> use
>>> of the version info to change the behavior that needs to be backported
>>> (perhaps)?
>>>
>>> Paul
>>>
>>> On 01/29/2014 09:10 AM, Andrew Davis wrote:
>>>> Hi Julian
>>>>
>>>> The SVN
>>>>
>>>> Andy
>>>>
>>>>
>>>> On 01/29/2014 09:07 AM, Grindeanu, Iulian R. wrote:
>>>>> I think that current branches (mergecubit12.2, trunk, ) all have that
>>>>> file; at least buildbot is not complaining.
>>>>> Are you using a release tar file or svn repo?
>>>>> ________________________________________
>>>>> From: cgma-dev-bounces at mcs.anl.gov [cgma-dev-bounces at mcs.anl.gov] on
>>>>> behalf of Andrew Davis [davisa at engr.wisc.edu]
>>>>> Sent: Wednesday, January 29, 2014 9:05 AM
>>>>> To: cgma-dev at mcs.anl.gov
>>>>> Subject: [cgma-dev] Cubit 14
>>>>>
>>>>> This is question kind of linked to both CGM and MOAB
>>>>>
>>>>> Jane fixed readCGM.cpp in MOAB, however this fix only works for CGM,
>>>>> since it relies on cgm_version.h, which was included in CGM14.0,
>>>>> however, when we compile with any version previous we do not have
>>>>> this
>>>>> header file availble to us. Would it be possible to back port the
>>>>> cgm_version.h file back into previous CGM releases?
>>>>>
>>>>> Thanks
>>>>>
>>>>> Andy
>>> --
>>> -- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ --
>>> Paul Wilson ~ UW-Madison ~ 608-263-0807 ~ cal: http://bit.ly/pphw-cal
>>> Professor, Engineering Physics. ~ http://cnerg.engr.wisc.edu
>>> Faculty Director, Advanced Computing Infrastructure
>>>
>>>
>>
>
--
-- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ --
Paul Wilson ~ UW-Madison ~ 608-263-0807 ~ cal: http://bit.ly/pphw-cal
Professor, Engineering Physics. ~ http://cnerg.engr.wisc.edu
Faculty Director, Advanced Computing Infrastructure
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 6244 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.mcs.anl.gov/pipermail/cgma-dev/attachments/20140204/7018fb17/attachment.bin>
More information about the cgma-dev
mailing list