Updating input files to remove 'console=true'

idaholab · Jun 7, 2014 · 88dc56b · 88dc56b
1 parent 892205c
commit 88dc56b
Show file tree

Hide file tree

Showing 52 changed files with 68 additions and 89 deletions.
diff --git a/framework/include/outputs/OutputWarehouse.h b/framework/include/outputs/OutputWarehouse.h
@@ -133,9 +133,9 @@ class OutputWarehouse
 
   /**
    * Get a reference to the common output parameters
-   * @return Reference to the common InputParameters object
+   * @return Pointer to the common InputParameters object
    */
-  InputParameters & getCommonParameters();
+  InputParameters * getCommonParameters();
 
   /**
    * Return the sync times for all objects

diff --git a/framework/src/actions/AddOutputAction.C b/framework/src/actions/AddOutputAction.C
@@ -42,6 +42,10 @@ AddOutputAction::AddOutputAction(const std::string & name, InputParameters param
 void
 AddOutputAction::act()
 {
+  // Do nothing if FEProblem is NULL, this should only be the case for CoupledProblem
+  if (_problem == NULL)
+    return;
+
   // Get a reference to the OutputWarehouse
   OutputWarehouse & output_warehouse = _app.getOutputWarehouse();
 
@@ -61,7 +65,9 @@ AddOutputAction::act()
   _moose_object_pars.addPrivateParam<FEProblem *>("_fe_problem",  _problem);
 
   // Apply the common parameters
-  _moose_object_pars.applyParameters(output_warehouse.getCommonParameters());
+  InputParameters * common = output_warehouse.getCommonParameters();
+  if (common != NULL)
+    _moose_object_pars.applyParameters(*common);
 
   // Set the correct value for the binary flag for XDA/XDR output
   if (_type.compare("XDR") == 0)

diff --git a/framework/src/base/Moose.C b/framework/src/base/Moose.C
@@ -706,7 +706,9 @@ addActionTypes(Syntax & syntax)
   registerMooseObjectTask("add_multi_app",                MultiApp,               false);
   registerMooseObjectTask("add_transfer",                 Transfer,               false);
 
-  registerMooseObjectTask("add_output",                   Output,             false);
+  registerMooseObjectTask("add_output",                   Output,                 false);
+
+  registerTask("common_output", true);
 
   registerTask("add_feproblem", false);
   registerTask("add_bounds_vectors", false);
@@ -767,6 +769,7 @@ addActionTypes(Syntax & syntax)
    */
   syntax.addDependencySets(
 "(meta_action)"
+"(common_output)"
 "(set_global_params)"
 "(recover_base)"
 "(check_copy_nodal_vars)"
@@ -864,7 +867,7 @@ registerActions(Syntax & syntax, ActionFactory & action_factory)
   registerAction(DetermineSystemType, "determine_system_type");
   registerAction(CreateProblemAction, "create_problem");
   registerAction(AddOutputAction, "add_output");
-  registerAction(CommonOutputAction, "meta_action");
+  registerAction(CommonOutputAction, "common_output");
   registerAction(GlobalParamsAction, "set_global_params");
   registerAction(SetupPredictorAction, "setup_predictor");
   registerAction(MaterialOutputAction, "setup_material_output");

diff --git a/framework/src/outputs/OutputWarehouse.C b/framework/src/outputs/OutputWarehouse.C
@@ -223,13 +223,10 @@ OutputWarehouse::setCommonParameters(InputParameters * params_ptr)
   _common_params_ptr = params_ptr;
 }
 
-InputParameters &
+InputParameters *
 OutputWarehouse::getCommonParameters()
 {
-  if (_common_params_ptr == NULL)
-    mooseError("No common input parameters are stored");
-
-  return *_common_params_ptr;
+  return _common_params_ptr;
 }
 
 std::set<Real> &

diff --git a/modules/tensor_mechanics/tests/jacobian/cosserat01.i b/modules/tensor_mechanics/tests/jacobian/cosserat01.i
@@ -112,9 +112,4 @@
 [Executioner]
   type = Transient
   solve_type = Newton
-[]
-
-[Outputs]
-  console = true
-[]
-
+[]
diff --git a/modules/tensor_mechanics/tests/jacobian/cosserat02.i b/modules/tensor_mechanics/tests/jacobian/cosserat02.i
@@ -113,9 +113,4 @@
 [Executioner]
   type = Transient
   solve_type = Newton
-[]
-
-[Outputs]
-  console = true
-[]
-
+[]
diff --git a/modules/tensor_mechanics/tests/jacobian/cosserat03.i b/modules/tensor_mechanics/tests/jacobian/cosserat03.i
@@ -114,8 +114,3 @@
   type = Transient
   solve_type = Newton
 []
