diff --git a/CHANGELOG.md b/CHANGELOG.md index 3379fe01ff30b869fced59c9624a921e11a5a0fd..b9c59640d250bb3e6c3274c4850ec258d86c5d62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,12 @@ Differences Between DuMuX 2.9 and DuMuX 2.10 =================================================== * IMPORTANT NOTES: - - DuMuX 2.10 is expected to run based on either Dune 2.4.1 or Dune 3.0. We - will try to keep the compatibility with Dune 3.0 as long as it is - technically feasible and our resources allow it. If you want to use Dumux - multidomain models, you have to stick with the Dune 2.4 core and specific - versions of other modules, see `test/multidomain/README` for details. + - DuMuX 2.10 is expected to run based on Dune 2.4.1, 2.5 and the Dune + master. We will try to keep the compatibility with the Dune master + as long as it is technically feasible and our resources allow it. If + you want to use Dumux multidomain models, you have to stick with the + 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. diff --git a/CMakeLists.txt b/CMakeLists.txt index 0803ffa3cf5648e4e7a8a4df7c5b6e139096da43..7b8f856968e7ab06625cf9273e4fcad2baeb4d67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ add_subdirectory(dumux) add_subdirectory(test 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 # now ctest (aka make test) does not build the tests set(DUNE_TEST_MAGIC OFF) diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake index 4c9c8b2a973272c29e7ae2ccf2de3dcee7dc1e55..ef5d5381743ada68fdf2f60c6260f206d7ebfbe8 100644 --- a/cmake/modules/DumuxTestMacros.cmake +++ b/cmake/modules/DumuxTestMacros.cmake @@ -43,7 +43,7 @@ macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_sour endif() # add test - if(DUNE_COMMON_VERSION VERSION_LESS 3.0) + if(DUNE_COMMON_VERSION VERSION_LESS 2.5) # add test add_test(${dumux_test} ${dumux_test_args}) diff --git a/doc/handbook/CMakeLists.txt b/doc/handbook/CMakeLists.txt index 8326d1c12226a4bab7d72d46ed798ceeaa23cee4..c639c9fc34faa153faec412321b738a9d52f7204 100644 --- a/doc/handbook/CMakeLists.txt +++ b/doc/handbook/CMakeLists.txt @@ -39,8 +39,8 @@ set(TEX_IMAGES PNG/dunedesign.png ../logo/dumux_logo_hires_whitebg.png) -if(DUNE_COMMON_VERSION_MAJOR VERSION_LESS 3) - # this only works before dune 3.0 +if(DUNE_COMMON_VERSION VERSION_LESS 2.5) + # this only works before Dune 2.5 dune_add_latex_document(0_dumux-handbook.tex FATHER_TARGET doc DEFAULT_PDF @@ -51,7 +51,7 @@ if(DUNE_COMMON_VERSION_MAJOR VERSION_LESS 3) create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf ${CMAKE_INSTALL_DOCDIR}) 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 BIBFILES dumux-handbook.bib INPUTS ${TEX_INPUTS} @@ -59,5 +59,4 @@ else() create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf ${CMAKE_INSTALL_DOCDIR} 0_dumux-handbook) - endif() diff --git a/dumux/io/adaptivegridrestart.hh b/dumux/io/adaptivegridrestart.hh index 1823c9452d3ec4134be7e4cd70b3fe4bc15fe9b4..468f3188356b831f9f8ba5db5490996dea1af125 100644 --- a/dumux/io/adaptivegridrestart.hh +++ b/dumux/io/adaptivegridrestart.hh @@ -30,7 +30,7 @@ #endif #include -#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 3, 0) +#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2, 5) #include #endif @@ -107,7 +107,7 @@ public: #else double time = problem.timeManager().time(); problem.grid().template writeGrid -#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 3, 0) +#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2, 5) #endif // Dune < 3.0 (gridName, time);