diff --git a/dune/xt/functions/spe10/model2.hh b/dune/xt/functions/spe10/model2.hh index 3d2251661e4c846387e08f395c2255a7e6aae660..be45c796f1956bedc7c61aaa8018f861bd4e32da 100644 --- a/dune/xt/functions/spe10/model2.hh +++ b/dune/xt/functions/spe10/model2.hh @@ -15,7 +15,7 @@ #include <dune/xt/common/color.hh> #include <dune/xt/common/configuration.hh> -#if perm_case1.dat +#if DUNE_DUNE_XT_DATA # include <dune/xt/data/paths.hh> #endif @@ -115,14 +115,13 @@ private: return data; } - public: static Common::Configuration defaults() { Common::Configuration config; config["type"] = static_id(); config["filename"] = -#if perm_case1.dat +#if DUNE_DUNE_XT_DATA Data::spe10_model2_filename(); #else "spe_perm.dat"; diff --git a/dune/xt/test/functions/spe10_model2.tpl b/dune/xt/test/functions/spe10_model2.tpl index 3bfeaa265742a7a808e7a2d1699ab9867a0a948f..0992339335d63408012e56613106fb8935506a29 100644 --- a/dune/xt/test/functions/spe10_model2.tpl +++ b/dune/xt/test/functions/spe10_model2.tpl @@ -51,12 +51,16 @@ struct Spe10Model2Function_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}} : public ::te TEST_F(Spe10Model2Function_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_constructible) { +#if HAVE_DUNE_XT_DATA FunctionType function(Dune::XT::Data::spe10_model2_filename(), {0, 0, 0}, {Dune::XT::Functions::Spe10::internal::model_2_length_x, Dune::XT::Functions::Spe10::internal::model_2_length_y, Dune::XT::Functions::Spe10::internal::model_2_length_z}, {6, 22, 8}); +#else + std::cout << "Test disabled, missing dune-xt-data!" << std::endl; +#endif } TEST_F(Spe10Model2Function_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, has_default_config)