update examples to use new registry

follow up to idaholab#10952
rwcarlsen · Mar 9, 2018 · d085581 · d085581
1 parent 339541e
commit d085581
Show file tree

Hide file tree

Showing 59 changed files with 177 additions and 108 deletions.
diff --git a/examples/ex01_inputfile/src/base/ExampleApp.C b/examples/ex01_inputfile/src/base/ExampleApp.C
@@ -32,8 +32,9 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 }
 
 void
-ExampleApp::registerObjects(Factory & /*factory*/)
+ExampleApp::registerObjects(Factory & factory)
 {
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -43,6 +44,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex02_kernel/src/base/ExampleApp.C b/examples/ex02_kernel/src/base/ExampleApp.C
@@ -37,8 +37,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  // Register any custom objects you have built on the MOOSE Framework
-  registerKernel(ExampleConvection); // <- registration
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -48,6 +47,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex02_kernel/src/kernels/ExampleConvection.C b/examples/ex02_kernel/src/kernels/ExampleConvection.C
@@ -13,6 +13,8 @@
  * This function defines the valid parameters for
  * this Kernel and their default values
  */
+registerMooseObject("ExampleApp", ExampleConvection);
+
 template <>
 InputParameters
 validParams<ExampleConvection>()

diff --git a/examples/ex03_coupling/src/base/ExampleApp.C b/examples/ex03_coupling/src/base/ExampleApp.C
@@ -37,7 +37,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  registerKernel(ExampleConvection);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -47,6 +47,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex03_coupling/src/kernels/ExampleConvection.C b/examples/ex03_coupling/src/kernels/ExampleConvection.C
@@ -9,6 +9,8 @@
 
 #include "ExampleConvection.h"
 
+registerMooseObject("ExampleApp", ExampleConvection);
+
 template <>
 InputParameters
 validParams<ExampleConvection>()

diff --git a/examples/ex04_bcs/src/base/ExampleApp.C b/examples/ex04_bcs/src/base/ExampleApp.C
@@ -40,10 +40,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  registerKernel(ExampleConvection);
-  registerKernel(ExampleGaussContForcing);       // Extra forcing term
-  registerBoundaryCondition(CoupledDirichletBC); // Register our Boundary Conditions
-  registerBoundaryCondition(CoupledNeumannBC);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -53,6 +50,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex04_bcs/src/bcs/CoupledDirichletBC.C b/examples/ex04_bcs/src/bcs/CoupledDirichletBC.C
@@ -9,6 +9,8 @@
 
 #include "CoupledDirichletBC.h"
 
+registerMooseObject("ExampleApp", CoupledDirichletBC);
+
 template <>
 InputParameters
 validParams<CoupledDirichletBC>()

diff --git a/examples/ex04_bcs/src/bcs/CoupledNeumannBC.C b/examples/ex04_bcs/src/bcs/CoupledNeumannBC.C
@@ -9,6 +9,8 @@
 
 #include "CoupledNeumannBC.h"
 
+registerMooseObject("ExampleApp", CoupledNeumannBC);
+
 template <>
 InputParameters
 validParams<CoupledNeumannBC>()

diff --git a/examples/ex04_bcs/src/kernels/ExampleConvection.C b/examples/ex04_bcs/src/kernels/ExampleConvection.C
@@ -9,6 +9,8 @@
 
 #include "ExampleConvection.h"
 
+registerMooseObject("ExampleApp", ExampleConvection);
+
 template <>
 InputParameters
 validParams<ExampleConvection>()

diff --git a/examples/ex04_bcs/src/kernels/ExampleGaussContForcing.C b/examples/ex04_bcs/src/kernels/ExampleGaussContForcing.C
@@ -9,6 +9,8 @@
 
 #include "ExampleGaussContForcing.h"
 
+registerMooseObject("ExampleApp", ExampleGaussContForcing);
+
 template <>
 InputParameters
 validParams<ExampleGaussContForcing>()

diff --git a/examples/ex05_amr/src/base/ExampleApp.C b/examples/ex05_amr/src/base/ExampleApp.C
@@ -38,8 +38,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  registerKernel(ExampleConvection);
-  registerKernel(ExampleCoefDiffusion);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -49,6 +48,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex05_amr/src/kernels/ExampleCoefDiffusion.C b/examples/ex05_amr/src/kernels/ExampleCoefDiffusion.C
@@ -9,6 +9,8 @@
 
 #include "ExampleCoefDiffusion.h"
 
+registerMooseObject("ExampleApp", ExampleCoefDiffusion);
+
 template <>
 InputParameters
 validParams<ExampleCoefDiffusion>()

diff --git a/examples/ex05_amr/src/kernels/ExampleConvection.C b/examples/ex05_amr/src/kernels/ExampleConvection.C
@@ -9,6 +9,8 @@
 
 #include "ExampleConvection.h"
 
+registerMooseObject("ExampleApp", ExampleConvection);
+
 template <>
 InputParameters
 validParams<ExampleConvection>()

diff --git a/examples/ex06_transient/src/base/ExampleApp.C b/examples/ex06_transient/src/base/ExampleApp.C
@@ -39,9 +39,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  registerKernel(ExampleConvection);
-  registerKernel(ExampleDiffusion);
-  registerKernel(ExampleTimeDerivative);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -51,6 +49,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex06_transient/src/kernels/ExampleConvection.C b/examples/ex06_transient/src/kernels/ExampleConvection.C
@@ -9,6 +9,8 @@
 
 #include "ExampleConvection.h"
 
+registerMooseObject("ExampleApp", ExampleConvection);
+
 template <>
 InputParameters
 validParams<ExampleConvection>()

diff --git a/examples/ex06_transient/src/kernels/ExampleDiffusion.C b/examples/ex06_transient/src/kernels/ExampleDiffusion.C
@@ -9,6 +9,8 @@
 
 #include "ExampleDiffusion.h"
 
+registerMooseObject("ExampleApp", ExampleDiffusion);
+
 template <>
 InputParameters
 validParams<ExampleDiffusion>()

diff --git a/examples/ex06_transient/src/kernels/ExampleTimeDerivative.C b/examples/ex06_transient/src/kernels/ExampleTimeDerivative.C
@@ -11,6 +11,8 @@
 
 #include "Material.h"
 
+registerMooseObject("ExampleApp", ExampleTimeDerivative);
+
 template <>
 InputParameters
 validParams<ExampleTimeDerivative>()

diff --git a/examples/ex07_ics/src/base/ExampleApp.C b/examples/ex07_ics/src/base/ExampleApp.C
@@ -37,8 +37,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  // Register our custom Initial Condition with the Factory
-  registerInitialCondition(ExampleIC);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -48,6 +47,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex07_ics/src/ics/ExampleIC.C b/examples/ex07_ics/src/ics/ExampleIC.C
@@ -9,6 +9,8 @@
 
 #include "ExampleIC.h"
 
+registerMooseObject("ExampleApp", ExampleIC);
+
 template <>
 InputParameters
 validParams<ExampleIC>()

diff --git a/examples/ex08_materials/src/base/ExampleApp.C b/examples/ex08_materials/src/base/ExampleApp.C
@@ -39,13 +39,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  registerKernel(ExampleConvection);
-
-  // Our new Diffusion Kernel that accepts a material property
-  registerKernel(ExampleDiffusion);
-
-  // Register our new material class so we can use it.
-  registerMaterial(ExampleMaterial);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -55,6 +49,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex08_materials/src/kernels/ExampleConvection.C b/examples/ex08_materials/src/kernels/ExampleConvection.C
@@ -9,6 +9,8 @@
 
 #include "ExampleConvection.h"
 
+registerMooseObject("ExampleApp", ExampleConvection);
+
 template <>
 InputParameters
 validParams<ExampleConvection>()

diff --git a/examples/ex08_materials/src/kernels/ExampleDiffusion.C b/examples/ex08_materials/src/kernels/ExampleDiffusion.C
@@ -13,6 +13,8 @@
  * This function defines the valid parameters for
  * this Kernel and their default values
  */
+registerMooseObject("ExampleApp", ExampleDiffusion);
+
 template <>
 InputParameters
 validParams<ExampleDiffusion>()

diff --git a/examples/ex08_materials/src/materials/ExampleMaterial.C b/examples/ex08_materials/src/materials/ExampleMaterial.C
@@ -9,6 +9,8 @@
 
 #include "ExampleMaterial.h"
 
+registerMooseObject("ExampleApp", ExampleMaterial);
+
 template <>
 InputParameters
 validParams<ExampleMaterial>()

diff --git a/examples/ex09_stateful_materials/src/base/ExampleApp.C b/examples/ex09_stateful_materials/src/base/ExampleApp.C
@@ -39,9 +39,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  registerKernel(ExampleConvection);
-  registerKernel(ExampleDiffusion);
-  registerMaterial(ExampleMaterial);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -51,6 +49,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex09_stateful_materials/src/kernels/ExampleConvection.C b/examples/ex09_stateful_materials/src/kernels/ExampleConvection.C
@@ -9,6 +9,8 @@
 
 #include "ExampleConvection.h"
 
+registerMooseObject("ExampleApp", ExampleConvection);
+
 template <>
 InputParameters
 validParams<ExampleConvection>()

diff --git a/examples/ex09_stateful_materials/src/kernels/ExampleDiffusion.C b/examples/ex09_stateful_materials/src/kernels/ExampleDiffusion.C
@@ -11,6 +11,8 @@
 
 #include "Material.h"
 
+registerMooseObject("ExampleApp", ExampleDiffusion);
+
 template <>
 InputParameters
 validParams<ExampleDiffusion>()

diff --git a/examples/ex09_stateful_materials/src/materials/ExampleMaterial.C b/examples/ex09_stateful_materials/src/materials/ExampleMaterial.C
@@ -9,6 +9,8 @@
 
 #include "ExampleMaterial.h"
 
+registerMooseObject("ExampleApp", ExampleMaterial);
+
 template <>
 InputParameters
 validParams<ExampleMaterial>()

diff --git a/examples/ex10_aux/src/base/ExampleApp.C b/examples/ex10_aux/src/base/ExampleApp.C
@@ -37,8 +37,7 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 void
 ExampleApp::registerObjects(Factory & factory)
 {
-  // Register our Example AuxKernel with the AuxFactory
-  registerAux(ExampleAux);
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -48,6 +47,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }
diff --git a/examples/ex11_prec/src/base/ExampleApp.C b/examples/ex11_prec/src/base/ExampleApp.C
@@ -32,8 +32,9 @@ ExampleApp::ExampleApp(InputParameters parameters) : MooseApp(parameters)
 }
 
 void
-ExampleApp::registerObjects(Factory & /*factory*/)
+ExampleApp::registerObjects(Factory & factory)
 {
+  Registry::registerObjectsTo(factory, {"ExampleApp"});
 }
 
 void
@@ -43,6 +44,7 @@ ExampleApp::registerApps()
 }
 
 void
-ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
+ExampleApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ExampleApp"});
 }