Commit 29ca601e authored by Ron Rahaman's avatar Ron Rahaman

Merge branch 'interface-changes' into 'develop'

Updates to MooseVariableInterface and variable getter APIs to incorporate vector finite elements

See merge request !6
parents 60673545 3b56541c
Pipeline #3243 failed with stages
in 2 minutes and 41 seconds
...@@ -31,7 +31,7 @@ InputParameters validParams<NekSideIntegralVariableUserObject>(); ...@@ -31,7 +31,7 @@ InputParameters validParams<NekSideIntegralVariableUserObject>();
*/ */
class NekSideIntegralVariableUserObject : class NekSideIntegralVariableUserObject :
public SideIntegralUserObject, public SideIntegralUserObject,
public MooseVariableInterface public MooseVariableInterface<Real>
{ {
public: public:
NekSideIntegralVariableUserObject(const InputParameters & parameters); NekSideIntegralVariableUserObject(const InputParameters & parameters);
...@@ -39,7 +39,7 @@ public: ...@@ -39,7 +39,7 @@ public:
protected: protected:
virtual Real computeQpIntegral() override; virtual Real computeQpIntegral() override;
virtual void finalize() override; virtual void finalize() override;
/// Holds the solution at current quadrature points /// Holds the solution at current quadrature points
const VariableValue & _u; const VariableValue & _u;
/// Legendre polynomial object. TODO address dynamic casting of this object /// Legendre polynomial object. TODO address dynamic casting of this object
......
...@@ -38,7 +38,7 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input ...@@ -38,7 +38,7 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input
// TODO we really shouldn't have to dynamic cast into FourierPolynomial and Legendre Polynomial here // TODO we really shouldn't have to dynamic cast into FourierPolynomial and Legendre Polynomial here
// but this was a quick example // but this was a quick example
SideIntegralUserObject(parameters), SideIntegralUserObject(parameters),
MooseVariableInterface(this, false), MooseVariableInterface<Real>(this, false),
_u(coupledValue("variable")), _u(coupledValue("variable")),
_legendre_poly_function(dynamic_cast<LegendrePolynomial&>(_mci_feproblem.getFunction(parameters.get<std::string>("legendre_function_name")))), _legendre_poly_function(dynamic_cast<LegendrePolynomial&>(_mci_feproblem.getFunction(parameters.get<std::string>("legendre_function_name")))),
_fourier_poly_function(dynamic_cast<FourierPolynomial&>(_mci_feproblem.getFunction(parameters.get<std::string>("fourier_function_name")))), _fourier_poly_function(dynamic_cast<FourierPolynomial&>(_mci_feproblem.getFunction(parameters.get<std::string>("fourier_function_name")))),
...@@ -49,7 +49,7 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input ...@@ -49,7 +49,7 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input
_coupled_grad(coupledGradient("variable")), _coupled_grad(coupledGradient("variable")),
_diffusion_coefficient(getMaterialProperty<Real>("diffusion_coefficient_name")), _diffusion_coefficient(getMaterialProperty<Real>("diffusion_coefficient_name")),
_surface_area_pp(getPostprocessorValueByName(parameters.get<std::string>("surface_area_pp"))) _surface_area_pp(getPostprocessorValueByName(parameters.get<std::string>("surface_area_pp")))
{ {
addMooseVariableDependency(mooseVariable()); addMooseVariableDependency(mooseVariable());
...@@ -64,8 +64,8 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input ...@@ -64,8 +64,8 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input
{ {
mooseError("Need to implement logic for l direction not equal to 2"); mooseError("Need to implement logic for l direction not equal to 2");
} }
} }
Real Real
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment