Add multi block deletion to BlockDeletionGenerator idaholab#17052

aeslaughter · Jun 2, 2021 · e190218 · e190218
1 parent eed7c80
commit e190218
Show file tree

Hide file tree

Showing 43 changed files with 258 additions and 65 deletions.
diff --git a/framework/include/meshgenerators/BlockDeletionGenerator.h b/framework/include/meshgenerators/BlockDeletionGenerator.h
@@ -18,7 +18,7 @@ template <>
 InputParameters validParams<BlockDeletionGenerator>();
 
 /**
- * MeshGenerator for
+ * MeshGenerator for removing blocks from the mesh
  */
 class BlockDeletionGenerator : public ElementDeletionGeneratorBase
 {
@@ -28,10 +28,10 @@ class BlockDeletionGenerator : public ElementDeletionGeneratorBase
   BlockDeletionGenerator(const InputParameters & parameters);
 
 protected:
+  virtual std::unique_ptr<MeshBase> generate() override;
   virtual bool shouldDelete(const Elem * elem) override;
 
 private:
-  ///Defines the block to be removed
-  const SubdomainID _block_id;
+  /// Ids of the blocks to be removed
+  std::vector<SubdomainID> _block_ids;
 };
-
diff --git a/framework/include/meshgenerators/PatternedMeshGenerator.h b/framework/include/meshgenerators/PatternedMeshGenerator.h
@@ -44,7 +44,10 @@ class PatternedMeshGenerator : public MeshGenerator
   /// The pattern, starting with the upper left corner
   const std::vector<std::vector<unsigned int>> & _pattern;
 
-  /// Holds the pointers to the meshes
+  /// Holds pointers to the meshes before they are generated
+  std::vector<std::unique_ptr<MeshBase> *> _mesh_ptrs;
+
+  /// Holds the pointers to the input generated meshes
   std::vector<std::unique_ptr<ReplicatedMesh>> _meshes;
 
   /// Holds a mesh for each row, these will be stitched together in the end

diff --git a/framework/src/meshgenerators/BlockDeletionGenerator.C b/framework/src/meshgenerators/BlockDeletionGenerator.C
@@ -8,6 +8,7 @@
 //* https://www.gnu.org/licenses/lgpl-2.1.html
 
 #include "BlockDeletionGenerator.h"
+#include "MooseMeshUtils.h"
 
 #include "libmesh/elem.h"
 
@@ -20,20 +21,58 @@ BlockDeletionGenerator::validParams()
 {
   InputParameters params = ElementDeletionGeneratorBase::validParams();
 
-  params.addClassDescription(
-      "Mesh generator which removes elements with the specified subdomain ID");
-  params.addRequiredParam<SubdomainID>("block_id", "The block to be deleted");
+  params.addClassDescription("Mesh generator which removes elements from the specified subdomains");
+  params.addParam<std::vector<SubdomainName>>("block", "The list of blocks to be deleted");
+  params.addDeprecatedParam<SubdomainID>(
+      "block_id", "The block to be deleted.", "Use block instead");
 
   return params;
 }
 
 BlockDeletionGenerator::BlockDeletionGenerator(const InputParameters & parameters)
-  : ElementDeletionGeneratorBase(parameters), _block_id(getParam<SubdomainID>("block_id"))
+  : ElementDeletionGeneratorBase(parameters)
 {
+  // Handle deprecated parameter
+  if (isParamValid("block_id"))
+    _block_ids.push_back(getParam<SubdomainID>("block_id"));
+  if (!isParamValid("block_id") && !isParamValid("block"))
+    mooseError("Must provide the blocks to be deleted in the 'block' parameter");
+  if (isParamValid("block_id") && isParamValid("block"))
+    paramError("block_id", "Cannot use with the parameter 'block'. Please use just 'block'.");
+}
+
+std::unique_ptr<MeshBase>
+BlockDeletionGenerator::generate()
+{
+  if (isParamValid("block"))
+    // Get the list of block ids from the block names
+    _block_ids =
+        MooseMeshUtils::getSubdomainIDs(*_input, getParam<std::vector<SubdomainName>>("block"));
+
+  // Check that the block ids/names exist in the mesh
+  std::set<SubdomainID> mesh_blocks;
+  _input->subdomain_ids(mesh_blocks);
+
+  for (std::size_t i = 0; i < _block_ids.size(); ++i)
+    if (_block_ids[i] == Moose::INVALID_BLOCK_ID || !mesh_blocks.count(_block_ids[i]))
+    {
+      if (isParamValid("block"))
+        paramError("block",
+                   "The block '",
+                   getParam<std::vector<SubdomainName>>("block")[i],
+                   "' was not found within the mesh");
+      else
+        paramError("block_id",
+                   "The block '",
+                   getParam<SubdomainID>("block_id"),
+                   "' was not found within the mesh");
+    }
+
+  return ElementDeletionGeneratorBase::generate();
 }
 
 bool
 BlockDeletionGenerator::shouldDelete(const Elem * elem)
 {
-  return elem->subdomain_id() == _block_id;
+  return std::find(_block_ids.begin(), _block_ids.end(), elem->subdomain_id()) != _block_ids.end();
 }
