[Dune] Dune gridtype patch für 2.0

Christian Engwer christi at uni-hd.de
Mon Apr 12 13:06:08 CEST 2010


Hi Robert,

> dieser Patch sollte noch zum dune-grid release 2.0 hinzugefügt
> werden aus Kompatibilitätsgründen.

I didn't like this patch from it's beginning and think it still needs
discussion. I will not merge this patch to the release. It is a
significant change.

Christian

> Index: m4/dune_gridtype.m4
> ===================================================================
> --- m4/dune_gridtype.m4	(revision 0)
> +++ m4/dune_gridtype.m4	(revision 0)
> @@ -0,0 +1,31 @@
> +# DUNE_OUTPUT_GRIDTYPE
> +# 
> +# Writes out 'gridtype.hh' and 'dgfgridtype.hh' for the project.
> +#
> +# If a project intends to use this magic, its configure.ac should contain a
> +# call to this macro (somewhere around AC_OUTPUT)
> +AC_DEFUN([DUNE_OUTPUT_GRIDTYPE],[
> +  GRIDTYPE_HH="gridtype.hh"
> +  AC_MSG_NOTICE([creating $GRIDTYPE_HH])
> +
> +  cat > $GRIDTYPE_HH << EOF
> +// Warning: Do not edit this file. It is generated automatically by the
> +//          module's configure script.
> +//
> +// If you want to edit the contents of this file, have a look at
> +// 'dune-grid/m4/dune_gridtype.m4'.
> +#include <dune/grid/utility/gridtype.hh> 
> +EOF
> +
> +  DGFGRIDTYPE_HH="dgfgridtype.hh"
> +  AC_MSG_NOTICE([creating $DGFGRIDTYPE_HH])
> +
> +  cat > $DGFGRIDTYPE_HH << EOF
> +// Warning: Do not edit this file. It is generated automatically by the
> +//          module's configure script.
> +//
> +// If you want to edit the contents of this file, have a look at
> +// 'dune-grid/m4/dune_gridtype.m4'.
> +#include <dune/grid/io/file/dgfparser/dgfgridtype.hh>
> +EOF
> +])
> Index: m4/Makefile.am
> ===================================================================
> --- m4/Makefile.am	(revision 6600)
> +++ m4/Makefile.am	(working copy)
> @@ -1,6 +1,6 @@
>  # $Id: Makefile.am 5184 2008-04-27 17:37:27Z christi $
>  
> -ALLM4S = dune_grid.m4 dune_griddim.m4 alberta.m4 alglib.m4 alugrid.m4 ug.m4 amiramesh.m4 grape.m4 psurface.m4 enable-old-numbering.m4
> +ALLM4S = dune_grid.m4 dune_griddim.m4 dune_gridtype.m4 alberta.m4 alglib.m4 alugrid.m4 ug.m4 amiramesh.m4 grape.m4 psurface.m4 enable-old-numbering.m4
>  
>  aclocaldir = $(datadir)/aclocal
>  aclocal_DATA = $(ALLM4S)
> Index: configure.ac
> ===================================================================
> --- configure.ac	(revision 6600)
> +++ configure.ac	(working copy)
> @@ -77,3 +77,4 @@
>      m4/Makefile
>      dune-grid.pc])
>  AC_OUTPUT
> +DUNE_OUTPUT_GRIDTYPE




More information about the Dune mailing list