From b408c36a6764631c1b4dfe487b00bbec565d30a3 Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Tue, 23 Feb 2016 14:42:08 +0100
Subject: [PATCH] Make mmgtest independent of IpOpt
---
dune/solvers/test/CMakeLists.txt | 3 ++-
dune/solvers/test/mmgtest.cc | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dune/solvers/test/CMakeLists.txt b/dune/solvers/test/CMakeLists.txt
index e4341ba8..de7a26f4 100644
--- a/dune/solvers/test/CMakeLists.txt
+++ b/dune/solvers/test/CMakeLists.txt
@@ -1,6 +1,7 @@
set(GRID_BASED_TESTS
cgsteptest
gssteptest
+ mmgtest
multigridtest
projectedgradienttest
obstacletnnmgtest
@@ -13,7 +14,7 @@ set(OTHER_TESTS
sumoperatortest
)
-set(TESTS_IPOPT mmgtest quadraticipoptsolvertest)
+set(TESTS_IPOPT quadraticipoptsolvertest)
if(HAVE_IPOPT)
list(APPEND GRID_BASED_TESTS ${TESTS_IPOPT})
diff --git a/dune/solvers/test/mmgtest.cc b/dune/solvers/test/mmgtest.cc
index 862e52d0..b941ef3f 100644
--- a/dune/solvers/test/mmgtest.cc
+++ b/dune/solvers/test/mmgtest.cc
@@ -21,7 +21,6 @@
// dune-solver includes
#include <dune/solvers/norms/energynorm.hh>
#include <dune/solvers/iterationsteps/mmgstep.hh>
-#include <dune/solvers/solvers/quadraticipopt.hh>
#include <dune/solvers/transferoperators/mandelobsrestrictor.hh>
#include <dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh>
@@ -34,7 +33,6 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
typedef VectorType Vector;
typedef MatrixType Matrix;
typedef EnergyNorm<Matrix, Vector> Norm;
- typedef QuadraticIPOptSolver<MatrixType,VectorType> Solver;
// create double obstacle constraints
const int blockSize = VectorType::block_type::dimension;
--
GitLab