diff --git a/framework/src/meshgenerators/PatternedMeshGenerator.C b/framework/src/meshgenerators/PatternedMeshGenerator.C
@@ -70,13 +70,21 @@ PatternedMeshGenerator::PatternedMeshGenerator(const InputParameters & parameter
                        " is larger than the the maximum possible index, which is determined by the "
                        "number of MeshGenerators provided in inputs");
 
+  _mesh_ptrs.reserve(_input_names.size());
+  for (auto & input_name : _input_names)
+    _mesh_ptrs.push_back(&getMeshByName(input_name));
+}
+
+std::unique_ptr<MeshBase>
+PatternedMeshGenerator::generate()
+{
   // Reserve spaces for all the meshes
   _meshes.reserve(_input_names.size());
 
   // Read in all of the meshes
   for (MooseIndex(_input_names) i = 0; i < _input_names.size(); ++i)
   {
-    std::unique_ptr<ReplicatedMesh> mesh = dynamic_pointer_cast<ReplicatedMesh>(getMeshByName(_input_names[i]));
+    std::unique_ptr<ReplicatedMesh> mesh = dynamic_pointer_cast<ReplicatedMesh>(*_mesh_ptrs[i]);
     if (!mesh)
       paramError("inputs",
                  "The input mesh '",
@@ -87,11 +95,7 @@ PatternedMeshGenerator::PatternedMeshGenerator(const InputParameters & parameter
                  "Try running without distributed mesh.");
     _meshes.push_back(std::move(mesh));
   }
-}
 
-std::unique_ptr<MeshBase>
-PatternedMeshGenerator::generate()
-{
   // Data structure that holds each row
   _row_meshes.resize(_pattern.size());
 

diff --git a/modules/combined/examples/stochastic/graphite_ring_thermomechanics.i b/modules/combined/examples/stochastic/graphite_ring_thermomechanics.i
@@ -15,7 +15,7 @@
   [ring]
     type = BlockDeletionGenerator
     input = disk
-    block_id = 1
+    block = 1
     new_boundary = 'inner'
   []
   [cylinder]

diff --git a/...cing-block-contact/frictional-nodal-min-normal-lm-mortar-fb-tangential-lm-mortar-action.i b/...cing-block-contact/frictional-nodal-min-normal-lm-mortar-fb-tangential-lm-mortar-action.i
@@ -22,12 +22,12 @@ offset = 1e-2
   [./delete_3]
     type = BlockDeletionGenerator
     input = original_file_mesh
-    block_id = 3
+    block = 3
   [../]
   [./revised_file_mesh]
     type = BlockDeletionGenerator
     input = delete_3
-    block_id = 4
+    block = 4
   [../]
 []
 

diff --git a/modules/heat_conduction/test/tests/postprocessors/convective_ht_side_integral.i b/modules/heat_conduction/test/tests/postprocessors/convective_ht_side_integral.i
@@ -23,7 +23,7 @@
 
   [./block_deleter]
     type = BlockDeletionGenerator
-    block_id = 2
+    block = 2
     input = add_iss_1
   [../]
 []

diff --git a/modules/heat_conduction/test/tests/radiative_bcs/radiative_bc_cyl.i b/modules/heat_conduction/test/tests/radiative_bcs/radiative_bc_cyl.i
@@ -19,7 +19,7 @@
 
   [./remove_1]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = cartesian
   [../]
 

diff --git a/modules/tensor_mechanics/examples/coal_mining/cosserat_elastic.i b/modules/tensor_mechanics/examples/coal_mining/cosserat_elastic.i
@@ -111,7 +111,7 @@
   []
   [hole]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = roof
   []
 []

diff --git a/modules/tensor_mechanics/examples/coal_mining/cosserat_mc_only.i b/modules/tensor_mechanics/examples/coal_mining/cosserat_mc_only.i
@@ -113,7 +113,7 @@
   []
   [hole]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = roof
   []
 []

diff --git a/modules/tensor_mechanics/examples/coal_mining/cosserat_mc_wp.i b/modules/tensor_mechanics/examples/coal_mining/cosserat_mc_wp.i
@@ -115,7 +115,7 @@
   []
   [hole]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = roof
   []
 []

diff --git a/modules/tensor_mechanics/examples/coal_mining/cosserat_wp_only.i b/modules/tensor_mechanics/examples/coal_mining/cosserat_wp_only.i
@@ -113,7 +113,7 @@
   []
   [hole]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = roof
   []
 []

diff --git a/modules/tensor_mechanics/test/tests/notched_plastic_block/biaxial_abbo.i b/modules/tensor_mechanics/test/tests/notched_plastic_block/biaxial_abbo.i
@@ -54,7 +54,7 @@
   []
   [remove_block]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = block_to_remove_ymax
   []
 []

diff --git a/modules/tensor_mechanics/test/tests/notched_plastic_block/biaxial_planar.i b/modules/tensor_mechanics/test/tests/notched_plastic_block/biaxial_planar.i
@@ -54,7 +54,7 @@
   []
   [remove_block]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = block_to_remove_ymax
   []
 []

diff --git a/modules/tensor_mechanics/test/tests/notched_plastic_block/biaxial_smooth.i b/modules/tensor_mechanics/test/tests/notched_plastic_block/biaxial_smooth.i
@@ -54,7 +54,7 @@
   []
   [remove_block]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = block_to_remove_ymax
   []
 []

diff --git a/modules/tensor_mechanics/test/tests/notched_plastic_block/cmc_planar.i b/modules/tensor_mechanics/test/tests/notched_plastic_block/cmc_planar.i
@@ -54,7 +54,7 @@
   []
   [remove_block]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = block_to_remove_ymax
   []
 []

diff --git a/modules/tensor_mechanics/test/tests/notched_plastic_block/cmc_smooth.i b/modules/tensor_mechanics/test/tests/notched_plastic_block/cmc_smooth.i
@@ -54,7 +54,7 @@
   []
   [remove_block]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = block_to_remove_ymax
   []
 []

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest1.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest1.i
@@ -21,7 +21,7 @@
   [ed0]
     type = BlockDeletionGenerator
     input = SubdomainBoundingBox
-    block_id = 1
+    block = 1
   []
 []
 

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest10.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest10.i
@@ -42,7 +42,7 @@
   [ed0]
     type = BlockDeletionGenerator
     input = new_block_number
-    block_id = 3
+    block = 3
   []
 []
 

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest12.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest12.i
@@ -21,7 +21,7 @@
   [delete]
     type = BlockDeletionGenerator
     input = mark
-    block_id = 1
+    block = 1
     new_boundary = cut_surface
   []
 []

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest2.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest2.i
@@ -23,7 +23,7 @@
   []
   [ed0]
     type = BlockDeletionGenerator
-    block_id = 1
+    block = 1
     input = SubdomainBoundingBox
   []
 []

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest3.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest3.i
@@ -21,7 +21,7 @@
   [ed0]
     type = BlockDeletionGenerator
     input = SubdomainBoundingBox
-    block_id = 1
+    block = 1
   []
 []
 

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest4.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest4.i
@@ -24,8 +24,7 @@
   [ed0]
     type = BlockDeletionGenerator
     input = SubdomainBoundingBox
-
-    block_id = 1
+    block = 1
   []
 []
 

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest6.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest6.i
@@ -38,7 +38,7 @@
   [ed0]
     type = BlockDeletionGenerator
     input = SubdomainBoundingBox3
-    block_id = 1
+    block = 1
   []
 []
 

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest7.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest7.i
@@ -28,7 +28,7 @@
   [ed0]
     type = BlockDeletionGenerator
     input = SubdomainBoundingBox2
-    block_id = 1
+    block = 1
   []
 []
 

diff --git a/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest9.i b/test/tests/mesh_modifiers/block_deleter/BlockDeleterTest9.i
@@ -21,7 +21,7 @@
   [ed0]
     type = BlockDeletionGenerator
     input = SubdomainBoundingBox1
-    block_id = 1
+    block = 1
   []
 []
 

diff --git a/test/tests/meshgenerators/block_deletion_generator/block_deletion_test1.i b/test/tests/meshgenerators/block_deletion_generator/block_deletion_test1.i
@@ -21,7 +21,7 @@
   [./ed0]
     type = BlockDeletionGenerator
     input = SubdomainBoundingBox
-    block_id = 1
+    block = 1
   [../]
 
 []

diff --git a/test/tests/meshgenerators/block_deletion_generator/block_deletion_test10.i b/test/tests/meshgenerators/block_deletion_generator/block_deletion_test10.i
@@ -40,7 +40,7 @@
   [../]
   [./ed0]
     type = BlockDeletionGenerator
-    block_id = 3
+    block = 3
     input = 'new_block_number'
   [../]
 []