registry: update chemical reactions module

follow up to idaholab#10952
rwcarlsen · Mar 14, 2018 · 19a8b25 · 19a8b25
1 parent 6e7b72a
commit 19a8b25
Show file tree

Hide file tree

Showing 25 changed files with 54 additions and 60 deletions.
diff --git a/modules/chemical_reactions/src/actions/AddCoupledEqSpeciesAction.C b/modules/chemical_reactions/src/actions/AddCoupledEqSpeciesAction.C
@@ -18,6 +18,10 @@
 // Regular expression includes
 #include "pcrecpp.h"
 
+registerMooseAction("ChemicalReactionsApp", AddCoupledEqSpeciesAction, "add_kernel");
+
+registerMooseAction("ChemicalReactionsApp", AddCoupledEqSpeciesAction, "add_aux_kernel");
+
 template <>
 InputParameters
 validParams<AddCoupledEqSpeciesAction>()

diff --git a/modules/chemical_reactions/src/actions/AddCoupledSolidKinSpeciesAction.C b/modules/chemical_reactions/src/actions/AddCoupledSolidKinSpeciesAction.C
@@ -18,6 +18,10 @@
 // Regular expression includes
 #include "pcrecpp.h"
 
+registerMooseAction("ChemicalReactionsApp", AddCoupledSolidKinSpeciesAction, "add_kernel");
+
+registerMooseAction("ChemicalReactionsApp", AddCoupledSolidKinSpeciesAction, "add_aux_kernel");
+
 template <>
 InputParameters
 validParams<AddCoupledSolidKinSpeciesAction>()

diff --git a/modules/chemical_reactions/src/actions/AddPrimarySpeciesAction.C b/modules/chemical_reactions/src/actions/AddPrimarySpeciesAction.C
@@ -10,6 +10,8 @@
 #include "AddPrimarySpeciesAction.h"
 #include "FEProblem.h"
 
+registerMooseAction("ChemicalReactionsApp", AddPrimarySpeciesAction, "add_variable");
+
 template <>
 InputParameters
 validParams<AddPrimarySpeciesAction>()

diff --git a/modules/chemical_reactions/src/actions/AddSecondarySpeciesAction.C b/modules/chemical_reactions/src/actions/AddSecondarySpeciesAction.C
@@ -10,6 +10,8 @@
 #include "AddSecondarySpeciesAction.h"
 #include "FEProblem.h"
 
+registerMooseAction("ChemicalReactionsApp", AddSecondarySpeciesAction, "add_aux_variable");
+
 template <>
 InputParameters
 validParams<AddSecondarySpeciesAction>()

diff --git a/modules/chemical_reactions/src/auxkernels/AqueousEquilibriumRxnAux.C b/modules/chemical_reactions/src/auxkernels/AqueousEquilibriumRxnAux.C
@@ -9,6 +9,8 @@
 
 #include "AqueousEquilibriumRxnAux.h"
 
+registerMooseObject("ChemicalReactionsApp", AqueousEquilibriumRxnAux);
+
 template <>
 InputParameters
 validParams<AqueousEquilibriumRxnAux>()

diff --git a/modules/chemical_reactions/src/auxkernels/EquilibriumConstantAux.C b/modules/chemical_reactions/src/auxkernels/EquilibriumConstantAux.C
@@ -9,6 +9,8 @@
 
 #include "EquilibriumConstantAux.h"
 
+registerMooseObject("ChemicalReactionsApp", EquilibriumConstantAux);
+
 template <>
 InputParameters
 validParams<EquilibriumConstantAux>()

diff --git a/modules/chemical_reactions/src/auxkernels/KineticDisPreConcAux.C b/modules/chemical_reactions/src/auxkernels/KineticDisPreConcAux.C
@@ -9,6 +9,8 @@
 
 #include "KineticDisPreConcAux.h"
 
+registerMooseObject("ChemicalReactionsApp", KineticDisPreConcAux);
+
 template <>
 InputParameters
 validParams<KineticDisPreConcAux>()

