Merge pull request idaholab#38 from jessecarterMOOSE/property_name_in…

…_MaterialDiffusivity_21 Property name in MaterialDiffusion, closes idaholab#21
rwcarlsen · Sep 15, 2016 · 11c4309 · 11c4309
2 parents 3f28687 + 1b96d73
commit 11c4309
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/include/kernels/MaterialDiffusion.h b/include/kernels/MaterialDiffusion.h
@@ -37,6 +37,8 @@ class MaterialDiffusion : public Diffusion
   virtual Real computeQpResidual();
   virtual Real computeQpJacobian();
 
+  std::string _diffusivity_name;
+
   /**
    * This MooseArray will hold the reference we need to our
    * material property from the Material class

diff --git a/src/kernels/MaterialDiffusion.C b/src/kernels/MaterialDiffusion.C
@@ -22,14 +22,17 @@ template<>
 InputParameters validParams<MaterialDiffusion>()
 {
   InputParameters params = validParams<Diffusion>();
+  params.addRequiredParam<MaterialPropertyName>("diffusivity_name", "Name of the material property for diffusion coefficient");
   return params;
 }
 
 
 MaterialDiffusion::MaterialDiffusion(const InputParameters & parameters) :
     Diffusion(parameters),
-    _diffusivity(getMaterialProperty<Real>("diffusivity"))
-{}
+    _diffusivity_name(getParam<MaterialPropertyName>("diffusivity_name")),
+    _diffusivity(getMaterialProperty<Real>(_diffusivity_name))
+{
+}
 
 Real
 MaterialDiffusion::computeQpResidual()

diff --git a/tests/userobjects/circle_average_material_property/circle_average_material_property.i b/tests/userobjects/circle_average_material_property/circle_average_material_property.i
@@ -14,7 +14,7 @@
   [./diff]
     type = MaterialDiffusion
     variable = u
-    prop_name = diffusivity
+    diffusivity_name = diffusivity
   [../]
 []
 

diff --git a/tests/userobjects/circle_average_material_property/points_from_inserter.i b/tests/userobjects/circle_average_material_property/points_from_inserter.i
@@ -30,7 +30,7 @@
   [./mat_diff]
     type = MaterialDiffusion
     variable = u
-    prop_name = diffusivity
+    diffusivity_name = diffusivity
   [../]
 
   [./event_inserter_source]