From 08c99523a0713b4259c11f6dd0f010ce81c05e58 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Thu, 27 Jun 2019 11:16:29 +0200
Subject: [PATCH] Fix compilation without dune-parmg
---
dune/elasticity/common/trustregionsolver.cc | 2 +-
dune/elasticity/common/trustregionsolver.hh | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dune/elasticity/common/trustregionsolver.cc b/dune/elasticity/common/trustregionsolver.cc
index 6606cdf..5d16bf1 100644
--- a/dune/elasticity/common/trustregionsolver.cc
+++ b/dune/elasticity/common/trustregionsolver.cc
@@ -248,11 +248,11 @@ void TrustRegionSolver<BasisType,VectorType>::solve()
BasisType basis(grid_->levelGridView(grid_->maxLevel()));
BasisType coarseBasis(grid_->levelGridView(0));
std::vector<BoxConstraint<typename VectorType::field_type, blocksize>> coarseTrustRegionObstacles(coarseBasis.size());
- MaxNormTrustRegion<blocksize> trustRegion(basis.size(), initialTrustRegionRadius_);
int numLevels = grid_->maxLevel()+1;
auto& levelOp = mgSetup_->levelOps_;
#endif
+ MaxNormTrustRegion<blocksize> trustRegion(basis.size(), initialTrustRegionRadius_);
std::vector<BoxConstraint<field_type,blocksize> > trustRegionObstacles;
diff --git a/dune/elasticity/common/trustregionsolver.hh b/dune/elasticity/common/trustregionsolver.hh
index 701e5b9..1b87165 100644
--- a/dune/elasticity/common/trustregionsolver.hh
+++ b/dune/elasticity/common/trustregionsolver.hh
@@ -21,6 +21,7 @@
#include <dune/elasticity/assemblers/feassembler.hh>
+#if HAVE_DUNE_PARMG
#include <dune/parmg/iterationstep/lambdastep.hh>
#include <dune/parmg/iterationstep/multigrid.hh>
#include <dune/parmg/parallel/dofmap.hh>
@@ -31,7 +32,7 @@
#include <dune/parmg/parallel/parallelenergyfunctional.hh>
#include <dune/parmg/parallel/parallelenergynorm.hh>
#include <dune/parmg/parallel/restrictmatrix.hh>
-
+#endif
/** \brief Trust-region solver */
--
GitLab