-
-[Outputs]
-  console = true
-[]
-
diff --git a/modules/tensor_mechanics/tests/jacobian/cosserat04.i b/modules/tensor_mechanics/tests/jacobian/cosserat04.i
@@ -114,8 +114,3 @@
   type = Transient
   solve_type = Newton
 []
-
-[Outputs]
-  console = true
-[]
-
diff --git a/modules/tensor_mechanics/tests/jacobian/cosserat05.i b/modules/tensor_mechanics/tests/jacobian/cosserat05.i
@@ -114,8 +114,3 @@
   type = Transient
   solve_type = Newton
 []
-
-[Outputs]
-  console = true
-[]
-
diff --git a/modules/tensor_mechanics/tests/jacobian/cosserat06.i b/modules/tensor_mechanics/tests/jacobian/cosserat06.i
@@ -114,8 +114,3 @@
   type = Transient
   solve_type = Newton
 []
-
-[Outputs]
-  console = true
-[]
-
diff --git a/modules/tensor_mechanics/tests/static_deformations/cosserat_tension.i b/modules/tensor_mechanics/tests/static_deformations/cosserat_tension.i
@@ -212,6 +212,4 @@
 
 [Outputs]
   exodus = true
-  console = true
 []
-
diff --git a/test/tests/actions/aux_scalar_variable/aux_scalar_variable.i b/test/tests/actions/aux_scalar_variable/aux_scalar_variable.i
@@ -47,10 +47,6 @@
   petsc_options_value = 'hypre boomeramg'
 []
 
-[Outputs]
-  console = true
-[]
-
 [Debug]
   show_var_residual_norms = true
-[]
+[]
diff --git a/test/tests/auxkernels/element_aux_var/elemental_sort_test.i b/test/tests/auxkernels/element_aux_var/elemental_sort_test.i
@@ -80,7 +80,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     elemental_as_nodal = true

diff --git a/test/tests/auxkernels/nodal_aux_var/nodal_sort_test.i b/test/tests/auxkernels/nodal_aux_var/nodal_sort_test.i
@@ -81,7 +81,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     elemental_as_nodal = true

diff --git a/test/tests/auxkernels/normalization_aux/normalization_aux.i b/test/tests/auxkernels/normalization_aux/normalization_aux.i
@@ -76,6 +76,5 @@
 
 [Outputs]
   exodus = true
-  console = true
   output_initial = true
 []
diff --git a/test/tests/auxkernels/quotient_aux/quotient_aux.i b/test/tests/auxkernels/quotient_aux/quotient_aux.i
@@ -81,6 +81,5 @@
 
 [Outputs]
   exodus = true
-  console = true
   output_initial = true
 []
diff --git a/test/tests/auxkernels/time_derivative/time_derivative.i b/test/tests/auxkernels/time_derivative/time_derivative.i
@@ -80,6 +80,5 @@
 []
 
 [Outputs]
-  console = true
   exodus = true
 []
diff --git a/test/tests/materials/boundary_material/bnd_coupling_vol.i b/test/tests/materials/boundary_material/bnd_coupling_vol.i
@@ -136,6 +136,5 @@
 []
 
 [Outputs]
-  console = true
   exodus = true
 []
diff --git a/test/tests/mesh_modifiers/subdomain_bounding_box/oriented_subdomain_bounding_box.i b/test/tests/mesh_modifiers/subdomain_bounding_box/oriented_subdomain_bounding_box.i
@@ -44,5 +44,4 @@
 [Outputs]
   output_initial = true
   exodus = true
-  console = true
 []
diff --git a/test/tests/mesh_modifiers/subdomain_bounding_box/oriented_subdomain_bounding_box_inside.i b/test/tests/mesh_modifiers/subdomain_bounding_box/oriented_subdomain_bounding_box_inside.i
@@ -61,6 +61,4 @@
 [Outputs]
   output_initial = true
   exodus = true
-  console = true
 []
-
diff --git a/test/tests/mesh_modifiers/subdomain_bounding_box/oriented_subdomain_bounding_box_outside.i b/test/tests/mesh_modifiers/subdomain_bounding_box/oriented_subdomain_bounding_box_outside.i
@@ -61,5 +61,4 @@
 [Outputs]
   output_initial = true
   exodus = true
-  console = true
 []
diff --git a/test/tests/outputs/checkpoint/checkpoint_interval.i b/test/tests/outputs/checkpoint/checkpoint_interval.i
@@ -50,7 +50,6 @@
 
 [Outputs]
   exodus = true
-  console = true
   [./out]
     type = Checkpoint
     interval = 3

