update tutorial

idaholab · Mar 9, 2018 · fef675c · fef675c
1 parent a76ce3d
commit fef675c
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 361 deletions.
diff --git a/framework/src/base/Moose.C b/framework/src/base/Moose.C
@@ -46,7 +46,7 @@ namespace Moose
 void
 registerObjects(Factory & factory)
 {
-  registerObjects(factory, {"MooseApp", factory.app().type()});
+  registerObjects(factory, {"MooseApp"});
 }
 
 void

diff --git a/tutorials/darcy_thermo_mech/step01_diffusion/include/base/DarcyThermoMechApp.h b/tutorials/darcy_thermo_mech/step01_diffusion/include/base/DarcyThermoMechApp.h
@@ -23,7 +23,6 @@ class DarcyThermoMechApp : public MooseApp
   DarcyThermoMechApp(InputParameters parameters);
 
   static void registerApps();
-  static void registerObjects(Factory & factory);
   static void associateSyntax(Syntax & syntax, ActionFactory & action_factory);
 };
 

diff --git a/tutorials/darcy_thermo_mech/step01_diffusion/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step01_diffusion/src/base/DarcyThermoMechApp.C
@@ -26,8 +26,8 @@ validParams<DarcyThermoMechApp>()
 DarcyThermoMechApp::DarcyThermoMechApp(InputParameters parameters) : MooseApp(parameters)
 {
   Moose::registerObjects(_factory);
+  Registry::registerObjectsTo(_factory, {type()});
   ModulesApp::registerObjects(_factory);
-  DarcyThermoMechApp::registerObjects(_factory);
 
   Moose::associateSyntax(_syntax, _action_factory);
   ModulesApp::associateSyntax(_syntax, _action_factory);
@@ -40,11 +40,6 @@ DarcyThermoMechApp::registerApps()
   registerApp(DarcyThermoMechApp);
 }
 
-void
-DarcyThermoMechApp::registerObjects(Factory & /*factory*/)
-{
-}
-
 void
 DarcyThermoMechApp::associateSyntax(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
 {

diff --git a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/kernels/DarcyPressure.C b/tutorials/darcy_thermo_mech/step02_darcy_pressure/src/kernels/DarcyPressure.C
@@ -9,6 +9,8 @@
 
 #include "DarcyPressure.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyPressure);
+
 template <>
 InputParameters
 validParams<DarcyPressure>()

diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/kernels/DarcyPressure.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/kernels/DarcyPressure.C
@@ -9,6 +9,8 @@
 
 #include "DarcyPressure.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyPressure);
+
 template <>
 InputParameters
 validParams<DarcyPressure>()

diff --git a/tutorials/darcy_thermo_mech/step03_darcy_material/src/materials/PackedColumn.C b/tutorials/darcy_thermo_mech/step03_darcy_material/src/materials/PackedColumn.C
@@ -9,6 +9,8 @@
 
 #include "PackedColumn.h"
 
+registerMooseObject("DarcyThermoMechApp", PackedColumn);
+
 template <>
 InputParameters
 validParams<PackedColumn>()

diff --git a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/auxkernels/DarcyVelocity.C b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/auxkernels/DarcyVelocity.C
@@ -9,6 +9,8 @@
 
 #include "DarcyVelocity.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyVelocity);
+
 template <>
 InputParameters
 validParams<DarcyVelocity>()

diff --git a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step04_velocity_aux/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
diff --git a/tutorials/darcy_thermo_mech/step05_heat_conduction/src/bcs/HeatConductionOutflow.C b/tutorials/darcy_thermo_mech/step05_heat_conduction/src/bcs/HeatConductionOutflow.C
@@ -9,6 +9,8 @@
 
 #include "HeatConductionOutflow.h"
 
+registerMooseObject("DarcyThermoMechApp", HeatConductionOutflow);
+
 template <>
 InputParameters
 validParams<HeatConductionOutflow>()

diff --git a/...ials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C b/...ials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C
diff --git a/...ials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C b/...ials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/base/DarcyThermoMechApp.C
@@ -0,0 +1 @@
+../../../step01_diffusion/src/base/DarcyThermoMechApp.C
diff --git a/...ials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/kernels/DarcyConvection.C b/...ials/darcy_thermo_mech/step06_coupled_darcy_heat_conduction/src/kernels/DarcyConvection.C
@@ -9,6 +9,8 @@
 
 #include "DarcyConvection.h"
 
+registerMooseObject("DarcyThermoMechApp", DarcyConvection);
+
 template <>
 InputParameters
 validParams<DarcyConvection>()