From d2f839f562ab953a11ef962e29561491b9cd382f Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Thu, 7 Mar 2019 16:07:26 +0100
Subject: [PATCH] [test.stationary...] minor updates
---
dune/gdt/test/stationary-eocstudies/base.hh | 1 +
dune/gdt/test/stationary-heat-equation/ESV2007.hh | 6 +++---
dune/gdt/test/stationary-heat-equation/OS2015.hh | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dune/gdt/test/stationary-eocstudies/base.hh b/dune/gdt/test/stationary-eocstudies/base.hh
index 8a8029a36..ac113ada6 100644
--- a/dune/gdt/test/stationary-eocstudies/base.hh
+++ b/dune/gdt/test/stationary-eocstudies/base.hh
@@ -18,6 +18,7 @@
#include <dune/grid/io/file/dgfparser/dgfparser.hh>
#include <dune/xt/common/convergence-study.hh>
+#include <dune/xt/common/test/common.hh>
#include <dune/xt/common/fvector.hh>
#include <dune/xt/common/string.hh>
#include <dune/xt/common/timedlogging.hh>
diff --git a/dune/gdt/test/stationary-heat-equation/ESV2007.hh b/dune/gdt/test/stationary-heat-equation/ESV2007.hh
index a89d7d4ec..f3872f39d 100644
--- a/dune/gdt/test/stationary-heat-equation/ESV2007.hh
+++ b/dune/gdt/test/stationary-heat-equation/ESV2007.hh
@@ -47,7 +47,7 @@ struct ESV2007DiffusionProblem
// We can only reproduce the results from ESV2007 by using a quadrature of order 3, which we obtain with a p1 DG space
// and a force of order 2.
- ESV2007DiffusionProblem(int force_order = DXTC_TEST_CONFIG_GET("setup.force_order", 2))
+ ESV2007DiffusionProblem(int force_order = 2)
: diffusion_factor(1)
, diffusion_tensor(XT::LA::eye_matrix<XT::Common::FieldMatrix<double, d, d>>(d, d))
, dirichlet(0)
@@ -55,7 +55,7 @@ struct ESV2007DiffusionProblem
, force(force_order)
{}
- XT::Grid::GridProvider<G> make_initial_grid()
+ XT::Grid::GridProvider<G> make_initial_grid() const
{
if (std::is_same<G, YASP_2D_EQUIDISTANT_OFFSET>::value) {
return XT::Grid::make_cube_grid<G>(-1, 1, 8);
@@ -107,7 +107,7 @@ class ESV2007DiffusionTest : public StationaryDiffusionIpdgEocStudy<G>
public:
ESV2007DiffusionTest()
: BaseType()
- , problem()
+ , problem(DXTC_TEST_CONFIG_GET("setup.force_order", 2))
{}
protected:
diff --git a/dune/gdt/test/stationary-heat-equation/OS2015.hh b/dune/gdt/test/stationary-heat-equation/OS2015.hh
index 4c8326245..b179dedb3 100644
--- a/dune/gdt/test/stationary-heat-equation/OS2015.hh
+++ b/dune/gdt/test/stationary-heat-equation/OS2015.hh
@@ -56,7 +56,7 @@ struct OS2015MultiscaleProblem
/*second_domain_with_negative_value=*/{{{4.25, 4.4}, {0.25, 0.4}}, -1e3}})
{}
- XT::Grid::GridProvider<G> make_initial_grid()
+ XT::Grid::GridProvider<G> make_initial_grid() const
{
if (std::is_same<G, YASP_2D_EQUIDISTANT_OFFSET>::value) {
return XT::Grid::make_cube_grid<G>({0., 0.}, {5., 1.}, {100u, 20u});
--
GitLab