diff --git a/test/tests/outputs/console/console_no_outputs_block.i b/test/tests/outputs/console/console_no_outputs_block.i
@@ -0,0 +1,40 @@
+[Mesh]
+  type = GeneratedMesh
+  dim = 2
+  nx = 10
+  ny = 10
+[]
+
+[Variables]
+  [./u]
+  [../]
+[]
+
+[Kernels]
+  [./diff]
+    type = Diffusion
+    variable = u
+  [../]
+[]
+
+[BCs]
+  [./left]
+    type = DirichletBC
+    variable = u
+    boundary = left
+    value = 0
+  [../]
+  [./right]
+    type = DirichletBC
+    variable = u
+    boundary = right
+    value = 1
+  [../]
+[]
+
+[Executioner]
+  type = Steady
+  solve_type = 'PJFNK'
+  petsc_options_iname = '-pc_type -pc_hypre_type'
+  petsc_options_value = 'hypre boomeramg'
+[]
diff --git a/test/tests/outputs/console/tests b/test/tests/outputs/console/tests
@@ -1,4 +1,10 @@
 [Tests]
+  [./no_outputs_block]
+    # Test the a file w/o output outputs
+    type = RunApp
+    input = console_no_outputs_block.i
+    expect_out = 'Framework Information'
+  [../]
   [./postprocessors]
     # Tests if the header line for the postprocessor values table is correct
     type = RunApp
@@ -79,7 +85,7 @@
     expect_out = 'Time Step  4, time = -0.600000'
   [../]
   [./_console_output]
-    # Test the used of MooseObject::mooseConsole method
+    # Test the used of MooseObject::_console method
     type = RunApp
     input = 'moose_console.i'
     expect_out = 'ConsoleMessageKernel::timestepSetup - time = 0.4; t_step = 4'

diff --git a/test/tests/outputs/intervals/intervals.i b/test/tests/outputs/intervals/intervals.i
@@ -48,7 +48,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     output_initial = false

diff --git a/test/tests/outputs/intervals/multiple_sync_times.i b/test/tests/outputs/intervals/multiple_sync_times.i
@@ -48,7 +48,6 @@
 []
 
 [Outputs]
-  console = true
   [./exodus_3]
     type = Exodus
     interval = 3

diff --git a/test/tests/outputs/intervals/no_final_repeat.i b/test/tests/outputs/intervals/no_final_repeat.i
@@ -48,7 +48,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     output_final = true

diff --git a/test/tests/outputs/intervals/no_intermediate.i b/test/tests/outputs/intervals/no_intermediate.i
@@ -48,7 +48,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     output_initial = true

diff --git a/test/tests/outputs/intervals/no_output.i b/test/tests/outputs/intervals/no_output.i
@@ -48,7 +48,6 @@
 []
 
 [Outputs]
-  console = true
   [./exodus]
     type = Exodus
     output_initial = false

diff --git a/test/tests/outputs/intervals/output_final.i b/test/tests/outputs/intervals/output_final.i
@@ -48,7 +48,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     output_final = true

diff --git a/test/tests/outputs/intervals/sync_times.i b/test/tests/outputs/intervals/sync_times.i
@@ -49,7 +49,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     sync_times = '0.15 0.375 0.892'

diff --git a/test/tests/outputs/oversample/adapt.i b/test/tests/outputs/oversample/adapt.i
@@ -73,7 +73,6 @@
 []
 
 [Outputs]
-  console = true
   exodus = true
   [./oversample]
     type = Exodus

diff --git a/test/tests/outputs/oversample/oversample.i b/test/tests/outputs/oversample/oversample.i
@@ -40,7 +40,6 @@
 []
 
 [Outputs]
-  console = true
   [./out]
     type = Exodus
     output_initial = true

diff --git a/test/tests/outputs/oversample/oversample_file.i b/test/tests/outputs/oversample/oversample_file.i
@@ -40,7 +40,6 @@
 []
 
 [Outputs]
-  console = true
   [./exodus]
     type = Exodus
     output_initial = false

diff --git a/test/tests/problems/coupled_problem/steady.i b/test/tests/problems/coupled_problem/steady.i
@@ -59,7 +59,7 @@
 []
 
 [Outputs]
+  console = false
   output_initial = false
   exodus = true
-  console = true
 []
diff --git a/test/tests/problems/coupled_problem/ther-mech-ref.i b/test/tests/problems/coupled_problem/ther-mech-ref.i
@@ -140,5 +140,4 @@
 [Outputs]
   exodus = true
   output_initial = true
-  console = true
 []
diff --git a/test/tests/problems/coupled_problem/transient.i b/test/tests/problems/coupled_problem/transient.i
@@ -67,5 +67,5 @@
 [Outputs]
   output_initial = true
   exodus = true
-  console = true
+  console = false
 []
diff --git a/test/tests/time_integrators/implicit-euler/ie_adapt.i b/test/tests/time_integrators/implicit-euler/ie_adapt.i
@@ -111,5 +111,4 @@
 [Outputs]
   output_initial = false
   exodus = true
-  console = true
 []