[Dune-devel] [Dune-Commit] [Commit] dune-grid - 657029a: Make 2.2 release work with current UG. The macro HAVE_UG_PATCH9 is not available. Moreover, it would not work with patch level 10 then.

[Peter Bastian]

Actually it does not work for me. Neither on my Mac nor on
LINUX. Trying to compile dune release 2.2.1 (i.e. the tag v2.2.1) with a 
freshly *checkout out*
UG (is that the problem?) produces:

In file included from ../../../dune/grid/common/boundarysegment.hh:6:0,
                  from ../../../dune/grid/uggrid.hh:17,
                  from uggridintersections.cc:5:
/export/home/FCEP/FCEP001/dune-test22/dune-common/dune/common/fvector.hh:20:2: 
warning: #warning The FieldVector class exports its size by the enum 
member 'size'. This behavior is deprecated. In the future, 'size' will 
be a method, which puts it in compliance with the stl conventions. To 
enable the new behavior (and get rid of this warning), build your Dune 
with --enable-fieldvector-size-is-method. If you do need the vector size 
as an enum, use 'dimension'. [-Wcpp]
In file included from ../../../dune/grid/uggrid.hh:46:0,
                  from uggridintersections.cc:5:
../../../dune/grid/uggrid/ugincludes.hh:15:16: fatal error: gm.h: No 
such file or directory
compilation terminated.

Working with the release 2.2 branch where the #ifdef HAVE_UG_PATCH9
switches between including ug/gm.h and gm.h also did not work
because the Macro HAVE_UG_PATCH9 is not defined.

-- Peter

Am 13.10.13 19:29, schrieb Oliver Sander:
> No, there is not.  Actually, the release branch works nicely with UG-patch10.
> (HAVE_UG_PATCH9 actually means "patch9 or later").  The attached patch reverts
> the change.  Please somebody apply it for me, as I keep getting
>
> remote: FATAL: C refs/heads/release-2.2 dune-grid sander DENIED by fallthru
> remote: error: hook declined to update refs/heads/release-2.2
>
> when pushing, which I don't understand.
>
> Best,
> Oliver
>
> Am 13.10.2013 15:22, schrieb Markus Blatt:
>> Hi,
>>
>> is there a special reason to drop support of a grid version in a
>> release? According to our build sysren tests, users need at least
>> patch level 7, but this changeset breaks compilation for all patch
>> levels <9.
>>
>> Shouldn't we rather replace "#if 1" with "#if defined(HAVE_UG_PATCH9)
>> || defined(HAVE_UG_PATCH10)"?
>>
>> Markus
>> On Thu, Oct 10, 2013 at 08:45:41PM +0200, Peter Bastian wrote:
>>> New commit, appeared at Thu Oct 10 20:45:41 2013 +0200
>>> as part of the following ref changes:
>>>
>>>      branch refs/heads/releases/2.2    updated from fe2b741 -> 657029a
>>>
>>> Browsable version: http://cgit.dune-project.org/repositories/dune-grid/commit/?id=657029a73b032aa76f410349c98d4ea33bd991ff
>>>
>>> ======================================================================
>>>
>>> commit 657029a73b032aa76f410349c98d4ea33bd991ff
>>> Author: Peter Bastian <peter.bastian at iwr.uni-heidelberg.de>
>>> Date:   Thu Oct 10 20:43:57 2013 +0200
>>>
>>>      Make 2.2 release work with current UG.
>>>      The macro HAVE_UG_PATCH9 is not available. Moreover, it
>>>      would not work with patch level 10 then.
>>>
>>>   dune/grid/uggrid/ugincludes.hh | 4 +---
>>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>>
>>>
>>>
>>> diff --git a/dune/grid/uggrid/ugincludes.hh b/dune/grid/uggrid/ugincludes.hh
>>> index 42fd39c..fc3ddf8 100644
>>> --- a/dune/grid/uggrid/ugincludes.hh
>>> +++ b/dune/grid/uggrid/ugincludes.hh
>>> @@ -12,7 +12,7 @@
>>>      therein.
>>>    */
>>>   
>>> -#ifdef HAVE_UG_PATCH9
>>> +#if 1
>>>   
>>>   #include <ug/gm.h>
>>>   #include <ug/std_domain.h>
>>> @@ -53,5 +53,3 @@
>>>   #endif
>>>   
>>>   #endif
>>> -
>>> -#endif
>>>
>>> _______________________________________________
>>> Dune-Commit mailing list
>>> Dune-Commit at dune-project.org
>>> http://lists.dune-project.org/mailman/listinfo/dune-commit
>>>
>
>
> _______________________________________________
> Dune-devel mailing list
> Dune-devel at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-devel


-- 
------------------------------------------------------------
Peter Bastian
Interdisziplinäres Zentrum für Wissenschaftliches Rechnen
Universität Heidelberg
Im Neuenheimer Feld 368
D-69120 Heidelberg
Tel: 0049 (0) 6221 548261
Fax: 0049 (0) 6221 548884
email: peter.bastian at iwr.uni-heidelberg.de
web: http://conan.iwr.uni-heidelberg.de/people/peter/

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20131014/23d0c4b7/attachment.htm>