Commit 2de4df16 authored by Andreas Nüßing's avatar Andreas Nüßing

[!34] [Grid] use UGGrid as the default grid manager

Merge branch 'feature/use-uggrid' into 'master'

instead of dune-alugrid which is licensed under GPL2, we use dune-uggrid as
the default grid manager, which is licensed unter LGPL-2.1

See merge request [duneuro/duneuro!34]

  [duneuro/duneuro!34]: gitlab.dune-project.org/duneuro/duneuro/merge_requests/34
parents 5a57d08d c06b02f4
......@@ -8,4 +8,4 @@ Version: 2.5-dev
Maintainer: andreas.nuessing@uni-muenster.de
#depending on
Depends: dune-common (>= 2.5) dune-grid (>= 2.5) dune-istl (>= 2.5) dune-pdelab (>= 2.5)
Suggests: dune-udg dune-subgrid dune-mc dune-alugrid (>= 2.5)
Suggests: dune-udg dune-subgrid dune-mc dune-uggrid (>= 2.5)
#ifndef DUNEURO_DEFAULTGRIDS_HH
#define DUNEURO_DEFAULTGRIDS_HH
#if HAVE_UG
#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
#include <duneuro/common/flags.hh>
......@@ -18,24 +15,20 @@ namespace duneuro
template <int d>
struct DefaultGrid<d, ElementType::hexahedron> {
enum { dim = d };
#if HAVE_DUNE_ALUGRID
using GridType = Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming>;
#elif HAVE_UG
#if HAVE_DUNE_UGGRID
using GridType = Dune::UGGrid<dim>;
#else
#error "no grid manager found. provide either dune-alugrid or ug"
#error "no grid manager found. provide ugggrid"
#endif
};
template <int d>
struct DefaultGrid<d, ElementType::tetrahedron> {
enum { dim = d };
#if HAVE_DUNE_ALUGRID
using GridType = Dune::ALUGrid<dim, dim, Dune::simplex, Dune::conforming>;
#elif HAVE_UG
#if HAVE_DUNE_UGGRID
using GridType = Dune::UGGrid<dim>;
#else
#error "no grid manager found. provide either dune-alugrid or ug"
#error "no grid manager found. provide ugggrid"
#endif
};
}
......
......@@ -8,8 +8,6 @@
#include <dune/grid/io/file/dgfparser.hh>
#include <dune/grid/io/file/gmshreader.hh>
#include <dune/alugrid/dgf.hh>
#include <duneuro/common/fitted_driver_data.hh>
#include <duneuro/common/volume_conductor.hh>
#include <duneuro/io/cauchy_grid_reader.hh>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment