Update classes inheriting from CHBulk (idaholab#5596)

dschwen · Aug 24, 2015 · 2ecd5ef · 2ecd5ef
1 parent c283b0b
commit 2ecd5ef
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/modules/phase_field/include/kernels/CHBulkPFCTrad.h b/modules/phase_field/include/kernels/CHBulkPFCTrad.h
@@ -9,7 +9,7 @@ class CHBulkPFCTrad;
 template<>
 InputParameters validParams<CHBulkPFCTrad>();
 
-class CHBulkPFCTrad : public CHBulk
+class CHBulkPFCTrad : public CHBulk<Real>
 {
 public:
   CHBulkPFCTrad(const InputParameters & parameters);

diff --git a/modules/phase_field/include/kernels/CHMath.h b/modules/phase_field/include/kernels/CHMath.h
@@ -20,7 +20,7 @@ InputParameters validParams<CHMath>();
  * and implements a simple polynomial double well to model spinodal decomposition.
  * See M.R. Tonks et al. / Computational Materials Science 51 (2012) 20–29, Eqs 11 and 12.
  **/
-class CHMath : public CHBulk
+class CHMath : public CHBulk<Real>
 {
 public:
   CHMath(const InputParameters & parameters);

diff --git a/modules/phase_field/include/kernels/CHParsed.h b/modules/phase_field/include/kernels/CHParsed.h
@@ -20,7 +20,7 @@ InputParameters validParams<CHParsed>();
  * provided by a DerivativeParsedMaterial.
  * \see SplitCHParsed
  */
-class CHParsed : public CHBulk
+class CHParsed : public CHBulk<Real>
 {
 public:
   CHParsed(const InputParameters & parameters);

diff --git a/modules/phase_field/include/kernels/KKSCHBulk.h b/modules/phase_field/include/kernels/KKSCHBulk.h
@@ -27,7 +27,7 @@ InputParameters validParams<KKSCHBulk>();
  * The user picks one phase free energy \f$ F_a \f$ (f_base) and its corresponding
  * phase concentration \f$ c_a \f$
  */
-class KKSCHBulk : public CHBulk
+class KKSCHBulk : public CHBulk<Real>
 {
 public:
   KKSCHBulk(const InputParameters & parameters);

diff --git a/modules/phase_field/src/kernels/CHBulkPFCTrad.C b/modules/phase_field/src/kernels/CHBulkPFCTrad.C
@@ -3,12 +3,12 @@
 template<>
 InputParameters validParams<CHBulkPFCTrad>()
 {
-  InputParameters params = validParams<CHBulk>();
+  InputParameters params = CHBulk<Real>::validParams();
   return params;
 }
 
 CHBulkPFCTrad::CHBulkPFCTrad(const InputParameters & parameters) :
-    CHBulk(parameters),
+    CHBulk<Real>(parameters),
     _C0(getMaterialProperty<Real>("C0")),
     _a(getMaterialProperty<Real>("a")),
     _b(getMaterialProperty<Real>("b"))
@@ -34,4 +34,3 @@ CHBulkPFCTrad::computeGradDFDCons(PFFunctionType type)
 
   mooseError("Invalid type passed in");
 }
-
diff --git a/modules/phase_field/src/kernels/CHMath.C b/modules/phase_field/src/kernels/CHMath.C
@@ -9,13 +9,13 @@
 template<>
 InputParameters validParams<CHMath>()
 {
-  InputParameters params = validParams<CHBulk>();
+  InputParameters params = CHBulk<Real>::validParams();
   params.addClassDescription("Simple demonstration Cahn-Hilliard Kernel using an algebraic double-well potential");
   return params;
 }
 
 CHMath::CHMath(const InputParameters & parameters) :
-    CHBulk(parameters)
+    CHBulk<Real>(parameters)
 {
 }
 
@@ -33,4 +33,3 @@ CHMath::computeGradDFDCons(PFFunctionType type)
 
   mooseError("Invalid type passed in");
 }
-
diff --git a/modules/phase_field/src/kernels/CHParsed.C b/modules/phase_field/src/kernels/CHParsed.C
@@ -9,14 +9,14 @@
 template<>
 InputParameters validParams<CHParsed>()
 {
-  InputParameters params = validParams<CHBulk>();
+  InputParameters params = CHBulk<Real>::validParams();
   params.addClassDescription("Cahn-Hilliard Kernel that uses a DerivativeMaterial Free Energy");
   params.addRequiredParam<MaterialPropertyName>("f_name", "Base name of the free energy function F defined in a DerivativeParsedMaterial");
   return params;
 }
 
 CHParsed::CHParsed(const InputParameters & parameters) :
-    CHBulk(parameters),
+    CHBulk<Real>(parameters),
     _nvar(_coupled_moose_vars.size()),
     _second_derivatives(_nvar+1),
     _third_derivatives(_nvar+1),
@@ -84,4 +84,3 @@ CHParsed::computeQpOffDiagJacobian(unsigned int jvar)
 
   return CHBulk::computeQpOffDiagJacobian(jvar) + _grad_test[_i][_qp]*_M[_qp]*J;
 }
-
diff --git a/modules/phase_field/src/kernels/KKSCHBulk.C b/modules/phase_field/src/kernels/KKSCHBulk.C
@@ -9,7 +9,7 @@
 template<>
 InputParameters validParams<KKSCHBulk>()
 {
-  InputParameters params = validParams<CHBulk>();
+  InputParameters params = CHBulk<Real>::validParams();
   params.addClassDescription("KKS model kernel for the Bulk Cahn-Hilliard term. This operates on the concentration 'c' as the non-linear variable");
   params.addRequiredParam<MaterialPropertyName>("fa_name", "Base name of the free energy function F (f_name in the corresponding derivative function material)");
   params.addRequiredParam<MaterialPropertyName>("fb_name", "Base name of the free energy function F (f_name in the corresponding derivative function material)");
@@ -21,7 +21,7 @@ InputParameters validParams<KKSCHBulk>()
 }
 
 KKSCHBulk::KKSCHBulk(const InputParameters & parameters) :
-    CHBulk(parameters),
+    CHBulk<Real>(parameters),
     // number of coupled variables (ca, args_a[])
     _nvar(_coupled_moose_vars.size()),
     _ca_var(coupled("ca")),
@@ -115,4 +115,3 @@ KKSCHBulk::computeQpOffDiagJacobian(unsigned int jvar)
   // keeping this term seems to improve the solution.
   return res * _grad_test[_j][_qp];
 }
-