Skip to content
Snippets Groups Projects
Commit 90c8424a authored by Elias Pipping's avatar Elias Pipping
Browse files

[Build ] Allow UG to be used

parent d957c7b7
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,7 @@ AM_CPPFLAGS = \ ...@@ -39,6 +39,7 @@ AM_CPPFLAGS = \
$(DUNE_CPPFLAGS) \ $(DUNE_CPPFLAGS) \
$(PYTHON_CPPFLAGS) \ $(PYTHON_CPPFLAGS) \
$(ALUGRID_CPPFLAGS) \ $(ALUGRID_CPPFLAGS) \
$(UG_CPPFLAGS) \
-I$(top_srcdir) -I$(top_srcdir)
# The libraries have to be given in reverse order (most basic libraries # The libraries have to be given in reverse order (most basic libraries
...@@ -46,10 +47,12 @@ AM_CPPFLAGS = \ ...@@ -46,10 +47,12 @@ AM_CPPFLAGS = \
LDADD = \ LDADD = \
$(DUNE_LDFLAGS) $(DUNE_LIBS) \ $(DUNE_LDFLAGS) $(DUNE_LIBS) \
$(ALUGRID_LIBS) \ $(ALUGRID_LIBS) \
$(UG_LIBS) \
$(PYTHON_LIBS) $(PYTHON_LIBS)
AM_LDFLAGS = \ AM_LDFLAGS = \
$(DUNE_LDFLAGS) \ $(DUNE_LDFLAGS) \
$(ALUGRID_LDFLAGS) \ $(ALUGRID_LDFLAGS) \
$(UG_LDFLAGS) \
$(PYTHON_LDFLAGS) $(PYTHON_LDFLAGS)
if CAIROMM if CAIROMM
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#endif #endif
#define WANT_ALUGRID 0 #define WANT_ALUGRID 0
#define WANT_UG 1
#define WANT_GRID WANT_ALUGRID #define WANT_GRID WANT_ALUGRID
...@@ -17,6 +18,14 @@ ...@@ -17,6 +18,14 @@
#pragma clang diagnostic pop #pragma clang diagnostic pop
using Grid = Dune::ALUGrid<MY_DIM, MY_DIM, Dune::simplex, Dune::nonconforming>; using Grid = Dune::ALUGrid<MY_DIM, MY_DIM, Dune::simplex, Dune::nonconforming>;
#elif WANT_GRID == WANT_UG
#if !HAVE_UG
#error UG was requested but not found
#endif
#include <dune/grid/uggrid.hh>
using Grid = Dune::UGGrid<MY_DIM>;
#else #else
#error requested a grid that does not exist #error requested a grid that does not exist
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment