From b3c764bfa6ed5e8e25c4dd8b68a5f4285400284b Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Fri, 1 Dec 2017 13:48:44 +0100 Subject: [PATCH] [richards] Fix parameter in privar switch --- .../richards/implicit/primaryvariableswitch.hh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dumux/porousmediumflow/richards/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/richards/implicit/primaryvariableswitch.hh index 38bbc9bbd7..01bd25a536 100644 --- a/dumux/porousmediumflow/richards/implicit/primaryvariableswitch.hh +++ b/dumux/porousmediumflow/richards/implicit/primaryvariableswitch.hh @@ -78,11 +78,12 @@ protected: IndexType dofIdxGlobal, const GlobalPosition& globalPos) { - static const bool usePriVarSwitch = GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, UsePrimaryVariableSwitch); + static const bool usePriVarSwitch = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.UsePrimaryVariableSwitch"); if (!usePriVarSwitch) return false; - assert(enableWaterDiffusionInAir && "The Richards primary variable switch only works with water diffusion in air enabled!"); + if (!enableWaterDiffusionInAir) + DUNE_THROW(Dune::InvalidStateException, "The Richards primary variable switch only works with water diffusion in air enabled!"); // evaluate primary variable switch bool wouldSwitch = false; -- GitLab