From 886d9706e0a4e095662fc1c15a6f2c5f7b4012bd Mon Sep 17 00:00:00 2001
From: "Dennis.Glaeser" <dennis.glaeser@iws.uni-stuttgart.de>
Date: Thu, 30 Apr 2020 10:43:00 +0200
Subject: [PATCH] [test][sequential1p] require UMFPack
---
test/porousmediumflow/1p/sequential/CMakeLists.txt | 2 +-
.../1p/sequential/test_diffusionproblem3d.hh | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/test/porousmediumflow/1p/sequential/CMakeLists.txt b/test/porousmediumflow/1p/sequential/CMakeLists.txt
index 0a7c3e654c..c16ca8f8ef 100644
--- a/test/porousmediumflow/1p/sequential/CMakeLists.txt
+++ b/test/porousmediumflow/1p/sequential/CMakeLists.txt
@@ -23,7 +23,7 @@ dumux_add_test(NAME test_diffusion3d
LABELS porousmediumflow 1p sequential
SOURCES test_diffusion3d.cc
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMAKE_GUARD dune-alugrid_FOUND
+ CMAKE_GUARD "( dune-alugrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_diffusion3d_fv-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_diffusion3d_fv-00000.vtu
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
index a51f44b133..b64e03b6d2 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
@@ -34,6 +34,8 @@
#include <dumux/porousmediumflow/2p/sequential/diffusion/problem.hh>
#include <dumux/porousmediumflow/sequential/cellcentered/velocity.hh>
+#include <dumux/linear/seqsolverbackend.hh>
+
#include "test_diffusionspatialparams3d.hh"
namespace Dumux
@@ -81,13 +83,8 @@ struct FluidSystem<TypeTag, TTag::DiffusionTest>
using type = FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonwettingPhase>;
};
-#if HAVE_SUPERLU
-template<class TypeTag>
-struct LinearSolver<TypeTag, TTag::DiffusionTest> { using type = SuperLUBackend; };
-#else
template<class TypeTag>
-struct LinearSolver<TypeTag, TTag::DiffusionTest> { using type = ILUnRestartedGMResBackend; };
-#endif
+struct LinearSolver<TypeTag, TTag::DiffusionTest> { using type = UMFPackBackend; };
}
--
GitLab