diff --git a/modules/chemical_reactions/src/auxkernels/KineticDisPreRateAux.C b/modules/chemical_reactions/src/auxkernels/KineticDisPreRateAux.C
@@ -9,6 +9,8 @@
 
 #include "KineticDisPreRateAux.h"
 
+registerMooseObject("ChemicalReactionsApp", KineticDisPreRateAux);
+
 template <>
 InputParameters
 validParams<KineticDisPreRateAux>()

diff --git a/modules/chemical_reactions/src/auxkernels/PHAux.C b/modules/chemical_reactions/src/auxkernels/PHAux.C
@@ -9,6 +9,8 @@
 
 #include "PHAux.h"
 
+registerMooseObject("ChemicalReactionsApp", PHAux);
+
 template <>
 InputParameters
 validParams<PHAux>()

diff --git a/modules/chemical_reactions/src/auxkernels/TotalConcentrationAux.C b/modules/chemical_reactions/src/auxkernels/TotalConcentrationAux.C
@@ -6,6 +6,8 @@
 /****************************************************************/
 #include "TotalConcentrationAux.h"
 
+registerMooseObject("ChemicalReactionsApp", TotalConcentrationAux);
+
 template <>
 InputParameters
 validParams<TotalConcentrationAux>()

diff --git a/modules/chemical_reactions/src/base/ChemicalReactionsApp.C b/modules/chemical_reactions/src/base/ChemicalReactionsApp.C
@@ -12,36 +12,6 @@
 #include "AppFactory.h"
 #include "MooseSyntax.h"
 
-#include "PrimaryTimeDerivative.h"
-#include "PrimaryConvection.h"
-#include "PrimaryDiffusion.h"
-#include "CoupledBEEquilibriumSub.h"
-#include "CoupledConvectionReactionSub.h"
-#include "CoupledDiffusionReactionSub.h"
-#include "CoupledBEKinetic.h"
-#include "DesorptionFromMatrix.h"
-#include "DesorptionToPorespace.h"
-#include "DarcyFluxPressure.h"
-
-#include "AqueousEquilibriumRxnAux.h"
-#include "KineticDisPreConcAux.h"
-#include "KineticDisPreRateAux.h"
-#include "PHAux.h"
-#include "TotalConcentrationAux.h"
-#include "EquilibriumConstantAux.h"
-
-#include "AddPrimarySpeciesAction.h"
-#include "AddSecondarySpeciesAction.h"
-#include "AddCoupledEqSpeciesAction.h"
-#include "AddCoupledSolidKinSpeciesAction.h"
-
-#include "ChemicalOutFlowBC.h"
-
-#include "LangmuirMaterial.h"
-#include "MollifiedLangmuirMaterial.h"
-
-#include "TotalMineralVolumeFraction.h"
-
 template <>
 InputParameters
 validParams<ChemicalReactionsApp>()
@@ -86,30 +56,7 @@ ChemicalReactionsApp__registerObjects(Factory & factory)
 void
 ChemicalReactionsApp::registerObjects(Factory & factory)
 {
-  registerKernel(PrimaryTimeDerivative);
-  registerKernel(PrimaryConvection);
-  registerKernel(PrimaryDiffusion);
-  registerKernel(CoupledBEEquilibriumSub);
-  registerKernel(CoupledConvectionReactionSub);
-  registerKernel(CoupledDiffusionReactionSub);
-  registerKernel(CoupledBEKinetic);
-  registerKernel(DesorptionFromMatrix);
-  registerKernel(DesorptionToPorespace);
-  registerKernel(DarcyFluxPressure);
-
-  registerAux(AqueousEquilibriumRxnAux);
-  registerAux(KineticDisPreConcAux);
-  registerAux(KineticDisPreRateAux);
-  registerAux(PHAux);
-  registerAux(TotalConcentrationAux);
-  registerAux(EquilibriumConstantAux);
-
-  registerBoundaryCondition(ChemicalOutFlowBC);
-
-  registerMaterial(LangmuirMaterial);
-  registerMaterial(MollifiedLangmuirMaterial);
-
-  registerPostprocessor(TotalMineralVolumeFraction);
+  Registry::registerObjectsTo(factory, {"ChemicalReactionsApp"});
 }
 
 // External entry point for dynamic syntax association
