Commit 55f82e30 authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

Prepare for upstream version change from Dune 3.0 to 2.5

Should even work when they stick to version 3.0, but
not vice versa.
parent dfa111f5
...@@ -2,11 +2,12 @@ Differences Between DuMuX 2.9 and DuMuX 2.10 ...@@ -2,11 +2,12 @@ Differences Between DuMuX 2.9 and DuMuX 2.10
=================================================== ===================================================
* IMPORTANT NOTES: * IMPORTANT NOTES:
- DuMuX 2.10 is expected to run based on either Dune 2.4.1 or Dune 3.0. We - DuMuX 2.10 is expected to run based on Dune 2.4.1, 2.5 and the Dune
will try to keep the compatibility with Dune 3.0 as long as it is master. We will try to keep the compatibility with the Dune master
technically feasible and our resources allow it. If you want to use Dumux as long as it is technically feasible and our resources allow it. If
multidomain models, you have to stick with the Dune 2.4 core and specific you want to use Dumux multidomain models, you have to stick with the
versions of other modules, see `test/multidomain/README` for details. Dune 2.4 core and specific versions of other modules, see
`test/multidomain/README` for details.
- DuMux 2.10 requires at least GCC 4.9 or Clang 3.5 in their C++-14 mode. - DuMux 2.10 requires at least GCC 4.9 or Clang 3.5 in their C++-14 mode.
......
...@@ -32,7 +32,7 @@ add_subdirectory(dumux) ...@@ -32,7 +32,7 @@ add_subdirectory(dumux)
add_subdirectory(test EXCLUDE_FROM_ALL) add_subdirectory(test EXCLUDE_FROM_ALL)
add_subdirectory(tutorial EXCLUDE_FROM_ALL) add_subdirectory(tutorial EXCLUDE_FROM_ALL)
if(DUNE_COMMON_VERSION_MAJOR VERSION_LESS 3) if(DUNE_COMMON_VERSION VERSION_LESS 2.5)
# de-activate testing the DUNE way # de-activate testing the DUNE way
# now ctest (aka make test) does not build the tests # now ctest (aka make test) does not build the tests
set(DUNE_TEST_MAGIC OFF) set(DUNE_TEST_MAGIC OFF)
......
...@@ -43,7 +43,7 @@ macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_sour ...@@ -43,7 +43,7 @@ macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_sour
endif() endif()
# add test # add test
if(DUNE_COMMON_VERSION VERSION_LESS 3.0) if(DUNE_COMMON_VERSION VERSION_LESS 2.5)
# add test # add test
add_test(${dumux_test} ${dumux_test_args}) add_test(${dumux_test} ${dumux_test_args})
......
...@@ -39,8 +39,8 @@ set(TEX_IMAGES ...@@ -39,8 +39,8 @@ set(TEX_IMAGES
PNG/dunedesign.png PNG/dunedesign.png
../logo/dumux_logo_hires_whitebg.png) ../logo/dumux_logo_hires_whitebg.png)
if(DUNE_COMMON_VERSION_MAJOR VERSION_LESS 3) if(DUNE_COMMON_VERSION VERSION_LESS 2.5)
# this only works before dune 3.0 # this only works before Dune 2.5
dune_add_latex_document(0_dumux-handbook.tex dune_add_latex_document(0_dumux-handbook.tex
FATHER_TARGET doc FATHER_TARGET doc
DEFAULT_PDF DEFAULT_PDF
...@@ -51,7 +51,7 @@ if(DUNE_COMMON_VERSION_MAJOR VERSION_LESS 3) ...@@ -51,7 +51,7 @@ if(DUNE_COMMON_VERSION_MAJOR VERSION_LESS 3)
create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf
${CMAKE_INSTALL_DOCDIR}) ${CMAKE_INSTALL_DOCDIR})
else() else()
# the dune 3.0 way of calling these macros # the Dune 2.5 way of calling these macros
dune_add_latex_document(0_dumux-handbook.tex dune_add_latex_document(0_dumux-handbook.tex
BIBFILES dumux-handbook.bib BIBFILES dumux-handbook.bib
INPUTS ${TEX_INPUTS} INPUTS ${TEX_INPUTS}
...@@ -59,5 +59,4 @@ else() ...@@ -59,5 +59,4 @@ else()
create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf
${CMAKE_INSTALL_DOCDIR} 0_dumux-handbook) ${CMAKE_INSTALL_DOCDIR} 0_dumux-handbook)
endif() endif()
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#endif #endif
#include <dune/grid/common/backuprestore.hh> #include <dune/grid/common/backuprestore.hh>
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 3, 0) #if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2, 5)
#include <dune/grid/utility/grapedataioformattypes.hh> #include <dune/grid/utility/grapedataioformattypes.hh>
#endif #endif
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
#else #else
double time = problem.timeManager().time(); double time = problem.timeManager().time();
problem.grid().template writeGrid problem.grid().template writeGrid
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 3, 0) #if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2, 5)
<Dune::xdr> <Dune::xdr>
#endif // Dune < 3.0 #endif // Dune < 3.0
(gridName, time); (gridName, time);
......
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