Merge branch 'devel' of ssh://github.com/shannon-lab/zapdos into devel

Author: lindsayad

include/actions/AddLotsOfCoeffDiffusion.h

@@ -20,10 +20,9 @@
 
 class AddLotsOfCoeffDiffusion;
 
-template<>
+template <>
 InputParameters validParams<AddLotsOfCoeffDiffusion>();
 
-
 class AddLotsOfCoeffDiffusion : public AddVariableAction
 {
 public:

include/actions/AddLotsOfEFieldAdvection.h

@@ -20,10 +20,9 @@
 
 class AddLotsOfEFieldAdvection;
 
-template<>
+template <>
 InputParameters validParams<AddLotsOfEFieldAdvection>();
 
-
 class AddLotsOfEFieldAdvection : public AddVariableAction
 {
 public:

include/actions/AddLotsOfPotentialDrivenArtificialDiff.h

@@ -20,10 +20,9 @@
 
 class AddLotsOfPotentialDrivenArtificialDiff;
 
-template<>
+template <>
 InputParameters validParams<AddLotsOfPotentialDrivenArtificialDiff>();
 
-
 class AddLotsOfPotentialDrivenArtificialDiff : public AddVariableAction
 {
 public:

include/actions/AddLotsOfSources.h

@@ -20,10 +20,9 @@
 
 class AddLotsOfSources;
 
-template<>
+template <>
 InputParameters validParams<AddLotsOfSources>();
 
-
 class AddLotsOfSources : public AddVariableAction
 {
 public:

include/actions/AddLotsOfTimeDerivatives.h

@@ -20,10 +20,9 @@
 
 class AddLotsOfTimeDerivatives;
 
-template<>
+template <>
 InputParameters validParams<AddLotsOfTimeDerivatives>();
 
-
 class AddLotsOfTimeDerivatives : public AddVariableAction
 {
 public:

include/actions/AddLotsOfVariables.h

@@ -20,10 +20,9 @@
 
 class AddLotsOfVariables;
 
-template<>
+template <>
 InputParameters validParams<AddLotsOfVariables>();
 
-
 class AddLotsOfVariables : public AddVariableAction
 {
 public:

include/auxkernels/AbsValueAux.h

@@ -19,21 +19,19 @@
 
 class AbsValueAux;
 
-template<>
+template <>
 InputParameters validParams<AbsValueAux>();
 
 class AbsValueAux : public AuxKernel
 {
- public:
-
+public:
   AbsValueAux(const InputParameters & parameters);
 
- protected:
-
+protected:
   virtual Real computeValue();
 
- private:
+private:
   const VariableValue & _u;
 };
 
-#endif //ABSVALUEAUX_H
+#endif // ABSVALUEAUX_H

include/auxkernels/Current.h

@@ -5,7 +5,7 @@
 
 class Current;
 
-template<>
+template <>
 InputParameters validParams<Current>();
 
 class Current : public AuxKernel
@@ -29,4 +29,4 @@ class Current : public AuxKernel
   bool _art_diff;
 };
 
-#endif //CURRENT_H
+#endif // CURRENT_H

include/auxkernels/DiffusiveFlux.h

@@ -5,17 +5,15 @@
 
 class DiffusiveFlux;
 
-template<>
+template <>
 InputParameters validParams<DiffusiveFlux>();
 
 class DiffusiveFlux : public AuxKernel
 {
- public:
-
+public:
   DiffusiveFlux(const InputParameters & parameters);
 
- protected:
-
+protected:
   virtual Real computeValue();
 
   Real _r_units;
@@ -31,4 +29,4 @@ class DiffusiveFlux : public AuxKernel
   const MaterialProperty<Real> & _diff;
 };
 
-#endif //DIFFUSIVEFLUX_H
+#endif // DIFFUSIVEFLUX_H

include/auxkernels/DriftDiffusionFluxAux.h

@@ -18,7 +18,7 @@
 
 class DriftDiffusionFluxAux;
 
-template<>
+template <>
 InputParameters validParams<DriftDiffusionFluxAux>();
 
 class DriftDiffusionFluxAux : public AuxKernel
@@ -37,4 +37,4 @@ class DriftDiffusionFluxAux : public AuxKernel
   const int _component;
 };
 
-#endif //DRIFTDIFFUSIONFLUXAUX_H
+#endif // DRIFTDIFFUSIONFLUXAUX_H

include/auxkernels/EFieldAdvAux.h

@@ -19,17 +19,15 @@
 
 class EFieldAdvAux;
 
-template<>
+template <>
 InputParameters validParams<EFieldAdvAux>();
 
 class EFieldAdvAux : public AuxKernel
 {
- public:
-
+public:
   EFieldAdvAux(const InputParameters & parameters);
 
- protected:
-
+protected:
   virtual Real computeValue();
 
   Real _r_units;
@@ -46,4 +44,4 @@ class EFieldAdvAux : public AuxKernel
   const MaterialProperty<Real> & _sgn;
 };
 
-#endif //EFIELDADVAUX_H
+#endif // EFIELDADVAUX_H

include/auxkernels/Efield.h

@@ -17,10 +17,10 @@
 
 #include "AuxKernel.h"
 
-//Forward Declarations
+// Forward Declarations
 class Efield;
 
-template<>
+template <>
 InputParameters validParams<Efield>();
 
 /**
@@ -50,4 +50,4 @@ class Efield : public AuxKernel
   Real _voltage_scaling;
 };
 
-#endif //EFIELD_H
+#endif // EFIELD_H

include/auxkernels/ElectronTemperature.h

@@ -5,7 +5,7 @@
 
 class ElectronTemperature;
 
-template<>
+template <>
 InputParameters validParams<ElectronTemperature>();
 
 class ElectronTemperature : public AuxKernel
@@ -16,11 +16,10 @@ class ElectronTemperature : public AuxKernel
   virtual ~ElectronTemperature() {}
 
 protected:
-
   virtual Real computeValue();
 
   const VariableValue & _electron_density;
   const VariableValue & _mean_en;
 };
 
-#endif //ELECTRONTEMPERATURE_H
+#endif // ELECTRONTEMPERATURE_H

include/auxkernels/Position.h

@@ -17,10 +17,10 @@
 
 #include "AuxKernel.h"
 
-//Forward Declarations
+// Forward Declarations
 class Position;
 
-template<>
+template <>
 InputParameters validParams<Position>();
 
 /**
@@ -41,7 +41,6 @@ class Position : public AuxKernel
   Real _r_units;
 
   virtual Real computeValue();
-
 };
 
 #endif // POSITION_H

include/auxkernels/PowerDep.h

@@ -5,7 +5,7 @@
 
 class PowerDep;
 
-template<>
+template <>
 InputParameters validParams<PowerDep>();
 
 class PowerDep : public AuxKernel
@@ -32,4 +32,4 @@ class PowerDep : public AuxKernel
   Real _voltage_scaling;
 };
 
-#endif //POWERDEP_H
+#endif // POWERDEP_H

include/auxkernels/ProcRate.h

@@ -5,7 +5,7 @@
 
 class ProcRate;
 
-template<>
+template <>
 InputParameters validParams<ProcRate>();
 
 class ProcRate : public AuxKernel
@@ -30,4 +30,4 @@ class ProcRate : public AuxKernel
   RealVectorValue _em_current;
 };
 
-#endif //PROCRATE_H
+#endif // PROCRATE_H

include/auxkernels/Sigma.h

@@ -5,7 +5,7 @@
 
 class Sigma;
 
-template<>
+template <>
 InputParameters validParams<Sigma>();
 
 class Sigma : public AuxKernel
@@ -17,9 +17,8 @@ class Sigma : public AuxKernel
   virtual Real computeValue() override;
 
 protected:
-
   const VariableValue & _n;
   const VariableGradient & _grad_potential;
 };
 
-#endif //SIGMA_H
+#endif // SIGMA_H

include/auxkernels/TM0CylindricalErAux.h

@@ -5,25 +5,23 @@
 
 class TM0CylindricalErAux;
 
-template<>
+template <>
 InputParameters validParams<TM0CylindricalErAux>();
 
 class TM0CylindricalErAux : public AuxKernel
 {
- public:
-
+public:
   TM0CylindricalErAux(const InputParameters & parameters);
 
- protected:
-
+protected:
   virtual Real computeValue();
 
- private:
+private:
   const VariableGradient & _grad_Hphi;
 
   Real _omega;
   Real _eps_r;
   Real _eps0;
 };
 
-#endif //TM0CYLINDRICALERAUX_H
+#endif // TM0CYLINDRICALERAUX_H

include/auxkernels/TM0CylindricalEzAux.h

@@ -5,20 +5,18 @@
 
 class TM0CylindricalEzAux;
 
-template<>
+template <>
 InputParameters validParams<TM0CylindricalEzAux>();
 
 class TM0CylindricalEzAux : public AuxKernel
 {
- public:
-
+public:
   TM0CylindricalEzAux(const InputParameters & parameters);
 
- protected:
-
+protected:
   virtual Real computeValue();
 
- private:
+private:
   const VariableGradient & _grad_Hphi;
   const VariableValue & _Hphi;
 
@@ -27,4 +25,4 @@ class TM0CylindricalEzAux : public AuxKernel
   Real _eps0;
 };
 
-#endif //TM0CYLINDRICALEZAUX_H
+#endif // TM0CYLINDRICALEZAUX_H

include/auxkernels/TotalFlux.h

@@ -5,7 +5,7 @@
 
 class TotalFlux;
 
-template<>
+template <>
 InputParameters validParams<TotalFlux>();
 
 class TotalFlux : public AuxKernel
@@ -26,4 +26,4 @@ class TotalFlux : public AuxKernel
   const MaterialProperty<Real> & _diff;
 };
 
-#endif //TOTALFLUX_H
+#endif // TOTALFLUX_H

include/auxkernels/UserFlux.h

@@ -5,7 +5,7 @@
 
 class UserFlux;
 
-template<>
+template <>
 InputParameters validParams<UserFlux>();
 
 class UserFlux : public AuxKernel
@@ -17,7 +17,6 @@ class UserFlux : public AuxKernel
   virtual Real computeValue();
 
 protected:
-
   const VariableValue & _u;
   const VariableGradient & _grad_u;
   Real _mu;
@@ -26,4 +25,4 @@ class UserFlux : public AuxKernel
   Real _EField;
 };
 
-#endif //USERFLUX_H
+#endif // USERFLUX_H