EventInserterBase no longer needs CircleAverageMaterialProperty, so r…

…emove that object from all tests and examples
jessecarterMOOSE · Jul 14, 2017 · 9d64622 · 9d64622
1 parent 9164d95
commit 9d64622
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 58 deletions.
diff --git a/examples/2d_dirac_sinks/2d_dirac_sinks.i b/examples/2d_dirac_sinks/2d_dirac_sinks.i
@@ -76,11 +76,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -112,7 +107,6 @@
     removal_sigma_element_size_ratio = 1.0
     radius = 3.0
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
     circle_max_original_element_size_user_object = circle_max_original_element_size_uo
   [../]

diff --git a/examples/2d_sigma_ratio_adaptivity/2d_sigma_ratio_adaptivity.i b/examples/2d_sigma_ratio_adaptivity/2d_sigma_ratio_adaptivity.i
@@ -74,11 +74,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -106,7 +101,6 @@
     removal_sigma_element_size_ratio = 2.0
     radius = 3.0
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
     circle_max_original_element_size_user_object = circle_max_original_element_size_uo
   [../]

diff --git a/examples/2d_sink_map_with_refinement/2d_sink_map_with_refinement.i b/examples/2d_sink_map_with_refinement/2d_sink_map_with_refinement.i
@@ -102,11 +102,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -138,7 +133,6 @@
     removal_sigma_element_size_ratio = 1.0
     radius = 3.0
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
     circle_max_original_element_size_user_object = circle_max_original_element_size_uo
   [../]

diff --git a/include/userobjects/EventInserterBase.h b/include/userobjects/EventInserterBase.h
@@ -12,7 +12,6 @@
 #include "MooseRandom.h"
 
 class EventInserterBase;
-class CircleAverageMaterialProperty;
 class InserterPointCircleAverageMaterialProperty;
 class CircleMaxOriginalElementSize;
 
@@ -129,9 +128,6 @@ class EventInserterBase : public GeneralUserObject
   /// Distance, in multiples of the Event sigma, around an old event, to sample the original mesh
   const Real _radius;
 
-  /// Pointer to CircleAverageMaterialProperty UserObject
-  const CircleAverageMaterialProperty * _circle_average_mat_prop_uo_ptr;
-
   /// Pointer to another CircleAverageMaterialProperty UserObject
   const InserterPointCircleAverageMaterialProperty * _inserter_circle_average_mat_prop_uo_ptr;
 

diff --git a/problems/test_recovery_and_parallel/test.i b/problems/test_recovery_and_parallel/test.i
@@ -103,11 +103,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -139,7 +134,6 @@
     removal_sigma_element_size_ratio = 1.0
     radius = 3.0
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
     circle_max_original_element_size_user_object = circle_max_original_element_size_uo
   [../]

diff --git a/src/userobjects/EventInserterBase.C b/src/userobjects/EventInserterBase.C
@@ -6,7 +6,6 @@
 /****************************************************************/
 #include "EventInserterBase.h"
 #include "GaussianUserObject.h"
-#include "CircleAverageMaterialProperty.h"
 #include "InserterPointCircleAverageMaterialProperty.h"
 #include "CircleMaxOriginalElementSize.h"
 
@@ -37,7 +36,6 @@ InputParameters validParams<EventInserterBase>()
   params.addParam<Real>("removal_sigma_element_size_ratio", "Target sigma to original element size ratio at which to remove the event from the list.");
   params.addParam<Real>("radius", "Distance, in multiples of the Event sigma, around an old event, to sample the original mesh.");
   params.addParam<UserObjectName>("gaussian_user_object", "Name of the GaussianUserObject for initial sigma value when coarsening by sigma values.");
-  params.addParam<UserObjectName>("circle_average_material_property_user_object", "Name of the CircleAverageMaterialProperty UserObject for arbitrary circles and radii.");
   params.addParam<UserObjectName>("inserter_circle_average_material_property_user_object", "Name of the InserterPointCircleAverageMaterialProperty UserObject that gets points from an EventInserter.");
   params.addParam<UserObjectName>("circle_max_original_element_size_user_object", "Name of the CircleMaxOriginalElementSize UserObject for arbitrary circles and radii.");
 
@@ -52,7 +50,6 @@ EventInserterBase::EventInserterBase(const InputParameters & parameters) :
     GeneralUserObject(parameters),
     _use_random_timing(getParam<bool>("random_timing")),
     _distribution(getParam<MooseEnum>("distribution")),
-    //_mean(getParam<Real>("mean")),
     _insert_initial(getParam<bool>("insert_initial")),
     _insert_test(getParam<bool>("insert_test")),
     _test_time(((_insert_test) && (parameters.isParamSetByUser("test_time"))) ? getParam<Real>("test_time") : -std::numeric_limits<Real>::max()),
