From 81bc44ec6d14620e2dcaa0c6be678f92afa028af Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Mon, 12 Mar 2018 14:31:36 +0100 Subject: [PATCH] fix the build on the latest dune master Dune::set_singularity_limit() was removed and the ILU preconditioners seem to have been refactored. The ILU refactoring included making the order of the preconditioner a template parameter of the preconditioner class, i.e., it can no longer be specified at runtime. Note that the AMG code in the dune master currently produces quite a few warnings because of the latter point, but as far as I can see, there is nothing which can be done about this from outside of dune-istl. --- examples/problems/waterairproblem.hh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/problems/waterairproblem.hh b/examples/problems/waterairproblem.hh index e20be623b..6c12bce32 100644 --- a/examples/problems/waterairproblem.hh +++ b/examples/problems/waterairproblem.hh @@ -131,8 +131,13 @@ SET_STRING_PROP(WaterAirBaseProblem, GridFile, "./data/waterair.dgf"); SET_TAG_PROP(WaterAirBaseProblem, LinearSolverSplice, ParallelIstlLinearSolver); SET_TYPE_PROP(WaterAirBaseProblem, LinearSolverWrapper, Ewoms::Linear::SolverWrapperRestartedGMRes); +#if DUNE_VERSION_NEWER(DUNE_ISTL, 2,7) +SET_TYPE_PROP(WaterAirBaseProblem, PreconditionerWrapper, + Ewoms::Linear::PreconditionerWrapperILU); +#else SET_TYPE_PROP(WaterAirBaseProblem, PreconditionerWrapper, Ewoms::Linear::PreconditionerWrapperILUn); +#endif SET_INT_PROP(WaterAirBaseProblem, PreconditionerOrder, 2); } // namespace Properties } // namespace Ewoms