diff --git a/dumux/common/gridcapabilities.hh b/dumux/common/gridcapabilities.hh
index be3ba8c49c49700b8229c7f7481332384f462df5..1ed27e7dea37f178c84be32bdc3b37c94a9f5750 100644
--- a/dumux/common/gridcapabilities.hh
+++ b/dumux/common/gridcapabilities.hh
@@ -31,12 +31,12 @@
// (https://gitlab.dune-project.org/core/dune-grid/issues/78),
// it should be guarded by a DUNE_VERSION macro and removed later.
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
namespace Dune {
template<int dim>
class UGGrid;
} // end namespace Dumux
-#endif // HAVE_UG
+#endif // HAVE_DUNE_UGGRID
namespace Dumux::Temp::Capabilities {
@@ -46,13 +46,13 @@ struct canCommunicate
static const bool v = false;
};
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<int dim, int codim>
struct canCommunicate<Dune::UGGrid<dim>, codim>
{
static const bool v = true;
};
-#endif // HAVE_UG
+#endif // HAVE_DUNE_UGGRID
} // namespace Dumux::Temp::Capabilities
// end workaround
diff --git a/dumux/io/grid/gmshgriddatahandle.hh b/dumux/io/grid/gmshgriddatahandle.hh
index fcdf4cf8995f85f57d7b455c4ffbccf51cc2d3a4..b8af221b7cc80ffa4dc5d429693836a91fca2412 100644
--- a/dumux/io/grid/gmshgriddatahandle.hh
+++ b/dumux/io/grid/gmshgriddatahandle.hh
@@ -34,7 +34,7 @@
#include <dune/grid/common/datahandleif.hh>
// UGGrid specific includes
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
@@ -124,7 +124,7 @@ private:
mutable std::map< typename IdSet::IdType, typename Data::value_type> data_;
};
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
/*!
* \ingroup InputOutput
@@ -202,7 +202,7 @@ private:
mutable std::map< typename IdSet::IdType, typename Data::value_type> data_;
};
-#endif // HAVE_UG
+#endif // HAVE_DUNE_UGGRID
} // namespace Dumux
diff --git a/dumux/io/grid/griddata.hh b/dumux/io/grid/griddata.hh
index c36c7762717e86012062e32fd40e10f1a24d9d2c..e871b29a8fe76dd53b739aac85b7a5839b5d5358 100644
--- a/dumux/io/grid/griddata.hh
+++ b/dumux/io/grid/griddata.hh
@@ -37,7 +37,7 @@
#include <dumux/io/vtk/vtkreader.hh>
// UGGrid specific includes
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
@@ -50,7 +50,7 @@ namespace Detail {
template<class Grid>
struct isUG : public std::false_type {};
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<int dim>
struct isUG<Dune::UGGrid<dim>> : public std::true_type {};
#endif
diff --git a/dumux/io/grid/gridmanager_ug.hh b/dumux/io/grid/gridmanager_ug.hh
index a112d97c533eab8442367d52830858f6e35296f2..ab9b043c5bf8f1e98d6506d38825cbde4c53fba1 100644
--- a/dumux/io/grid/gridmanager_ug.hh
+++ b/dumux/io/grid/gridmanager_ug.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_IO_GRID_MANAGER_UG_HH
#define DUMUX_IO_GRID_MANAGER_UG_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#endif
@@ -35,7 +35,7 @@
namespace Dumux {
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
/*!
* \ingroup InputOutput
@@ -175,7 +175,7 @@ private:
}
};
-#endif // HAVE_UG
+#endif // HAVE_DUNE_UGGRID
} // end namespace Dumux
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/properties.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/properties.hh
index 03f5bea27ffc6da4024ad81d4615501d3335d020..db50d17519fca541996dd80c8226735864ce532d 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/properties.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/properties.hh
@@ -34,7 +34,7 @@
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
@@ -78,7 +78,7 @@ struct GridImp<Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming>, dim>
};
#endif
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<int dim>
struct GridImp<Dune::UGGrid<dim>, dim>
{
diff --git a/test/freeflow/shallowwater/poiseuilleflow/properties.hh b/test/freeflow/shallowwater/poiseuilleflow/properties.hh
index 3b919b83ddcc4a23a3ef270ad6cf9a3f63bd1ec5..0097bb015470290f47f0262730a32ccdd769eb3b 100644
--- a/test/freeflow/shallowwater/poiseuilleflow/properties.hh
+++ b/test/freeflow/shallowwater/poiseuilleflow/properties.hh
@@ -23,7 +23,7 @@
#include <dumux/freeflow/shallowwater/model.hh>
#include <dumux/discretization/cctpfa.hh>
#include <dune/grid/yaspgrid.hh>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
diff --git a/test/io/gridmanager/test_gridmanager_cake.cc b/test/io/gridmanager/test_gridmanager_cake.cc
index afdd70bce16226a2fe8a5ece32699ebc623b1cdb..729834e5298fe9467d3966dc9b8ee85260ae6ba7 100644
--- a/test/io/gridmanager/test_gridmanager_cake.cc
+++ b/test/io/gridmanager/test_gridmanager_cake.cc
@@ -32,7 +32,7 @@
#include <dumux/io/grid/gridmanager.hh>
#include <dumux/io/grid/cakegridmanager.hh>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
@@ -45,7 +45,7 @@
#endif
// The grid type
-#if HAVE_UG && USEUG==1
+#if HAVE_DUNE_UGGRID && USEUG==1
template<int dim>
using Grid = Dune::UGGrid<dim>;
#elif HAVE_DUNE_ALUGRID
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
index 7e811c87990400765e4413160f0d6379e0e1245f..237ec5e83202c52976031b993139d3749ae10625 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
@@ -1,7 +1,7 @@
dumux_add_test(NAME test_md_embedded_1d3d_1p2c_richards2c
LABELS multidomain multidomain_embedded 1pnc richardsnc
SOURCES main.cc
- CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )"
+ CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )"
TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh
index 0097559513c8f46dc8121df512b612cae41c3035..30736ee640587356462282e0c89bd7f55406495a 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/properties.hh
@@ -55,7 +55,7 @@ struct Soil { using InheritsFrom = std::tuple<RichardsNC, CCTpfaModel>; };
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::Soil> { using type = Dune::UGGrid<3>; };
#else
diff --git a/test/porousmediumflow/1p/convergence/analyticsolution/properties.hh b/test/porousmediumflow/1p/convergence/analyticsolution/properties.hh
index 46048a9b9d994c4e1b36efcd9e31599554a65b8f..5db8dbaeb76035a9d024ddb5b4f5fee87382a38f 100644
--- a/test/porousmediumflow/1p/convergence/analyticsolution/properties.hh
+++ b/test/porousmediumflow/1p/convergence/analyticsolution/properties.hh
@@ -25,7 +25,7 @@
#define DUMUX_CONVERGENCE_TEST_ONEP_PROPERTIES_HH
#include <dune/grid/yaspgrid.hh>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
diff --git a/test/porousmediumflow/1p/incompressible/properties.hh b/test/porousmediumflow/1p/incompressible/properties.hh
index 7df2043848a99e25dc9b7a29e0414efef3b00ffd..b0d26c4f52c03f7d9430fe303b085b48af7097ed 100644
--- a/test/porousmediumflow/1p/incompressible/properties.hh
+++ b/test/porousmediumflow/1p/incompressible/properties.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
diff --git a/test/porousmediumflow/1p/pointsources/timeindependent/properties.hh b/test/porousmediumflow/1p/pointsources/timeindependent/properties.hh
index efd3e803b79f218f8d78e26582fe000801ef3dc2..5c83226a522c7a389fa39631f20bf9606b3725da 100644
--- a/test/porousmediumflow/1p/pointsources/timeindependent/properties.hh
+++ b/test/porousmediumflow/1p/pointsources/timeindependent/properties.hh
@@ -25,7 +25,7 @@
#ifndef DUMUX_1P_SINGULARITY_PROBLEM_PROPERTIES_HH
#define DUMUX_1P_SINGULARITY_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
diff --git a/test/porousmediumflow/1pnc/1p2c/isothermal/properties.hh b/test/porousmediumflow/1pnc/1p2c/isothermal/properties.hh
index 2fd26f1f4319d0df550cd32786a4fb4e8cb79db9..b9c82ed5952fb75dcae5e58f2620329e6b2c2cec 100644
--- a/test/porousmediumflow/1pnc/1p2c/isothermal/properties.hh
+++ b/test/porousmediumflow/1pnc/1p2c/isothermal/properties.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_1P2C_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P2C_TEST_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -58,7 +58,7 @@ struct OnePTwoCTestCCMpfa { using InheritsFrom = std::tuple<OnePTwoCTest, CCMpfa
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::OnePTwoCTest> { using type = Dune::UGGrid<2>; };
#else
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/properties.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/properties.hh
index 44d2d9327d7924c2abbfa89c45bf8822a5d0d944..637bb9e71c3acdcb9793c6d1703ef1e152ed0117 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/properties.hh
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/conduction/properties.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -54,7 +54,7 @@ struct OnePTwoCNIConductionBox { using InheritsFrom = std::tuple<OnePTwoCNICondu
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::OnePTwoCNIConduction> { using type = Dune::UGGrid<2>; };
#else
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/properties.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/properties.hh
index 39847e5108f6e3ca1379f131a13a62a7d1bc0ce2..d3dbae65b1e3769e3f9b478fd3eb7c9847f70855 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/properties.hh
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/convection/properties.hh
@@ -27,7 +27,7 @@
#ifndef DUMUX_1P2CNI_CONVECTION_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P2CNI_CONVECTION_TEST_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -58,7 +58,7 @@ struct OnePTwoCNIConvectionBox { using InheritsFrom = std::tuple<OnePTwoCNIConve
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::OnePTwoCNIConvection> { using type = Dune::UGGrid<2>; };
#else
diff --git a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/properties.hh b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/properties.hh
index 6805c4ccec1762520d58118527fc845c6beedbe1..4caa53d4b10805255ac29ad9defa50f52f808164 100644
--- a/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/properties.hh
+++ b/test/porousmediumflow/1pnc/1p2c/nonisothermal/transientbc/properties.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_1P2CNI_TRANSIENT_BC_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P2CNI_TRANSIENT_BC_TEST_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -54,7 +54,7 @@ struct OnePTwoCNITransientBCBox { using InheritsFrom = std::tuple<OnePTwoCNITran
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::OnePTwoCNITransientBC> { using type = Dune::UGGrid<2>; };
#else
diff --git a/test/porousmediumflow/1pnc/1p3c/properties.hh b/test/porousmediumflow/1pnc/1p3c/properties.hh
index b35bcbf1bdcd7a5c22a8765766cf295281069d8d..744314f60db2672a549e0a8dd72e9ba5b9b2b15a 100644
--- a/test/porousmediumflow/1pnc/1p3c/properties.hh
+++ b/test/porousmediumflow/1pnc/1p3c/properties.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_1P3C_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P3C_TEST_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -56,7 +56,7 @@ struct MaxwellStefanOnePThreeCTestCCTpfa { using InheritsFrom = std::tuple<Maxwe
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::MaxwellStefanOnePThreeCTest> { using type = Dune::UGGrid<2>; };
#else
diff --git a/test/porousmediumflow/1pnc/nonequilibrium/properties.hh b/test/porousmediumflow/1pnc/nonequilibrium/properties.hh
index f4844af9275a36bb559c7a0f1317a54861fff1a6..bf1f1989d0cd34aa12011de4eda6119004ffa8cf 100644
--- a/test/porousmediumflow/1pnc/nonequilibrium/properties.hh
+++ b/test/porousmediumflow/1pnc/nonequilibrium/properties.hh
@@ -26,7 +26,7 @@
#ifndef DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_PROPERTIES_HH
#define DUMUX_1P2CNI_CONDUCTION_TEST_PROBLEM_PROPERTIES_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
diff --git a/test/porousmediumflow/2p/boxdfm/properties.hh b/test/porousmediumflow/2p/boxdfm/properties.hh
index f5e4e093cc0b41d4c55e174a2d66efa76c07bdb6..5c3978aeabdc83cda1bf4d816fac725379ab4760 100644
--- a/test/porousmediumflow/2p/boxdfm/properties.hh
+++ b/test/porousmediumflow/2p/boxdfm/properties.hh
@@ -27,7 +27,7 @@
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
diff --git a/test/porousmediumflow/2p/cornerpoint/main.cc b/test/porousmediumflow/2p/cornerpoint/main.cc
index e8eabba32176bfa2ebb47a752cff8bf379e0b853..53f526a8b4c8867a2124e54e86911346a4cb612a 100644
--- a/test/porousmediumflow/2p/cornerpoint/main.cc
+++ b/test/porousmediumflow/2p/cornerpoint/main.cc
@@ -25,9 +25,9 @@
// As of versions Opm 2018.04 and Dune 2.6, using opm-grid and dune-uggrid
// together results in a compiler error. The following lines enforce that
// dune-uggrid isn't considered.
-#if HAVE_UG
-#undef HAVE_UG
-#define HAVE_UG 0
+#if HAVE_DUNE_UGGRID
+#undef HAVE_DUNE_UGGRID
+#define HAVE_DUNE_UGGRID 0
#endif
#include <iostream>
diff --git a/test/porousmediumflow/2p/nonisothermal/properties.hh b/test/porousmediumflow/2p/nonisothermal/properties.hh
index f308f428707aa41dc36243a9321c83709b7733a9..caba88abbe8444e2858cfed6c8cc987c85f09c91 100644
--- a/test/porousmediumflow/2p/nonisothermal/properties.hh
+++ b/test/porousmediumflow/2p/nonisothermal/properties.hh
@@ -31,7 +31,7 @@
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
diff --git a/test/porousmediumflow/richards/lens/properties.hh b/test/porousmediumflow/richards/lens/properties.hh
index e5a75fb3e907c941a8e6e0cde0e076fe62463a8f..8966d7e86399345e7d626384d6ea9b703e1a761f 100644
--- a/test/porousmediumflow/richards/lens/properties.hh
+++ b/test/porousmediumflow/richards/lens/properties.hh
@@ -30,7 +30,7 @@
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
#endif
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
diff --git a/test/porousmediumflow/sequential/1p/test_diffusion3d.cc b/test/porousmediumflow/sequential/1p/test_diffusion3d.cc
index eda76e77799683b54ebad2c7cef2aa81e9936e32..6bea86af68460bc238dc0a8b46e1f4342bd18070 100644
--- a/test/porousmediumflow/sequential/1p/test_diffusion3d.cc
+++ b/test/porousmediumflow/sequential/1p/test_diffusion3d.cc
@@ -25,7 +25,7 @@
#include <config.h>
#include <iostream>
-#if HAVE_DUNE_ALUGRID || HAVE_UG
+#if HAVE_DUNE_ALUGRID || HAVE_DUNE_UGGRID
#include <dune/common/exceptions.hh>
#include <dune/common/parallel/mpihelper.hh>
@@ -252,4 +252,4 @@ int main()
std::cerr << "You need to have dune-ALUGrid or UG installed to run this test\n";
return 77;
}
-#endif // HAVE_DUNE_ALUGRID || HAVE_UG
+#endif // HAVE_DUNE_ALUGRID || HAVE_DUNE_UGGRID
diff --git a/test/porousmediumflow/sequential/2p/test_mpfa2p.cc b/test/porousmediumflow/sequential/2p/test_mpfa2p.cc
index 8b79a207fe89d6502e7e6ab38961ada2222cd042..1c05acb8e047b6f98663d32d602a2469290547f6 100644
--- a/test/porousmediumflow/sequential/2p/test_mpfa2p.cc
+++ b/test/porousmediumflow/sequential/2p/test_mpfa2p.cc
@@ -23,7 +23,7 @@
#include <config.h>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dumux/common/start.hh>
#include <dumux/common/properties.hh>
diff --git a/test/porousmediumflow/sequential/2p/test_mpfa2pproblem.hh b/test/porousmediumflow/sequential/2p/test_mpfa2pproblem.hh
index 7f7598a1d93ce1bbf929ae9b8a53df715e9f7908..d01f487fe68fd3aaf9a4f684a7b3b5637ce5223a 100644
--- a/test/porousmediumflow/sequential/2p/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/sequential/2p/test_mpfa2pproblem.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_TEST_MPFA2P_PROBLEM_HH
#define DUMUX_TEST_MPFA2P_PROBLEM_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -75,7 +75,7 @@ struct MPFALAdaptiveTwoPTest { using InheritsFrom = std::tuple<MPFATwoPTest, IMP
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::MPFATwoPTest> { using type = Dune::UGGrid<2>; };
#else
diff --git a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2d.cc b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2d.cc
index f3f59bf05dbd7ae05bbff9cc1640c75e9026dc31..0aa6f8e2c1c010304e00af763ba31f9aad4b77b6 100644
--- a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2d.cc
+++ b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2d.cc
@@ -23,7 +23,7 @@
*/
#include <config.h>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include "test_adaptive2p2c2dproblem.hh"
#include <dumux/common/start.hh>
diff --git a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2dproblem.hh
index 0e4d3134944b095f000f6e2c1218c349713d5d84..35af6ce2e13662c39f623f8f5c74e8940903829f 100644
--- a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c2dproblem.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_TEST_ADAPTIVE2D_2P2C_PROBLEM_HH
#define DUMUX_TEST_ADAPTIVE2D_2P2C_PROBLEM_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -57,7 +57,7 @@ struct Adaptive2p2c2d { using InheritsFrom = std::tuple<Test2P2CSpatialParams, S
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::Adaptive2p2c2d> { using type = Dune::UGGrid<2>; };
#else
diff --git a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3d.cc b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3d.cc
index cad0125147166a37da79e79c0724af56dfb9346d..348fea21811227f1442e9f897193db6b8ac5129d 100644
--- a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3d.cc
+++ b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3d.cc
@@ -23,7 +23,7 @@
*/
#include <config.h>
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dumux/common/properties.hh>
#include "test_adaptive2p2c3dproblem.hh"
@@ -70,4 +70,4 @@ int main()
std::cerr << "You need to have UGGrid to run this test\n";
return 77;
}
-#endif // HAVE_UG
+#endif // HAVE_DUNE_UGGRID
diff --git a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3dproblem.hh
index 2bc16993b16a19443675d387073d46bce86d8899..ab73f620bd159171e7a2647bb24e490195af1426 100644
--- a/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/sequential/2p2c/test_adaptive2p2c3dproblem.hh
@@ -24,7 +24,7 @@
#ifndef DUMUX_TEST_ADAPTIVE3D_2P2C_PROBLEM_HH
#define DUMUX_TEST_ADAPTIVE3D_2P2C_PROBLEM_HH
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
#include <dune/grid/uggrid.hh>
#endif
#include <dune/grid/yaspgrid.hh>
@@ -55,7 +55,7 @@ struct Adaptive2p2c3d { using InheritsFrom = std::tuple<Test2P2CSpatialParams, M
} // end namespace TTag
// Set the grid type
-#if HAVE_UG
+#if HAVE_DUNE_UGGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::Adaptive2p2c3d> { using type = Dune::UGGrid<3>; };
#else