Merge pull request idaholab#110 from lynnmunday/issue_109

update validParams to be static member functions and not templates

include/actions/SetReactionNetworkAction.h

@@ -20,14 +20,12 @@
 // libMesh includes
 #include "libmesh/fe_type.h"
 
-class SetReactionNetworkAction;
 
-template <>
-InputParameters validParams<SetReactionNetworkAction>();
 
 class SetReactionNetworkAction : public Action
 {
 public:
+  static InputParameters validParams();
   SetReactionNetworkAction(InputParameters params);
 
   virtual void act();

include/auxkernels/MineralDissolutionPrecipAux.h

@@ -16,23 +16,14 @@
 
 #include "AuxKernel.h"
 
-// Forward Declarations
-class MineralDissolutionPrecipAux;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<MineralDissolutionPrecipAux>();
-
 /**
  * Define the AuxKernel for the kinetic mineral species concentrations
  * according to transient state theory rate law.
  */
 class MineralDissolutionPrecipAux : public AuxKernel
 {
 public:
+  static InputParameters validParams();
   /**
    * Factory constructor, takes parameters so that all derived classes can be built using the same
    * constructor.

include/base/BlackBearApp.h

@@ -16,14 +16,12 @@
 
 #include "MooseApp.h"
 
-class BlackBearApp;
 
-template <>
-InputParameters validParams<BlackBearApp>();
 
 class BlackBearApp : public MooseApp
 {
 public:
+  static InputParameters validParams();
   BlackBearApp(InputParameters parameters);
   virtual ~BlackBearApp();
 

include/bcs/SpecifiedVaporPressureBC.h

@@ -16,10 +16,7 @@
 
 #include "NodalBC.h"
 
-class SpecifiedVaporPressureBC;
 
-template <>
-InputParameters validParams<SpecifiedVaporPressureBC>();
 
 /**
  * Boundary condition of a Dirichlet type
@@ -29,6 +26,7 @@ InputParameters validParams<SpecifiedVaporPressureBC>();
 class SpecifiedVaporPressureBC : public NodalBC
 {
 public:
+  static InputParameters validParams();
   SpecifiedVaporPressureBC(const InputParameters & parameters);
 
 protected:

include/kernels/ConcreteLatentHeat.h

@@ -16,16 +16,6 @@
 
 #include "TimeDerivative.h"
 
-// Forward Declaration
-class ConcreteLatentHeat;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<ConcreteLatentHeat>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<ConcreteLatentHeat>();
 class ConcreteLatentHeat : public TimeDerivative
 {
 public:
+  static InputParameters validParams();
   ConcreteLatentHeat(const InputParameters & parameters);
 
 protected:

include/kernels/ConcreteMoistureDehydration.h

@@ -16,16 +16,6 @@
 
 #include "TimeDerivative.h"
 
-// Forward Declaration
-class ConcreteMoistureDehydration;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<ConcreteMoistureDehydration>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<ConcreteMoistureDehydration>();
 class ConcreteMoistureDehydration : public TimeDerivative
 {
 public:
+  static InputParameters validParams();
   ConcreteMoistureDehydration(const InputParameters & parameters);
 
 protected:

include/kernels/ConcreteMoistureDiffusion.h

@@ -16,16 +16,6 @@
 
 #pragma once
 
-// Forward Declarations
-class ConcreteMoistureDiffusion;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<ConcreteMoistureDiffusion>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<ConcreteMoistureDiffusion>();
 class ConcreteMoistureDiffusion : public Diffusion
 {
 public:
+  static InputParameters validParams();
   ConcreteMoistureDiffusion(const InputParameters & parameters);
 
 protected:

include/kernels/ConcreteMoistureTimeIntegration.h

@@ -16,16 +16,6 @@
 
 #include "TimeDerivative.h"
 
-// Forward Declaration
-class ConcreteMoistureTimeIntegration;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<ConcreteMoistureTimeIntegration>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<ConcreteMoistureTimeIntegration>();
 class ConcreteMoistureTimeIntegration : public TimeDerivative
 {
 public:
+  static InputParameters validParams();
   ConcreteMoistureTimeIntegration(const InputParameters & parameters);
 
 protected:

include/kernels/ConcreteThermalConduction.h

@@ -16,16 +16,6 @@
 
 #pragma once
 
-// Forward Declarations
-class ConcreteThermalConduction;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<ConcreteThermalConduction>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<ConcreteThermalConduction>();
 class ConcreteThermalConduction : public Diffusion
 {
 public:
+  static InputParameters validParams();
   ConcreteThermalConduction(const InputParameters & parameters);
 
 protected:

include/kernels/ConcreteThermalConvection.h

@@ -17,15 +17,10 @@
 #include "Kernel.h"
 #include "Material.h"
 
-// Forward Declarations
-class ConcreteThermalConvection;
-
-template <>
-InputParameters validParams<ConcreteThermalConvection>();
-
 class ConcreteThermalConvection : public Kernel
 {
 public:
+  static InputParameters validParams();
   ConcreteThermalConvection(const InputParameters & parameters);
 
 protected:

include/kernels/ConcreteThermalTimeIntegration.h

@@ -16,16 +16,6 @@
 
 #include "TimeDerivative.h"
 
-// Forward Declaration
-class ConcreteThermalTimeIntegration;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<ConcreteThermalTimeIntegration>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<ConcreteThermalTimeIntegration>();
 class ConcreteThermalTimeIntegration : public TimeDerivative
 {
 public:
+  static InputParameters validParams();
   ConcreteThermalTimeIntegration(const InputParameters & parameters);
 
 protected:

include/kernels/MineralSolutionTimeIntegration.h

@@ -16,16 +16,6 @@
 
 #include "TimeDerivative.h"
 
-// Forward Declaration
-class MineralSolutionTimeIntegration;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<MineralSolutionTimeIntegration>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<MineralSolutionTimeIntegration>();
 class MineralSolutionTimeIntegration : public TimeDerivative
 {
 public:
+  static InputParameters validParams();
   MineralSolutionTimeIntegration(const InputParameters & parameters);
 
 protected:

include/kernels/PrimaryAqueousSpeciesDiffusion.h

@@ -16,16 +16,6 @@
 
 #pragma once
 
-// Forward Declarations
-class PrimaryAqueousSpeciesDiffusion;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<PrimaryAqueousSpeciesDiffusion>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<PrimaryAqueousSpeciesDiffusion>();
 class PrimaryAqueousSpeciesDiffusion : public Diffusion
 {
 public:
+  static InputParameters validParams();
   PrimaryAqueousSpeciesDiffusion(const InputParameters & parameters);
 
 protected:

include/kernels/PrimaryAqueousSpeciesTimeIntegration.h

@@ -16,16 +16,6 @@
 
 #include "TimeDerivative.h"
 
-// Forward Declaration
-class PrimaryAqueousSpeciesTimeIntegration;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<PrimaryAqueousSpeciesTimeIntegration>();
-
 /**
  * Define the Kernel for a CoupledConvectionReactionSub operator that looks like:
  *
@@ -36,6 +26,7 @@ InputParameters validParams<PrimaryAqueousSpeciesTimeIntegration>();
 class PrimaryAqueousSpeciesTimeIntegration : public TimeDerivative
 {
 public:
+  static InputParameters validParams();
   PrimaryAqueousSpeciesTimeIntegration(const InputParameters & parameters);
 
 protected:

include/kernels/SecondaryAqueousSpeciesDiffusion.h

@@ -16,16 +16,6 @@
 
 #pragma once
 
-// Forward Declarations
-class SecondaryAqueousSpeciesDiffusion;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<SecondaryAqueousSpeciesDiffusion>();
-
 /**
  * Define the Kernel for a CoupledBEEquilibriumSub operator that looks like:
  *
@@ -34,6 +24,7 @@ InputParameters validParams<SecondaryAqueousSpeciesDiffusion>();
 class SecondaryAqueousSpeciesDiffusion : public Kernel
 {
 public:
+  static InputParameters validParams();
   /**
    * This is the Constructor declaration AND definition.
    * It is ok to have the definition in the .h if the function body

include/kernels/SecondaryAqueousSpeciesTimeIntegration.h

@@ -16,16 +16,6 @@
 
 #pragma once
 
-// Forward Declarations
-class SecondaryAqueousSpeciesTimeIntegration;
-
-/**
- * validParams returns the parameters that this Kernel accepts / needs
- * The actual body of the function MUST be in the .C file.
- */
-template <>
-InputParameters validParams<SecondaryAqueousSpeciesTimeIntegration>();
-
 /**
  * Define the Kernel for a SecondaryAqueousSpeciesTimeIntegration operator that looks like:
  *
@@ -34,6 +24,7 @@ InputParameters validParams<SecondaryAqueousSpeciesTimeIntegration>();
 class SecondaryAqueousSpeciesTimeIntegration : public Kernel
 {
 public:
+  static InputParameters validParams();
   /**
    * This is the Constructor declaration AND definition.
    * It is ok to have the definition in the .h if the function body

include/materials/ConcreteASREigenstrain.h

@@ -28,6 +28,7 @@
 class ConcreteASREigenstrain : public ConcreteExpansionEigenstrainBase
 {
 public:
+  static InputParameters validParams();
   ConcreteASREigenstrain(const InputParameters & parameters);
 
   void initQpStatefulProperties() override;
@@ -108,5 +109,3 @@ class ConcreteASREigenstrain : public ConcreteExpansionEigenstrainBase
   Real _temp_offset;
 };
 
-template <>
-InputParameters validParams<ConcreteASREigenstrain>();