@@ -121,18 +68,13 @@ ChemicalReactionsApp__associateSyntax(Syntax & syntax, ActionFactory & action_fa
 void
 ChemicalReactionsApp::associateSyntax(Syntax & syntax, ActionFactory & action_factory)
 {
+  Registry::registerActionsTo(action_factory, {"ChemicalReactionsApp"});
   registerSyntax("AddPrimarySpeciesAction", "ReactionNetwork/AqueousEquilibriumReactions");
   registerSyntax("AddPrimarySpeciesAction", "ReactionNetwork/SolidKineticReactions");
   registerSyntax("AddSecondarySpeciesAction", "ReactionNetwork/AqueousEquilibriumReactions");
   registerSyntax("AddSecondarySpeciesAction", "ReactionNetwork/SolidKineticReactions");
   registerSyntax("AddCoupledEqSpeciesAction", "ReactionNetwork/AqueousEquilibriumReactions");
   registerSyntax("AddCoupledSolidKinSpeciesAction", "ReactionNetwork/SolidKineticReactions");
-  registerAction(AddPrimarySpeciesAction, "add_variable");
-  registerAction(AddSecondarySpeciesAction, "add_aux_variable");
-  registerAction(AddCoupledEqSpeciesAction, "add_kernel");
-  registerAction(AddCoupledEqSpeciesAction, "add_aux_kernel");
-  registerAction(AddCoupledSolidKinSpeciesAction, "add_kernel");
-  registerAction(AddCoupledSolidKinSpeciesAction, "add_aux_kernel");
 }
 
 // External entry point for dynamic execute flag registration

diff --git a/modules/chemical_reactions/src/bcs/ChemicalOutFlowBC.C b/modules/chemical_reactions/src/bcs/ChemicalOutFlowBC.C
@@ -9,6 +9,8 @@
 
 #include "ChemicalOutFlowBC.h"
 
+registerMooseObject("ChemicalReactionsApp", ChemicalOutFlowBC);
+
 template <>
 InputParameters
 validParams<ChemicalOutFlowBC>()

diff --git a/modules/chemical_reactions/src/kernels/CoupledBEEquilibriumSub.C b/modules/chemical_reactions/src/kernels/CoupledBEEquilibriumSub.C
@@ -9,6 +9,8 @@
 
 #include "CoupledBEEquilibriumSub.h"
 
+registerMooseObject("ChemicalReactionsApp", CoupledBEEquilibriumSub);
+
 template <>
 InputParameters
 validParams<CoupledBEEquilibriumSub>()

diff --git a/modules/chemical_reactions/src/kernels/CoupledBEKinetic.C b/modules/chemical_reactions/src/kernels/CoupledBEKinetic.C
@@ -9,6 +9,8 @@
 
 #include "CoupledBEKinetic.h"
 
+registerMooseObject("ChemicalReactionsApp", CoupledBEKinetic);
+
 template <>
 InputParameters
 validParams<CoupledBEKinetic>()

diff --git a/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C b/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C
@@ -9,6 +9,8 @@
 
 #include "CoupledConvectionReactionSub.h"
 
+registerMooseObject("ChemicalReactionsApp", CoupledConvectionReactionSub);
+
 template <>
 InputParameters
 validParams<CoupledConvectionReactionSub>()

diff --git a/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C b/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C
@@ -9,6 +9,8 @@
 
 #include "CoupledDiffusionReactionSub.h"
 
+registerMooseObject("ChemicalReactionsApp", CoupledDiffusionReactionSub);
+
 template <>
 InputParameters
 validParams<CoupledDiffusionReactionSub>()

diff --git a/modules/chemical_reactions/src/kernels/DarcyFluxPressure.C b/modules/chemical_reactions/src/kernels/DarcyFluxPressure.C
@@ -9,6 +9,8 @@
 
 #include "DarcyFluxPressure.h"
 
+registerMooseObject("ChemicalReactionsApp", DarcyFluxPressure);
+
 template <>
 InputParameters
 validParams<DarcyFluxPressure>()

diff --git a/modules/chemical_reactions/src/kernels/DesorptionFromMatrix.C b/modules/chemical_reactions/src/kernels/DesorptionFromMatrix.C
@@ -11,6 +11,8 @@
 
 #include <iostream>
 
+registerMooseObject("ChemicalReactionsApp", DesorptionFromMatrix);
+
 template <>
 InputParameters
 validParams<DesorptionFromMatrix>()

diff --git a/modules/chemical_reactions/src/kernels/DesorptionToPorespace.C b/modules/chemical_reactions/src/kernels/DesorptionToPorespace.C
@@ -11,6 +11,8 @@
 
 #include <iostream>
 
+registerMooseObject("ChemicalReactionsApp", DesorptionToPorespace);
+
 template <>
 InputParameters
 validParams<DesorptionToPorespace>()

diff --git a/modules/chemical_reactions/src/kernels/PrimaryConvection.C b/modules/chemical_reactions/src/kernels/PrimaryConvection.C
@@ -9,6 +9,8 @@
 
 #include "PrimaryConvection.h"
 
+registerMooseObject("ChemicalReactionsApp", PrimaryConvection);
+
 template <>
 InputParameters
 validParams<PrimaryConvection>()

diff --git a/modules/chemical_reactions/src/kernels/PrimaryDiffusion.C b/modules/chemical_reactions/src/kernels/PrimaryDiffusion.C
@@ -9,6 +9,8 @@
 
 #include "PrimaryDiffusion.h"
 
+registerMooseObject("ChemicalReactionsApp", PrimaryDiffusion);
+
 template <>
 InputParameters
 validParams<PrimaryDiffusion>()

diff --git a/modules/chemical_reactions/src/kernels/PrimaryTimeDerivative.C b/modules/chemical_reactions/src/kernels/PrimaryTimeDerivative.C
@@ -9,6 +9,8 @@
 
 #include "PrimaryTimeDerivative.h"
 
+registerMooseObject("ChemicalReactionsApp", PrimaryTimeDerivative);
+
 template <>
 InputParameters
 validParams<PrimaryTimeDerivative>()

diff --git a/modules/chemical_reactions/src/materials/LangmuirMaterial.C b/modules/chemical_reactions/src/materials/LangmuirMaterial.C
@@ -10,6 +10,8 @@
 #include "LangmuirMaterial.h"
 #include "libmesh/utility.h"
 
+registerMooseObject("ChemicalReactionsApp", LangmuirMaterial);
+
 template <>
 InputParameters
 validParams<LangmuirMaterial>()

diff --git a/modules/chemical_reactions/src/materials/MollifiedLangmuirMaterial.C b/modules/chemical_reactions/src/materials/MollifiedLangmuirMaterial.C
@@ -9,6 +9,8 @@
 
 #include "MollifiedLangmuirMaterial.h"
 
+registerMooseObject("ChemicalReactionsApp", MollifiedLangmuirMaterial);
+
 template <>
 InputParameters
 validParams<MollifiedLangmuirMaterial>()

diff --git a/modules/chemical_reactions/src/postprocessors/TotalMineralVolumeFraction.C b/modules/chemical_reactions/src/postprocessors/TotalMineralVolumeFraction.C
@@ -9,6 +9,8 @@
 
 #include "TotalMineralVolumeFraction.h"
 
+registerMooseObject("ChemicalReactionsApp", TotalMineralVolumeFraction);
+
 template <>
 InputParameters
 validParams<TotalMineralVolumeFraction>()