diff --git a/framework/src/base/MooseApp.C b/framework/src/base/MooseApp.C index f4cd555d2967..ac8c7bcae56a 100644 --- a/framework/src/base/MooseApp.C +++ b/framework/src/base/MooseApp.C @@ -248,7 +248,7 @@ MooseApp::validParams() params.setGlobalCommandLineParam("recover"); params.addCommandLineParam( - "suppress_header", "--suppress-header", "Flag to print the App header"); + "suppress_header", "--suppress-header", false, "Flag to print the App header"); params.setGlobalCommandLineParam("suppress_header"); params.addCommandLineParam( @@ -734,7 +734,7 @@ MooseApp::setupOptions() TIME_SECTION("setupOptions", 5, "Setting Up Options"); // Print the header, this is as early as possible - if (isParamValid("suppress_header") && !getParam("suppress_header")) + if (header().length() && !getParam("suppress_header")) _console << header() << std::endl; if (getParam("error_unused")) diff --git a/test/include/base/MooseTestApp.h b/test/include/base/MooseTestApp.h index d05c18d13a50..fc5f0fd6a84c 100644 --- a/test/include/base/MooseTestApp.h +++ b/test/include/base/MooseTestApp.h @@ -25,6 +25,4 @@ class MooseTestApp : public MooseApp static void registerAll(Factory & f, ActionFactory & af, Syntax & s, bool use_test_objs = false); static void registerApps(); - - virtual std::string header() const override; }; diff --git a/test/src/base/MooseTestApp.C b/test/src/base/MooseTestApp.C index 2ac8aa840b8b..0de2faae4892 100644 --- a/test/src/base/MooseTestApp.C +++ b/test/src/base/MooseTestApp.C @@ -141,12 +141,6 @@ MooseTestApp::registerApps() registerApp(MooseTestApp); } -std::string -MooseTestApp::header() const -{ - return std::string("MOOSE Test App\n"); -} - extern "C" void MooseTestApp__registerAll(Factory & f, ActionFactory & af, Syntax & s) { diff --git a/test/tests/multiapps/multilevel/dt_from_parent_parent.i b/test/tests/multiapps/multilevel/dt_from_parent_parent.i index 4478534b721a..5dceff18880d 100644 --- a/test/tests/multiapps/multilevel/dt_from_parent_parent.i +++ b/test/tests/multiapps/multilevel/dt_from_parent_parent.i @@ -6,57 +6,54 @@ [] [Variables] - [u] - [] + [./u] + [../] [] [Kernels] - [diff] + [./diff] type = Diffusion variable = u - [] + [../] [] [BCs] - [left] + [./left] type = DirichletBC variable = u boundary = left value = 0 - [] - [right] + [../] + [./right] type = DirichletBC variable = u boundary = right value = 1 - [] + [../] [] [Executioner] type = Transient num_steps = 1 dt = 0.25 - solve_type = 'PJFNK' - petsc_options_iname = '-pc_type -pc_hypre_type' petsc_options_value = 'hypre boomeramg' [] [Outputs] exodus = true - color = false - [out] + [./out] type = Console output_file = true - [] + [../] [] [MultiApps] - [sub] + [./sub] type = TransientMultiApp app_type = MooseTestApp positions = '0 0 0 0.5 0.5 0' input_files = dt_from_parent_sub.i - [] + [../] [] diff --git a/test/tests/multiapps/multilevel/tests b/test/tests/multiapps/multilevel/tests index 7b827581cebc..60475049f6cf 100644 --- a/test/tests/multiapps/multilevel/tests +++ b/test/tests/multiapps/multilevel/tests @@ -28,21 +28,6 @@ detail = "where the sub-application controls the time step for the parent application," [] - [header_check] - type = 'RunApp' - input = 'dt_from_parent_parent.i' - prereq = group/dt_from_parent - expect_out = 'MOOSE Test App\n\nsub0: MOOSE Test App\nsub0: \nsub0_sub0: MOOSE Test App' - detail = "and append the subapp number to the header" - [] - [suppress_subapp_header] - type = 'RunApp' - input = 'dt_from_parent_parent.i' - prereq = group/header_check - cli_args = 'MultiApps/sub/cli_args=--suppress-header' - absent_out = '\nsub0: MOOSE Test App' - detail = "and suppress the subapp header." - [] [] [console_to_file]