Add IncrementMaterial test (idaholab#8444).

lindsayad · Mar 13, 2017 · cb35fc1 · cb35fc1
1 parent 2e24b45
commit cb35fc1
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 131 deletions.
diff --git a/framework/src/base/FEProblemBase.C b/framework/src/base/FEProblemBase.C
@@ -2033,7 +2033,6 @@ FEProblemBase::prepareMaterials(SubdomainID blk_id, THREAD_ID tid)
 void
 FEProblemBase::reinitMaterials(SubdomainID blk_id, THREAD_ID tid, bool swap_stateful)
 {
-  // if (_all_materials.hasActiveBlockObjects(blk_id, tid))
   if (_all_materials.hasActiveBlockObjects(blk_id, tid) && this->hasActiveMaterialProperties(tid))
   {
     const Elem * & elem = _assembly[tid]->elem();

diff --git a/test/include/materials/ErrorMaterial.h → test/include/materials/IncrementMaterial.h b/test/include/materials/ErrorMaterial.h → test/include/materials/IncrementMaterial.h
@@ -11,27 +11,28 @@
 /*                                                              */
 /*            See COPYRIGHT for full restrictions               */
 /****************************************************************/
-#ifndef ERROR_MATERIAL_H
-#define ERROR_MATERIAL_H
+#ifndef INCREMENT_MATERIAL_H
+#define INCREMENT_MATERIAL_H
 
-#include "Material.h"
+#include "GenericConstantMaterial.h"
 
-class ErrorMaterial;
+class IncrementMaterial;
 
 template<>
-InputParameters validParams<ErrorMaterial>();
+InputParameters validParams<GenericConstantMaterial>();
 
 /**
- * ErrorMaterial throws a MooseException when certain conditions are
- * met.
+ * GenericConstantMaterial that tracks the number of times computeQpProperties has been called.
  */
-class ErrorMaterial : public Material
+class IncrementMaterial : public GenericConstantMaterial
 {
 public:
-  ErrorMaterial(const InputParameters & parameters);
+  IncrementMaterial(const InputParameters & parameters);
 
 protected:
   virtual void computeQpProperties() override;
+  unsigned int _inc;
+  MaterialProperty<Real> & _mat_prop;
 };
 
 #endif
diff --git a/test/src/base/MooseTestApp.C b/test/src/base/MooseTestApp.C
@@ -129,7 +129,7 @@
 #include "DataStructIC.h"
 
 // Materials
-#include "ErrorMaterial.h"
+#include "IncrementMaterial.h"
 #include "MTMaterial.h"
 #include "TypesMaterial.h"
 #include "StatefulMaterial.h"
@@ -430,7 +430,7 @@ MooseTestApp::registerObjects(Factory & factory)
 
   // Materials
   registerMaterial(MTMaterial);
-  registerMaterial(ErrorMaterial);
+  registerMaterial(IncrementMaterial);
   registerMaterial(TypesMaterial);
   registerMaterial(StatefulMaterial);
   registerMaterial(SpatialStatefulMaterial);

diff --git a/test/src/materials/ErrorMaterial.C → test/src/materials/IncrementMaterial.C b/test/src/materials/ErrorMaterial.C → test/src/materials/IncrementMaterial.C
@@ -11,23 +11,27 @@
 /*                                                              */
 /*            See COPYRIGHT for full restrictions               */
 /****************************************************************/
-#include "ErrorMaterial.h"
+#include "IncrementMaterial.h"
 
 template<>
-InputParameters validParams<ErrorMaterial>()
+InputParameters validParams<IncrementMaterial>()
 {
-  InputParameters params = validParams<Material>();
-  params.addClassDescription("Material that throws an error if its computeQpProperties method gets called.");
+  InputParameters params = validParams<GenericConstantMaterial>();
+  params.addClassDescription("Material that tracks the number of times computeQpProperties has been called.");
   return params;
 }
 
-ErrorMaterial::ErrorMaterial(const InputParameters & parameters) :
-    Material(parameters)
+IncrementMaterial::IncrementMaterial(const InputParameters & parameters) :
+    GenericConstantMaterial(parameters),
+    _inc(0),
+    _mat_prop(declareProperty<Real>("mat_prop"))
 {
 }
 
 void
-ErrorMaterial::computeQpProperties()
+IncrementMaterial::computeQpProperties()
 {
-  mooseError("Why are you calling me when I don't provide any properties?");
+  GenericConstantMaterial::computeQpProperties();
+  _inc++;
+  _mat_prop[_qp] = _inc;
 }
diff --git a/test/tests/materials/material_dependency/diff_kernel_aux_mat_dep.i b/test/tests/materials/material_dependency/diff_kernel_aux_mat_dep.i
@@ -1,7 +1,8 @@
 [Mesh]
   type = GeneratedMesh
-  dim = 1
+  dim = 2
   nx = 1
+  ny = 1
 []
 
 [Variables]
@@ -49,10 +50,12 @@
 
 [Materials]
   [./call_me_mat]
-    type = GenericConstantMaterial
+    type = IncrementMaterial
     prop_names = 'diff'
     prop_values = '1'
     block = 0
+    outputs = exodus
+    output_properties = 'mat_prop'
   [../]
 []
 

diff --git a/test/tests/materials/material_dependency/gold/diff_kernel_aux_mat_dep_out.e b/test/tests/materials/material_dependency/gold/diff_kernel_aux_mat_dep_out.e
diff --git a/test/tests/materials/material_dependency/one_mat_depend.i b/test/tests/materials/material_dependency/one_mat_depend.i
diff --git a/test/tests/materials/material_dependency/tests b/test/tests/materials/material_dependency/tests
@@ -0,0 +1,7 @@
+[Tests]
+  [./dont_reinit_mat_for_aux]
+    type = 'Exodiff'
+    input = 'diff_kernel_aux_mat_dep.i'
+    exodiff = 'diff_kernel_aux_mat_dep_out.e'
+  [../]
+[]
diff --git a/test/tests/materials/material_dependency/two_mat_depend.i b/test/tests/materials/material_dependency/two_mat_depend.i