Fixed merge conflict

include/ics/ChemicalPotentialIC.h

@@ -34,6 +34,7 @@ class ChemicalPotentialIC :
 private:
 
   VariableValue & _temperature;
+  VariableValue & _phase;
 };
 
 #endif // CHEMICALPOTENTIALIC_H

include/kernels/HeatEquationSourceMMS.h

@@ -17,6 +17,8 @@
 
 // MOOSE includes
 #include "Kernel.h"
+//Pika Includes
+#include "PropertyUserObjectInterface.h"
 
 // Forward declarations
 class HeatEquationSourceMMS;
@@ -28,7 +30,9 @@ InputParameters validParams<HeatEquationSourceMMS>();
  * A kernel for adding forcing function for the MMS tests of the heat
  * transport equation, Eq. (34)
  */
-class HeatEquationSourceMMS : public Kernel
+class HeatEquationSourceMMS : 
+  public Kernel,
+         PropertyUserObjectInterface
 {
 public:
 
@@ -48,6 +52,8 @@ class HeatEquationSourceMMS : public Kernel
   const MaterialProperty<Real> & _L_sg;
   const VariableValue & _phi;
   bool _use_dphi_dt;
+  bool _use_scale;
+  const Real & _xi;
 
 };
 

include/kernels/MassTransportSourceMMS.h

@@ -17,6 +17,8 @@
 
 // MOOSE includes
 #include "Kernel.h"
+//Pika Includes
+#include "PropertyUserObjectInterface.h"
 
 // Forward declarations
 class MassTransportSourceMMS;
@@ -28,7 +30,10 @@ InputParameters validParams<MassTransportSourceMMS>();
  * A kernel for adding forcing function for the MMS tests of the mass
  * transport equation, Eq. (35)
  */
-class MassTransportSourceMMS : public Kernel
+class MassTransportSourceMMS :
+  public Kernel,
+         PropertyUserObjectInterface
+
 {
 public:
 
@@ -46,6 +51,8 @@ class MassTransportSourceMMS : public Kernel
   const MaterialProperty<Real> & _D_v;
   const VariableValue & _phi;
   bool _use_dphi_dt;
+  bool _use_scale;
+  const Real & _xi;
 
 };
 

include/kernels/PhaseEvolutionSourceMMS.h

@@ -51,6 +51,8 @@ class PhaseEvolutionSourceMMS :
   const bool  & _use_potential_transition;
   const VariableValue  & _T;
   const VariableValue  & _u;
+  const bool  & _use_scale;
+  const Real & _xi;
 
 };
 

include/kernels/PhaseTransition.h

@@ -4,14 +4,16 @@
 // modules/phase_field includes
 #include "ACBulk.h"
 
+#include "PropertyUserObjectInterface.h"
 //Forward Declarations
 class PhaseTransition;
 
 template<>
 InputParameters validParams<PhaseTransition>();
 
 class PhaseTransition :
-  public ACBulk
+  public ACBulk,
+  public PropertyUserObjectInterface
 {
 public:
 
@@ -26,5 +28,6 @@ class PhaseTransition :
   MaterialProperty<Real> & _lambda;
 
   MaterialProperty<Real> & _s_eq;
+
 };
 #endif // PHASETRANSITION_H

include/kernels/PikaScaledMatDiffusion.h

@@ -0,0 +1,33 @@
+#ifndef MATDIFFUSION_H
+#define MATDIFFUSION_H
+
+#include "Diffusion.h"
+#include "Material.h"
+#include "PropertyUserObjectInterface.h"
+
+//Forward Declarations
+class PikaScaledMatDiffusion;
+
+template<>
+InputParameters validParams<PikaScaledMatDiffusion>();
+
+class PikaScaledMatDiffusion : 
+  public Diffusion,
+  PropertyUserObjectInterface
+{
+public:
+  PikaScaledMatDiffusion(const std::string & name, InputParameters parameters);
+
+protected:
+  virtual Real computeQpResidual();
+  virtual Real computeQpJacobian();
+
+private:
+  std::string _D_name;
+
+  MaterialProperty<Real> & _D;
+
+  const Real & _xi;
+};
+
+#endif //MATDIFFUSION_H

include/kernels/PikaScaledTimeDerivative.h

@@ -0,0 +1,27 @@
+#ifndef PIKASCALEDTIMEDERIVATIVE_H
+#define PIKASCALEDTIMEDERIVATIVE_H 
+//Pika Includes
+#include "PikaTimeDerivative.h"
+#include "PropertyUserObjectInterface.h"
+
+//Forward Declarations
+class PikaScaledTimeDerivative;
+
+template<>
+InputParameters validParams<PikaScaledTimeDerivative>();
+
+class PikaScaledTimeDerivative :
+  public PikaTimeDerivative,
+  public PropertyUserObjectInterface
+
+{
+public:
+
+  PikaScaledTimeDerivative(const std::string & name, InputParameters parameters);
+
+protected:
+  virtual Real computeQpResidual();
+  virtual Real computeQpJacobian();
+
+};
+#endif //PIKASCALEDTIMEDERIVATIVE

