From e7f35ab054753ef6ec1bda61e2a6539d37551e89 Mon Sep 17 00:00:00 2001 From: Andrew E Slaughter Date: Fri, 17 May 2019 17:54:21 -0600 Subject: [PATCH] Handle cases when 'NEWTON' is not a valid solve_type (refs #13411) --- framework/include/utils/MooseEnumBase.h | 3 +-- framework/src/actions/CreateExecutionerAction.C | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/include/utils/MooseEnumBase.h b/framework/include/utils/MooseEnumBase.h index 7a1de56ed710..a97a577fe368 100644 --- a/framework/include/utils/MooseEnumBase.h +++ b/framework/include/utils/MooseEnumBase.h @@ -84,7 +84,7 @@ class MooseEnumBase /** * Return the complete set of available flags. */ - const std::set & items() { return _items; } + const std::set & items() const { return _items; } ///@{ /** @@ -137,4 +137,3 @@ class MooseEnumBase /// Flag to enable enumeration items not previously defined bool _allow_out_of_range; }; - diff --git a/framework/src/actions/CreateExecutionerAction.C b/framework/src/actions/CreateExecutionerAction.C index 4c5d00df11b3..b2a336d333bf 100644 --- a/framework/src/actions/CreateExecutionerAction.C +++ b/framework/src/actions/CreateExecutionerAction.C @@ -64,7 +64,8 @@ void CreateExecutionerAction::setupAutoPreconditioning() { // If using NEWTON then automatically create SingleMatrixPreconditioner object with full=true - if (_moose_object_pars.get("solve_type") == "NEWTON") + const MooseEnum & solve_type = _moose_object_pars.get("solve_type"); + if ((solve_type.find("NEWTON") != solve_type.items().end()) && (solve_type == "NEWTON")) { // Action Parameters InputParameters params = _action_factory.getValidParams("SetupPreconditionerAction");