@@ -67,7 +64,6 @@ EventInserterBase::EventInserterBase(const InputParameters & parameters) :
     _removal_sigma(((_track_old_events) && (_removal_method == "sigma") && (parameters.isParamSetByUser("removal_sigma"))) ? getParam<Real>("removal_sigma") : std::numeric_limits<Real>::max()),
     _removal_ratio(((_track_old_events) && (_removal_method == "sigma_element_size_ratio") && (parameters.isParamSetByUser("removal_sigma_element_size_ratio"))) ? getParam<Real>("removal_sigma_element_size_ratio") : std::numeric_limits<Real>::max()),
     _radius(((_track_old_events) && (_removal_method == "sigma_element_size_ratio") && (parameters.isParamSetByUser("radius"))) ? getParam<Real>("radius") : std::numeric_limits<Real>::max()),
-    _circle_average_mat_prop_uo_ptr((parameters.isParamSetByUser("circle_average_material_property_user_object") && (_removal_method == "sigma" || _removal_method == "sigma_element_size_ratio")) ? &getUserObject<CircleAverageMaterialProperty>("circle_average_material_property_user_object") : NULL),
     _inserter_circle_average_mat_prop_uo_ptr((parameters.isParamSetByUser("inserter_circle_average_material_property_user_object") && (_removal_method == "sigma" || _removal_method == "sigma_element_size_ratio")) ? &getUserObject<InserterPointCircleAverageMaterialProperty>("inserter_circle_average_material_property_user_object") : NULL),
     _circle_max_elem_size_uo_ptr((parameters.isParamSetByUser("circle_max_original_element_size_user_object") && (_removal_method == "sigma" || _removal_method == "sigma_element_size_ratio")) ? &getUserObject<CircleMaxOriginalElementSize>("circle_max_original_element_size_user_object") : NULL),
     _old_event_removed(declareRestartableData<bool>("old_event_removed",false)),
@@ -101,8 +97,6 @@ EventInserterBase::EventInserterBase(const InputParameters & parameters) :
       mooseError("User requested to remove old events by sigma ratio but 'radius' was not set.");
     if (((_removal_method == "sigma") || (_removal_method == "sigma_element_size_ratio")) && (!parameters.isParamSetByUser("gaussian_user_object")))
       mooseError("User requested to remove old events by a sigma method but 'gaussian_user_object' was not set.");
-    if (((_removal_method == "sigma") || (_removal_method == "sigma_element_size_ratio")) && (!parameters.isParamSetByUser("circle_average_material_property_user_object")))
-      mooseError("User requested to remove old events by a sigma method but 'circle_average_material_property_user_object' was not set.");
     if (((_removal_method == "sigma") || (_removal_method == "sigma_element_size_ratio")) && (!parameters.isParamSetByUser("inserter_circle_average_material_property_user_object")))
       mooseError("User requested to remove old events by a sigma method but 'inserter_circle_average_material_property_user_object' was not set.");
     if ((_removal_method == "sigma_element_size_ratio") && (!parameters.isParamSetByUser("circle_max_original_element_size_user_object")))

diff --git a/tests/markers/event_marker_denser_mesh_near_sink.i b/tests/markers/event_marker_denser_mesh_near_sink.i
@@ -90,11 +90,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -126,7 +121,6 @@
     removal_sigma_element_size_ratio = 2.0
     radius = 3.0
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
     circle_max_original_element_size_user_object = circle_max_original_element_size_uo
   [../]

diff --git a/tests/markers/event_marker_sigma_coarsening.i b/tests/markers/event_marker_sigma_coarsening.i
@@ -104,11 +104,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -130,7 +125,6 @@
     removal_method = sigma
     removal_sigma = 0.8
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
   [../]
 []

diff --git a/tests/markers/event_marker_sigma_coarsening_near_refined_sink.i b/tests/markers/event_marker_sigma_coarsening_near_refined_sink.i
@@ -90,11 +90,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -126,7 +121,6 @@
     removal_sigma_element_size_ratio = 2.0
     radius = 3.0
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
     circle_max_original_element_size_user_object = circle_max_original_element_size_uo
   [../]

diff --git a/tests/markers/event_marker_sigma_ratio_coarsening.i b/tests/markers/event_marker_sigma_ratio_coarsening.i
@@ -104,11 +104,6 @@
     inserter = inserter
     radius = 0.2
   [../]
-  [./circle_average]
-    type = CircleAverageMaterialProperty
-    mat_prop = diffusivity
-    periodic_variable = u
-  [../]
   [./random_point_uo]
     type = RandomPointUserObject
     seed = 1
@@ -135,7 +130,6 @@
     removal_sigma_element_size_ratio = 2.0
     radius = 3.0
     gaussian_user_object = gaussian_uo
-    circle_average_material_property_user_object = circle_average
     inserter_circle_average_material_property_user_object = inserter_circle_average
     circle_max_original_element_size_user_object = circle_max_original_element_size_uo
   [../]