Skip to content
Snippets Groups Projects
Commit b408c36a authored by Jonathan Youett's avatar Jonathan Youett
Browse files

Make mmgtest independent of IpOpt

parent 6f56c289
Branches
No related tags found
No related merge requests found
Pipeline #
set(GRID_BASED_TESTS set(GRID_BASED_TESTS
cgsteptest cgsteptest
gssteptest gssteptest
mmgtest
multigridtest multigridtest
projectedgradienttest projectedgradienttest
obstacletnnmgtest obstacletnnmgtest
...@@ -13,7 +14,7 @@ set(OTHER_TESTS ...@@ -13,7 +14,7 @@ set(OTHER_TESTS
sumoperatortest sumoperatortest
) )
set(TESTS_IPOPT mmgtest quadraticipoptsolvertest) set(TESTS_IPOPT quadraticipoptsolvertest)
if(HAVE_IPOPT) if(HAVE_IPOPT)
list(APPEND GRID_BASED_TESTS ${TESTS_IPOPT}) list(APPEND GRID_BASED_TESTS ${TESTS_IPOPT})
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
// dune-solver includes // dune-solver includes
#include <dune/solvers/norms/energynorm.hh> #include <dune/solvers/norms/energynorm.hh>
#include <dune/solvers/iterationsteps/mmgstep.hh> #include <dune/solvers/iterationsteps/mmgstep.hh>
#include <dune/solvers/solvers/quadraticipopt.hh>
#include <dune/solvers/transferoperators/mandelobsrestrictor.hh> #include <dune/solvers/transferoperators/mandelobsrestrictor.hh>
#include <dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh> #include <dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh>
...@@ -34,7 +33,6 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat ...@@ -34,7 +33,6 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
typedef VectorType Vector; typedef VectorType Vector;
typedef MatrixType Matrix; typedef MatrixType Matrix;
typedef EnergyNorm<Matrix, Vector> Norm; typedef EnergyNorm<Matrix, Vector> Norm;
typedef QuadraticIPOptSolver<MatrixType,VectorType> Solver;
// create double obstacle constraints // create double obstacle constraints
const int blockSize = VectorType::block_type::dimension; const int blockSize = VectorType::block_type::dimension;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment