Merge branch 'cleanup/remove-exper-grid-extensions' into 'master'

Cleanup/remove exper grid extensions

See merge request !1894

cmake.opts

@@ -56,5 +56,4 @@ CMAKE_FLAGS="$SPECIFIC_COMPILER $SPECIFIC_GENERATOR $OPM_FLAGS
 -DCMAKE_CXX_FLAGS_RELWITHDEBINFO='$GXX_RELEASE_OPTS $GXX_RELEASE_WARNING_OPTS -g -ggdb -Wall $DUMUX_DISABLE_PROP_MACROS'
 -DCMAKE_BUILD_TYPE=Release
 -DENABLE_HEADERCHECK=$DUMUX_ENABLE_HEADERCHECK
--DDUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS:BOOL=TRUE
 "

dumux/io/grid/gridmanager_alu.hh

@@ -231,8 +231,6 @@ public:
     }
 };
 
-#if DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS
-
 //! alu uses boundary id
 template<int dim, int dimworld, Dune::ALUGridElementType elType, Dune::ALUGridRefinementType refinementType>
 class BoundaryFlag<Dune::ALUGrid<dim, dimworld, elType, refinementType>>
@@ -255,7 +253,6 @@ private:
     int flag_;
 };
 
-#endif // DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS
 #endif // HAVE_DUNE_ALUGRID
 
 } // end namespace Dumux

test/porousmediumflow/co2/implicit/CMakeLists.txt

@@ -9,7 +9,7 @@ dumux_add_test(NAME test_co2_box
               LABELS porousmediumflow co2
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousBox
-              CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
+              CMAKE_GUARD "( dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_co2_box-reference.vtu
@@ -21,7 +21,7 @@ dumux_add_test(NAME test_co2_tpfa
               LABELS porousmediumflow co2
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousCCTpfa
-              CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
+              CMAKE_GUARD "( dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_co2_tpfa-reference.vtu
@@ -34,7 +34,7 @@ dumux_add_test(NAME test_co2ni_box
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousNIBox
                                   ISOTHERMAL=0
-              CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
+              CMAKE_GUARD "( dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_co2ni_box-reference.vtu
@@ -47,7 +47,7 @@ dumux_add_test(NAME test_co2ni_tpfa
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousNICCTpfa
                                   ISOTHERMAL=0
-              CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
+              CMAKE_GUARD "( dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_co2ni_tpfa-reference.vtu