From 19a8b25fd712a56e3c04327bbb4f3834e512ef64 Mon Sep 17 00:00:00 2001 From: Robert Carlsen Date: Tue, 13 Mar 2018 10:42:11 -0600 Subject: [PATCH] registry: update chemical reactions module follow up to #10952 --- .../src/actions/AddCoupledEqSpeciesAction.C | 4 ++ .../actions/AddCoupledSolidKinSpeciesAction.C | 4 ++ .../src/actions/AddPrimarySpeciesAction.C | 2 + .../src/actions/AddSecondarySpeciesAction.C | 2 + .../src/auxkernels/AqueousEquilibriumRxnAux.C | 2 + .../src/auxkernels/EquilibriumConstantAux.C | 2 + .../src/auxkernels/KineticDisPreConcAux.C | 2 + .../src/auxkernels/KineticDisPreRateAux.C | 2 + .../chemical_reactions/src/auxkernels/PHAux.C | 2 + .../src/auxkernels/TotalConcentrationAux.C | 2 + .../src/base/ChemicalReactionsApp.C | 62 +------------------ .../src/bcs/ChemicalOutFlowBC.C | 2 + .../src/kernels/CoupledBEEquilibriumSub.C | 2 + .../src/kernels/CoupledBEKinetic.C | 2 + .../kernels/CoupledConvectionReactionSub.C | 2 + .../src/kernels/CoupledDiffusionReactionSub.C | 2 + .../src/kernels/DarcyFluxPressure.C | 2 + .../src/kernels/DesorptionFromMatrix.C | 2 + .../src/kernels/DesorptionToPorespace.C | 2 + .../src/kernels/PrimaryConvection.C | 2 + .../src/kernels/PrimaryDiffusion.C | 2 + .../src/kernels/PrimaryTimeDerivative.C | 2 + .../src/materials/LangmuirMaterial.C | 2 + .../src/materials/MollifiedLangmuirMaterial.C | 2 + .../TotalMineralVolumeFraction.C | 2 + 25 files changed, 54 insertions(+), 60 deletions(-) diff --git a/modules/chemical_reactions/src/actions/AddCoupledEqSpeciesAction.C b/modules/chemical_reactions/src/actions/AddCoupledEqSpeciesAction.C index bb8872db32b1..7f4aa9d948ad 100644 --- 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() diff --git a/modules/chemical_reactions/src/actions/AddCoupledSolidKinSpeciesAction.C b/modules/chemical_reactions/src/actions/AddCoupledSolidKinSpeciesAction.C index fc565e252bc8..30442906b62f 100644 --- 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() diff --git a/modules/chemical_reactions/src/actions/AddPrimarySpeciesAction.C b/modules/chemical_reactions/src/actions/AddPrimarySpeciesAction.C index 8876a222497f..8fe247c2eb7b 100644 --- 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() diff --git a/modules/chemical_reactions/src/actions/AddSecondarySpeciesAction.C b/modules/chemical_reactions/src/actions/AddSecondarySpeciesAction.C index 253f370412cf..d2785e39888b 100644 --- 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() diff --git a/modules/chemical_reactions/src/auxkernels/AqueousEquilibriumRxnAux.C b/modules/chemical_reactions/src/auxkernels/AqueousEquilibriumRxnAux.C index ff046283c37d..c39e5824ea1c 100644 --- 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() diff --git a/modules/chemical_reactions/src/auxkernels/EquilibriumConstantAux.C b/modules/chemical_reactions/src/auxkernels/EquilibriumConstantAux.C index f25014fee8c5..a015cab9f9df 100644 --- 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() diff --git a/modules/chemical_reactions/src/auxkernels/KineticDisPreConcAux.C b/modules/chemical_reactions/src/auxkernels/KineticDisPreConcAux.C index bb8cf68399bc..aaf32313ca71 100644 --- 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() diff --git a/modules/chemical_reactions/src/auxkernels/KineticDisPreRateAux.C b/modules/chemical_reactions/src/auxkernels/KineticDisPreRateAux.C index a5a35c581b92..71b41ba3e19a 100644 --- 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() diff --git a/modules/chemical_reactions/src/auxkernels/PHAux.C b/modules/chemical_reactions/src/auxkernels/PHAux.C index 29f3c3892956..d49391167f37 100644 --- 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() diff --git a/modules/chemical_reactions/src/auxkernels/TotalConcentrationAux.C b/modules/chemical_reactions/src/auxkernels/TotalConcentrationAux.C index 00677f0f2af4..cba0e774355e 100644 --- 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() diff --git a/modules/chemical_reactions/src/base/ChemicalReactionsApp.C b/modules/chemical_reactions/src/base/ChemicalReactionsApp.C index 04a3b2588718..dc94a985ade1 100644 --- 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() @@ -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 index 8ecfded24f56..b5a1c5a485b1 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/CoupledBEEquilibriumSub.C b/modules/chemical_reactions/src/kernels/CoupledBEEquilibriumSub.C index 75e967e6beac..93266983f4dd 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/CoupledBEKinetic.C b/modules/chemical_reactions/src/kernels/CoupledBEKinetic.C index 136c9e629899..d6f87a595ebd 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C b/modules/chemical_reactions/src/kernels/CoupledConvectionReactionSub.C index 9a3c60441c25..9c27693c38e7 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C b/modules/chemical_reactions/src/kernels/CoupledDiffusionReactionSub.C index a0bbd24be379..d8133a008238 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/DarcyFluxPressure.C b/modules/chemical_reactions/src/kernels/DarcyFluxPressure.C index 616122f6e6c4..9bd8f62e9849 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/DesorptionFromMatrix.C b/modules/chemical_reactions/src/kernels/DesorptionFromMatrix.C index 9ce88ccaaa93..fc445f53dc6e 100644 --- a/modules/chemical_reactions/src/kernels/DesorptionFromMatrix.C +++ b/modules/chemical_reactions/src/kernels/DesorptionFromMatrix.C @@ -11,6 +11,8 @@ #include +registerMooseObject("ChemicalReactionsApp", DesorptionFromMatrix); + template <> InputParameters validParams() diff --git a/modules/chemical_reactions/src/kernels/DesorptionToPorespace.C b/modules/chemical_reactions/src/kernels/DesorptionToPorespace.C index 20041351b832..8cd2b76c27b2 100644 --- a/modules/chemical_reactions/src/kernels/DesorptionToPorespace.C +++ b/modules/chemical_reactions/src/kernels/DesorptionToPorespace.C @@ -11,6 +11,8 @@ #include +registerMooseObject("ChemicalReactionsApp", DesorptionToPorespace); + template <> InputParameters validParams() diff --git a/modules/chemical_reactions/src/kernels/PrimaryConvection.C b/modules/chemical_reactions/src/kernels/PrimaryConvection.C index f4d07bdb47bb..18b26db5e3e6 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/PrimaryDiffusion.C b/modules/chemical_reactions/src/kernels/PrimaryDiffusion.C index c6de52db6e1f..819579ed60aa 100644 --- 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() diff --git a/modules/chemical_reactions/src/kernels/PrimaryTimeDerivative.C b/modules/chemical_reactions/src/kernels/PrimaryTimeDerivative.C index 4f7b90305489..a2957d7f570c 100644 --- 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() diff --git a/modules/chemical_reactions/src/materials/LangmuirMaterial.C b/modules/chemical_reactions/src/materials/LangmuirMaterial.C index 262ac92d51cb..9b0108a16700 100644 --- 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() diff --git a/modules/chemical_reactions/src/materials/MollifiedLangmuirMaterial.C b/modules/chemical_reactions/src/materials/MollifiedLangmuirMaterial.C index ad4684104b14..0a652d352a8d 100644 --- 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() diff --git a/modules/chemical_reactions/src/postprocessors/TotalMineralVolumeFraction.C b/modules/chemical_reactions/src/postprocessors/TotalMineralVolumeFraction.C index 2b99bd9b8458..7e484bb87f4f 100644 --- 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()