diff --git a/src/actions/NtAction.C b/src/actions/NtAction.C index 0fb9c81a46..f05bfaa6fc 100644 --- a/src/actions/NtAction.C +++ b/src/actions/NtAction.C @@ -103,7 +103,7 @@ NtAction::act() if (_current_task == "copy_nodal_vars") { - SystemBase * system = &_problem->getNonlinearSystemBase(); + SystemBase * system = &_problem->getNonlinearSystemBase(/*nl_sys_num=*/0); system->addVariableToCopy(var_name, var_name, "LATEST"); } } @@ -374,7 +374,7 @@ NtAction::act() if (_current_task == "copy_nodal_vars") { SystemBase * system; - system = &_problem->getNonlinearSystemBase(); + system = &_problem->getNonlinearSystemBase(/*nl_sys_num=*/0); system->addVariableToCopy(temp_var, temp_var, "LATEST"); } } diff --git a/src/actions/PrecursorAction.C b/src/actions/PrecursorAction.C index a3292b143a..95dfc652b5 100644 --- a/src/actions/PrecursorAction.C +++ b/src/actions/PrecursorAction.C @@ -65,8 +65,8 @@ PrecursorAction::validParams() params.addParam( "init_from_file", false, "Whether to initialize the precursors from a file."); params.addParam("create_vars", true, "Whether this action should create the variables."); - params.addRequiredParam( - "loop_precursors", "Whether precursors are circulated in coolant loop."); + params.addRequiredParam("loop_precursors", + "Whether precursors are circulated in coolant loop."); params.addParam( "object_suffix", "", @@ -128,7 +128,7 @@ PrecursorAction::act() else if (_current_task == "copy_nodal_vars") { - SystemBase * system = &_problem->getNonlinearSystemBase(); + SystemBase * system = &_problem->getNonlinearSystemBase(/*nl_sys_num=*/0); system->addVariableToCopy(var_name, var_name, "LATEST"); } } @@ -175,8 +175,7 @@ PrecursorAction::act() } // transfers - else if (_current_task == "add_transfer" && getParam("loop_precursors") && - (!_is_loopapp)) + else if (_current_task == "add_transfer" && getParam("loop_precursors") && (!_is_loopapp)) { // Set up MultiAppTransfer to simulate precursor looped flow into and // out of the reactor core @@ -313,7 +312,7 @@ PrecursorAction::addOutflowBC(const std::string & var_name) InputParameters params = _factory.getValidParams("CoupledOutflowBC"); params.set("variable") = var_name; params.set>("boundary") = - getParam>("outlet_boundaries"); + getParam>("outlet_boundaries"); params.set>("uvel") = {getParam("uvel")}; if (isParamValid("vvel")) params.set>("vvel") = {getParam("vvel")}; @@ -429,7 +428,7 @@ PrecursorAction::addOutletPostprocessor(const std::string & var_name) params.set>("boundary") = getParam>("outlet_boundaries"); params.set>("outputs") = {"none"}; - _problem->addPostprocessor("SideAverageValue", postproc_name, params); + _problem->addPostprocessor("SideAverageValue", postproc_name, params); } else if (isParamValid("uvel")) // checks if Navier-Stokes velocities are provided { @@ -443,8 +442,8 @@ PrecursorAction::addOutletPostprocessor(const std::string & var_name) params.set>("boundary") = getParam>("outlet_boundaries"); params.set>("outputs") = {"none"}; - params.set>("weight") = - {getParam("outlet_vel")}; + params.set>("weight") = { + getParam("outlet_vel")}; _problem->addPostprocessor("SideWeightedIntegralPostprocessor", postproc_name, params); } @@ -458,7 +457,7 @@ PrecursorAction::addOutletPostprocessor(const std::string & var_name) params.set("value1") = "Outlet_Total_" + var_name + "_" + _object_suffix; params.set("value2") = "Coolant_Outflow_" + _object_suffix; params.set>("outputs") = {"none"}; - _problem->addPostprocessor("DivisionPostprocessor", postproc_name, params); + _problem->addPostprocessor("DivisionPostprocessor", postproc_name, params); } } } @@ -511,8 +510,8 @@ PrecursorAction::addCoolantOutflowPostprocessor() { std::string postproc_name = "Coolant_Outflow_" + _object_suffix; InputParameters params = _factory.getValidParams("SideWeightedIntegralPostprocessor"); - params.set>("variable") = - {getParam("outlet_vel")}; + params.set>("variable") = { + getParam("outlet_vel")}; params.set>("boundary") = getParam>("outlet_boundaries"); params.set>("outputs") = {"none"}; @@ -524,10 +523,9 @@ void PrecursorAction::setVarNameAndBlock(InputParameters & params, const std::string & var_name) { params.set("variable") = var_name; - if (isParamValid("kernel_block")) - params.set>("block") = - getParam>("kernel_block"); - else if (isParamValid("block")) - params.set>("block") = - getParam>("block"); + if (isParamValid("kernel_block")) + params.set>("block") = + getParam>("kernel_block"); + else if (isParamValid("block")) + params.set>("block") = getParam>("block"); }