include/kernels/ScaledPhaseTransition.h

@@ -0,0 +1,35 @@
+#ifndef SCALEDPHASETRANSITION_H
+#define SCALEPHASETRANSITION_H
+
+// modules/phase_field includes
+#include "ACBulk.h"
+
+#include "PropertyUserObjectInterface.h"
+//Forward Declarations
+class ScaledPhaseTransition;
+
+template<>
+InputParameters validParams<ScaledPhaseTransition>();
+
+class ScaledPhaseTransition :
+  public ACBulk,
+  public PropertyUserObjectInterface
+{
+public:
+
+  ScaledPhaseTransition(const std::string & name, InputParameters parameters);
+
+protected:
+  virtual Real computeDFDOP(PFFunctionType type);
+
+private:
+  VariableValue & _s;
+
+  MaterialProperty<Real> & _lambda;
+
+  MaterialProperty<Real> & _s_eq;
+
+  const Real & _xi;
+
+};
+#endif // SCALEDPHASETRANSITION_H

include/materials/ConstantProperties.h

@@ -47,6 +47,7 @@ class ConstantProperties :
   MaterialProperty<Real> & _mobility;
 
   MaterialProperty<Real> & _latent_heat;
+
 };
 
 #endif // CONSTANTPROPERTIES_H

include/materials/PhaseFieldProperties.h

@@ -56,6 +56,13 @@ class PhaseFieldProperties :
   MaterialProperty<Real> & _saturation_pressure_of_water_vapor_over_ice;
 
   MaterialProperty<Real> & _specific_humidity_ratio;
+
+  const Real & _xi;
+
+  const Real & _d_o;
+
+  const Real & _interface_kinetic_coefficient;
+
 };
 
 #endif // PHASEFIELDPROPERTIES_H

include/outputs/PikaDebug.h

@@ -0,0 +1,77 @@
+/****************************************************************/
+/*               DO NOT MODIFY THIS HEADER                      */
+/* MOOSE - Multiphysics Object Oriented Simulation Environment  */
+/*                                                              */
+/*           (c) 2010 Battelle Energy Alliance, LLC             */
+/*                   ALL RIGHTS RESERVED                        */
+/*                                                              */
+/*          Prepared by Battelle Energy Alliance, LLC           */
+/*            Under Contract No. DE-AC07-05ID14517              */
+/*            With the U. S. Department of Energy               */
+/*                                                              */
+/*            See COPYRIGHT for full restrictions               */
+/****************************************************************/
+
+#ifndef PIKADEBUG_H
+#define PIKADEBUG_H
+
+// MOOSE includes
+#include "PetscOutput.h"
+#include "FormattedTable.h"
+#include "PropertyUserObjectInterface.h"
+#include "PhaseFieldProperties.h"
+class PikaDebug;
+
+template<>
+InputParameters validParams<PikaDebug>();
+
+/**
+ * Base class for scalar variables and postprocessors output objects
+ *
+ * This class populates three FormattedTable objects that may then be used
+ * by child classes for creating custom output objects:
+ * _all_data_table - includes the data from both postprocessors and scalar aux variables
+ * _postprocessor_table - includes the data from only the postprocessors
+ * _scalar_table - includes the data from only the scalar aux variables
+ *
+ * @see CSV Console
+ */
+class PikaDebug :
+  public 
+  PetscOutput,
+  PropertyUserObjectInterface,
+  MaterialPropertyInterface
+{
+  public:
+
+  /**
+   * Class constructor.
+   */
+  PikaDebug(const std::string & name, InputParameters);
+
+  /**
+   * Destructor
+   */
+  virtual ~PikaDebug();
+
+  protected:
+
+  //@{
+  /**
+   * Produces an error, it is not possible to output nodal and elemental data to a table
+   *
+   * The call to this function is disable by suppressing the input parameter: output_nodal_variables
+   */
+  virtual void outputNodalVariables();
+  virtual void outputElementalVariables();
+  virtual void outputScalarVariables();
+  virtual void outputPostprocessors();
+  virtual void outputVectorPostprocessors();
+  virtual std::string filename();
+  //@}
+virtual void output();
+const Real & _d_o;
+const Real & _beta;
+};
+
+#endif /* TABLEOUTPUT_H */

include/userobjects/PropertyUserObject.h

@@ -87,6 +87,11 @@ class PropertyUserObject : public GeneralUserObject
 
   Real equilibriumConcentration(const Real & T) const;
 
+  const Real & temporalScale() const;
+
+  const Real & referenceTemp() const;
+
+
   const Real _rho_i;
   const Real _rho_a;
   const Real _P_a;
@@ -101,6 +106,7 @@ class PropertyUserObject : public GeneralUserObject
   const Real _W;
   const Real _L_sg;
   const Real _mobility;
+  const Real _xi;
 
 private: