Update validParams functions (idaholab#410)

snschune · Mar 3, 2020 · 30e3e98 · 30e3e98
1 parent c7bf19b
commit 30e3e98
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 35 deletions.
diff --git a/include/postprocessors/DPAPostprocessor.h b/include/postprocessors/DPAPostprocessor.h
@@ -13,15 +13,13 @@
 #include "GeneralPostprocessor.h"
 
 // forward declarations
-class DPAPostprocessor;
 class DPAUserObjectBase;
 
-template <>
-InputParameters validParams<DPAPostprocessor>();
-
 class DPAPostprocessor : public GeneralPostprocessor
 {
 public:
+  static InputParameters validParams();
+
   DPAPostprocessor(const InputParameters & parameters);
   virtual void execute() override {}
   virtual void initialize() override {}

diff --git a/include/userobjects/DPAUserObjectBase.h b/include/userobjects/DPAUserObjectBase.h
@@ -11,14 +11,11 @@
 
 #include "GeneralUserObject.h"
 
-class DPAUserObjectBase;
-
-template <>
-InputParameters validParams<DPAUserObjectBase>();
-
 class DPAUserObjectBase : public GeneralUserObject
 {
 public:
+  static InputParameters validParams();
+
   DPAUserObjectBase(const InputParameters & parameters);
 
   ///@{ get the

diff --git a/include/userobjects/FunctionDPAUserObject.h b/include/userobjects/FunctionDPAUserObject.h
@@ -13,14 +13,11 @@
 #include "DPAUserObjectBase.h"
 #include "LinearInterpolation.h"
 
-class FunctionDPAUserObject;
-
-template <>
-InputParameters validParams<FunctionDPAUserObject>();
-
 class FunctionDPAUserObject : public DPAUserObjectBase
 {
 public:
+  static InputParameters validParams();
+
   FunctionDPAUserObject(const InputParameters & parameters);
   void finalize() override;
   void execute() override;

diff --git a/include/userobjects/ParkinCoulterDPAUserObject.h b/include/userobjects/ParkinCoulterDPAUserObject.h
@@ -12,14 +12,11 @@
 #include "DPAUserObjectBase.h"
 #include "ParkinCoulterInterface.h"
 
-class ParkinCoulterDPAUserObject;
-
-template <>
-InputParameters validParams<ParkinCoulterDPAUserObject>();
-
 class ParkinCoulterDPAUserObject : public DPAUserObjectBase, public ParkinCoulterInterface
 {
 public:
+  static InputParameters validParams();
+
   ParkinCoulterDPAUserObject(const InputParameters & parameters);
   void finalize() override;
   void execute() override;

diff --git a/include/userobjects/ParkinCoulterInterface.h b/include/userobjects/ParkinCoulterInterface.h
@@ -16,14 +16,10 @@
 // mytrim includes
 #include <mytrim/element.h>
 
-class ParkinCoulterInterface;
 class PolyatomicDisplacementFunction;
 class PolyatomicDamageEnergyFunction;
 class PolyatomicDisplacementDerivativeFunction;
 
-template <>
-InputParameters validParams<ParkinCoulterInterface>();
-
 class ParkinCoulterInterface
 {
 public:

diff --git a/src/postprocessors/DPAPostprocessor.C b/src/postprocessors/DPAPostprocessor.C
@@ -13,11 +13,10 @@
 
 registerMooseObject("MagpieApp", DPAPostprocessor);
 
-template <>
 InputParameters
-validParams<DPAPostprocessor>()
+DPAPostprocessor::validParams()
 {
-  InputParameters params = validParams<GeneralPostprocessor>();
+  InputParameters params = GeneralPostprocessor::validParams();
   params.addRequiredParam<UserObjectName>("dpa_object", "The neutronics damage object.");
   params.addClassDescription("Retrieves the value of the dpa from a DPAUserObjectBase.");
   return params;

diff --git a/src/userobjects/DPAUserObjectBase.C b/src/userobjects/DPAUserObjectBase.C
@@ -11,11 +11,10 @@
 #include "DPAUserObjectBase.h"
 #include "PolyatomicDisplacementFunction.h"
 
-template <>
 InputParameters
-validParams<DPAUserObjectBase>()
+DPAUserObjectBase::validParams()
 {
-  InputParameters params = validParams<GeneralUserObject>();
+  InputParameters params = GeneralUserObject::validParams();
   params.addParam<Real>("irradiation_time", "Irradiation time used ");
   MultiMooseEnum damage_reaction_types("elastic inelastic");
   params.addParam<MultiMooseEnum>("damage_reaction_types",

diff --git a/src/userobjects/FunctionDPAUserObject.C b/src/userobjects/FunctionDPAUserObject.C
@@ -13,11 +13,10 @@
 
 registerMooseObject("MagpieApp", FunctionDPAUserObject);
 
-template <>
 InputParameters
-validParams<FunctionDPAUserObject>()
+FunctionDPAUserObject::validParams()
 {
-  InputParameters params = validParams<DPAUserObjectBase>();
+  InputParameters params = DPAUserObjectBase::validParams();
   params.addRequiredParam<std::vector<std::vector<FunctionName>>>(
       "damage_functions", "Damage functions for each combinations of projectiles and targets.");
   params.addParam<Real>(

diff --git a/src/userobjects/ParkinCoulterDPAUserObject.C b/src/userobjects/ParkinCoulterDPAUserObject.C
@@ -20,11 +20,10 @@
 
 registerMooseObject("MagpieApp", ParkinCoulterDPAUserObject);
 
-template <>
 InputParameters
-validParams<ParkinCoulterDPAUserObject>()
+ParkinCoulterDPAUserObject::validParams()
 {
-  InputParameters params = validParams<DPAUserObjectBase>();
+  InputParameters params = DPAUserObjectBase::validParams();
   params += ParkinCoulterInterface::validParams();
   params.addClassDescription(
       "Computes the dose in dpa from composition, cross section, damage type, and neutron flux for "