WIP: Remove BlockRestrictable assumptions about 'variable' parameter

Assuming the blocks ids to match 'variable' command is not very robust, what if it is coupled? (refs idaholab#9889)
aeslaughter · Oct 19, 2017 · 3618bd3 · 3618bd3
1 parent 8664ebb
commit 3618bd3
Show file tree

Hide file tree

Showing 24 changed files with 49 additions and 26 deletions.
diff --git a/framework/src/actions/SetupResidualDebugAction.C b/framework/src/actions/SetupResidualDebugAction.C
@@ -20,6 +20,7 @@
 #include "FEProblem.h"
 #include "MooseVariable.h"
 #include "NonlinearSystemBase.h"
+#include "Conversion.h"
 
 template <>
 InputParameters
@@ -50,6 +51,7 @@ SetupResidualDebugAction::act()
   {
     // add aux-variable
     MooseVariable & var = _problem->getVariable(0, var_name);
+    InputParameters params = _factory.getValidParams("DebugResidualAux");
     const std::set<SubdomainID> & subdomains = var.activeSubdomains();
 
     std::stringstream aux_var_ss;
@@ -59,14 +61,20 @@ SetupResidualDebugAction::act()
     if (subdomains.empty())
       _problem->addAuxVariable(aux_var_name, FEType(FIRST, LAGRANGE));
     else
+    {
       _problem->addAuxVariable(aux_var_name, FEType(FIRST, LAGRANGE), &subdomains);
+      std::vector<SubdomainName> block_names;
+      block_names.reserve(subdomains.size());
+      for (const SubdomainID & id : subdomains)
+        block_names.push_back(Moose::stringify(id));
+      params.set<std::vector<SubdomainName>>("block") = block_names;
+    }
 
     // add aux-kernel
     std::stringstream kern_ss;
     kern_ss << "residual_" << var.name() << "_kernel";
     std::string kern_name = kern_ss.str();
 
-    InputParameters params = _factory.getValidParams("DebugResidualAux");
     params.set<AuxVariableName>("variable") = aux_var_name;
     params.set<NonlinearVariableName>("debug_variable") = var.name();
     params.set<MultiMooseEnum>("execute_on") = "linear timestep_end";

diff --git a/framework/src/base/BlockRestrictable.C b/framework/src/base/BlockRestrictable.C
@@ -21,6 +21,7 @@
 #include "MooseVariable.h"
 #include "SystemBase.h"
 #include "Conversion.h"
+#include "MooseVariableInterface.h"
 
 template <>
 InputParameters
@@ -104,29 +105,8 @@ BlockRestrictable::initializeBlockRestrictable(const MooseObject * moose_object)
       _blk_ids.insert(Moose::ANY_BLOCK_ID);
     else
       _blk_ids.insert(vec_ids.begin(), vec_ids.end());
-
-    // Check that supplied blocks are within the variable domain
-    if (parameters.isParamValid("variable") &&
-        (parameters.have_parameter<NonlinearVariableName>("variable") ||
-         parameters.have_parameter<AuxVariableName>("variable")))
-    {
-      // A pointer to the variable class
-      std::set<SubdomainID> var_ids = variableSubdomainIDs(parameters);
-
-      // Test if the variable blockIDs are valid for this object
-      if (!isBlockSubset(var_ids))
-        mooseError("In object ",
-                   _blk_name,
-                   " the defined blocks are outside of the domain of the variable");
-    }
   }
 
-  // The 'block' input parameter is undefined, if the object contains a variable, set the subdomain
-  // ids to those of the variable
-  else if (parameters.isParamValid("variable") &&
-           (parameters.have_parameter<NonlinearVariableName>("variable") ||
-            parameters.have_parameter<AuxVariableName>("variable")))
-    _blk_ids = variableSubdomainIDs(parameters);
 
   // Produce error if the object is not allowed to be both block and boundary restricted
   if (!_blk_dual_restrictable && !_boundary_ids.empty() && !_boundary_ids.empty())

diff --git a/test/tests/auxkernels/element_aux_var/block_global_depend_elem_aux.i b/test/tests/auxkernels/element_aux_var/block_global_depend_elem_aux.i
@@ -50,6 +50,7 @@
     value = 8
     operator = /
     coupled = two
+    block = 1
   [../]
 
   [./coupled_right]
@@ -58,6 +59,7 @@
     value = 8
     operator = /
     coupled = two
+    block = 2
   [../]
 
   [./two]

diff --git a/test/tests/auxkernels/gap_value/gap_value.i b/test/tests/auxkernels/gap_value/gap_value.i
@@ -45,6 +45,7 @@
     type = GapValueAux
     variable = gap_value
     boundary = leftright
+    block = left
     paired_variable = u
     paired_boundary = rightleft
   [../]

diff --git a/test/tests/auxkernels/gap_value/gap_value_subdomain_restricted.i b/test/tests/auxkernels/gap_value/gap_value_subdomain_restricted.i
@@ -46,6 +46,7 @@
     type = GapValueAux
     variable = gap_value
     boundary = leftright
+    block = left
     paired_variable = u
     paired_boundary = rightleft
   [../]

diff --git a/test/tests/auxkernels/nearest_node_value/nearest_node_value.i b/test/tests/auxkernels/nearest_node_value/nearest_node_value.i
@@ -43,6 +43,7 @@
     boundary = leftright
     paired_variable = u
     paired_boundary = rightleft
+    block = left
   [../]
 []
 

diff --git a/test/tests/geomsearch/patch_update_strategy/always.i b/test/tests/geomsearch/patch_update_strategy/always.i
@@ -33,10 +33,12 @@
     type = CoefDiffusion
     variable = u
     coef = 1
+    block = right
   [../]
   [./time]
     type = TimeDerivative
     variable = u
+    block = right
   [../]
 []
 

diff --git a/test/tests/geomsearch/patch_update_strategy/auto.i b/test/tests/geomsearch/patch_update_strategy/auto.i
@@ -33,10 +33,12 @@
     type = CoefDiffusion
     variable = u
     coef = 1
+    block = right
   [../]
   [./time]
     type = TimeDerivative
     variable = u
+    block = right
   [../]
 []
 
@@ -104,4 +106,3 @@
 [Outputs]
   exodus = true
 []
-
diff --git a/test/tests/geomsearch/patch_update_strategy/never.i b/test/tests/geomsearch/patch_update_strategy/never.i
@@ -33,10 +33,12 @@
     type = CoefDiffusion
     variable = u
     coef = 1
+    block = right
   [../]
   [./time]
     type = TimeDerivative
     variable = u
+    block = right
   [../]
 []
 

diff --git a/test/tests/interfacekernels/2d_interface/coupled_value_coupled_flux.i b/test/tests/interfacekernels/2d_interface/coupled_value_coupled_flux.i
@@ -58,6 +58,7 @@
     type = BodyForce
     variable = u
     value = 1
+    block = 0
   [../]
 []
 

diff --git a/test/tests/interfacekernels/3d_interface/coupled_value_coupled_flux.i b/test/tests/interfacekernels/3d_interface/coupled_value_coupled_flux.i
@@ -60,6 +60,7 @@
     type = BodyForce
     variable = u
     value = 1
+    block = 0
   [../]
 []
 

diff --git a/test/tests/kernels/block_kernel/block_vars.i b/test/tests/kernels/block_kernel/block_vars.i
@@ -23,6 +23,7 @@
   [./diff_u]
     type = Diffusion
     variable = u
+    block = 1
   [../]
 
   [./diff_v]

diff --git a/test/tests/mortar/2d/conforming-2nd-order.i b/test/tests/mortar/2d/conforming-2nd-order.i
@@ -39,11 +39,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = ffn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/2d/conforming.i b/test/tests/mortar/2d/conforming.i
@@ -39,11 +39,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = ffn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/2d/conforming_two_var.i b/test/tests/mortar/2d/conforming_two_var.i
@@ -52,20 +52,24 @@
   [./diff_u]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = ffn
+    block = '1 2'
   [../]
   [./diff_v]
     type = Diffusion
     variable = v
+    block = '1 2'
   [../]
   [./coupled_u]
     type = CoupledForce
     variable = v
     v = u
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/2d/equalgradient.i b/test/tests/mortar/2d/equalgradient.i
@@ -48,10 +48,12 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./dt]
     type = TimeDerivative
     variable = u
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/2d/non-conforming-2nd-order.i b/test/tests/mortar/2d/non-conforming-2nd-order.i
@@ -39,11 +39,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = ffn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/2d/non-conforming.i b/test/tests/mortar/2d/non-conforming.i
@@ -39,11 +39,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = ffn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/3d/conforming-2nd-order.i b/test/tests/mortar/3d/conforming-2nd-order.i
@@ -40,11 +40,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = forcing_fn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/3d/conforming.i b/test/tests/mortar/3d/conforming.i
@@ -40,11 +40,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = forcing_fn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/3d/non-conforming-2nd-order.i b/test/tests/mortar/3d/non-conforming-2nd-order.i
@@ -41,11 +41,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = forcing_fn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/mortar/3d/non-conforming.i b/test/tests/mortar/3d/non-conforming.i
@@ -40,11 +40,13 @@
   [./diff]
     type = Diffusion
     variable = u
+    block = '1 2'
   [../]
   [./ffn]
     type = BodyForce
     variable = u
     function = forcing_fn
+    block = '1 2'
   [../]
 []
 

diff --git a/test/tests/outputs/residual/output_residual_test.i b/test/tests/outputs/residual/output_residual_test.i
@@ -62,11 +62,13 @@
   [./ie_v]
     type = TimeDerivative
     variable = v
+    block = 1
   [../]
 
   [./diff_v]
     type = Diffusion
     variable = v
+    block = 1
   [../]
 
 []

diff --git a/test/tests/postprocessors/block_nodal_pps/block_nodal_pps_test.i b/test/tests/postprocessors/block_nodal_pps/block_nodal_pps_test.i
@@ -18,6 +18,7 @@
   [./diff_u]
     type = Diffusion
     variable = u
+    block = 1
   [../]
   [./diff_v]
     type = Diffusion
@@ -63,9 +64,6 @@
 
 [Executioner]
   type = Steady
-
-  # Preconditioned JFNK (default)
-  solve_type = 'PJFNK'
 []
 
 [Outputs]