From a17eca9bac130e2ad52b26dd6b201e737d4ffaf0 Mon Sep 17 00:00:00 2001 From: Alex Lindsay Date: Thu, 2 Feb 2017 17:00:18 -0600 Subject: [PATCH] Reenable resetQpProperties warning. (#8444). --- framework/include/base/FEProblemBase.h | 4 ++-- framework/include/materials/MaterialPropertyInterface.h | 1 - test/tests/materials/discrete/reset_warning.i | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/include/base/FEProblemBase.h b/framework/include/base/FEProblemBase.h index a0cc7f9b6e17..3c32a69d340d 100644 --- a/framework/include/base/FEProblemBase.h +++ b/framework/include/base/FEProblemBase.h @@ -256,10 +256,10 @@ class FEProblemBase : virtual void setActiveMaterialProperties(const std::set & mat_prop_ids, THREAD_ID tid) override; virtual const std::set & getActiveMaterialProperties(THREAD_ID tid) override; - + virtual bool hasActiveMaterialProperties(THREAD_ID tid) override; - virtual void clearActiveMaterialProperties(THREAD_ID tid) override; + virtual void clearActiveMaterialProperties(THREAD_ID tid) override; virtual void createQRules(QuadratureType type, Order order, Order volume_order=INVALID_ORDER, Order face_order=INVALID_ORDER); diff --git a/framework/include/materials/MaterialPropertyInterface.h b/framework/include/materials/MaterialPropertyInterface.h index 60eaf9edfd07..ee4eef0dbd3d 100644 --- a/framework/include/materials/MaterialPropertyInterface.h +++ b/framework/include/materials/MaterialPropertyInterface.h @@ -291,7 +291,6 @@ MaterialPropertyInterface::getMaterialProperty(const std::string & name) { // Check if the supplied parameter is a valid input parameter key std::string prop_name = deducePropertyName(name); - std::cout << "Material property " << prop_name << " is being requested by " << _mi_name << "." << std::endl; // Check if it's just a constant const MaterialProperty * default_property = defaultMaterialProperty(prop_name); diff --git a/test/tests/materials/discrete/reset_warning.i b/test/tests/materials/discrete/reset_warning.i index 233cb8dce426..b121903c25b9 100644 --- a/test/tests/materials/discrete/reset_warning.i +++ b/test/tests/materials/discrete/reset_warning.i @@ -12,8 +12,9 @@ [Kernels] [./diff] - type = Diffusion + type = MatDiffusion variable = u + prop_name = 'prop' [../] []