diff --git a/modules/phase_field/include/kernels/CHBulkPFCTrad.h b/modules/phase_field/include/kernels/CHBulkPFCTrad.h index 71c64a11af0a..69e4a0e16efa 100644 --- 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(); -class CHBulkPFCTrad : public CHBulk +class CHBulkPFCTrad : public CHBulk { public: CHBulkPFCTrad(const InputParameters & parameters); diff --git a/modules/phase_field/include/kernels/CHMath.h b/modules/phase_field/include/kernels/CHMath.h index 2cb0a2fc7af9..d9b037288c48 100644 --- a/modules/phase_field/include/kernels/CHMath.h +++ b/modules/phase_field/include/kernels/CHMath.h @@ -20,7 +20,7 @@ InputParameters validParams(); * 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 { public: CHMath(const InputParameters & parameters); diff --git a/modules/phase_field/include/kernels/CHParsed.h b/modules/phase_field/include/kernels/CHParsed.h index f531a83daa17..4a2e34e49607 100644 --- a/modules/phase_field/include/kernels/CHParsed.h +++ b/modules/phase_field/include/kernels/CHParsed.h @@ -20,7 +20,7 @@ InputParameters validParams(); * provided by a DerivativeParsedMaterial. * \see SplitCHParsed */ -class CHParsed : public CHBulk +class CHParsed : public CHBulk { public: CHParsed(const InputParameters & parameters); diff --git a/modules/phase_field/include/kernels/KKSCHBulk.h b/modules/phase_field/include/kernels/KKSCHBulk.h index 5ca349a315f7..6c4ca57f47d4 100644 --- a/modules/phase_field/include/kernels/KKSCHBulk.h +++ b/modules/phase_field/include/kernels/KKSCHBulk.h @@ -27,7 +27,7 @@ InputParameters validParams(); * 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 { public: KKSCHBulk(const InputParameters & parameters); diff --git a/modules/phase_field/src/kernels/CHBulkPFCTrad.C b/modules/phase_field/src/kernels/CHBulkPFCTrad.C index c43db1a08c23..3d6b419bfb3d 100644 --- a/modules/phase_field/src/kernels/CHBulkPFCTrad.C +++ b/modules/phase_field/src/kernels/CHBulkPFCTrad.C @@ -3,12 +3,12 @@ template<> InputParameters validParams() { - InputParameters params = validParams(); + InputParameters params = CHBulk::validParams(); return params; } CHBulkPFCTrad::CHBulkPFCTrad(const InputParameters & parameters) : - CHBulk(parameters), + CHBulk(parameters), _C0(getMaterialProperty("C0")), _a(getMaterialProperty("a")), _b(getMaterialProperty("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 index b0692696f1e9..99c9cd6543bc 100644 --- a/modules/phase_field/src/kernels/CHMath.C +++ b/modules/phase_field/src/kernels/CHMath.C @@ -9,13 +9,13 @@ template<> InputParameters validParams() { - InputParameters params = validParams(); + InputParameters params = CHBulk::validParams(); params.addClassDescription("Simple demonstration Cahn-Hilliard Kernel using an algebraic double-well potential"); return params; } CHMath::CHMath(const InputParameters & parameters) : - CHBulk(parameters) + CHBulk(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 index a1da6bb93fcd..ca19e2cd79e7 100644 --- a/modules/phase_field/src/kernels/CHParsed.C +++ b/modules/phase_field/src/kernels/CHParsed.C @@ -9,14 +9,14 @@ template<> InputParameters validParams() { - InputParameters params = validParams(); + InputParameters params = CHBulk::validParams(); params.addClassDescription("Cahn-Hilliard Kernel that uses a DerivativeMaterial Free Energy"); params.addRequiredParam("f_name", "Base name of the free energy function F defined in a DerivativeParsedMaterial"); return params; } CHParsed::CHParsed(const InputParameters & parameters) : - CHBulk(parameters), + CHBulk(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 index cf8d821c6a82..3abddb2ba40d 100644 --- a/modules/phase_field/src/kernels/KKSCHBulk.C +++ b/modules/phase_field/src/kernels/KKSCHBulk.C @@ -9,7 +9,7 @@ template<> InputParameters validParams() { - InputParameters params = validParams(); + InputParameters params = CHBulk::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("fa_name", "Base name of the free energy function F (f_name in the corresponding derivative function material)"); params.addRequiredParam("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(const InputParameters & parameters) : - CHBulk(parameters), + CHBulk(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]; } -