From 5160d9eeefe6ebadf9651618c32fc8936fcaf8c3 Mon Sep 17 00:00:00 2001 From: Daniel Yankura Date: Thu, 10 Apr 2025 08:24:01 -0600 Subject: [PATCH 1/2] Changes several tests so that they still pass with new libmesh feature - New libmesh feature throws and error when making a nodeset from a sideset if a nodeset with same ID exists - named_entities meshes were changes to avoid this - BoundaryInfo function now called in AdvancedExtruderGenerator that tells which sidesets should be excluded from this check closes #30085 --- .../AdvancedExtruderGenerator.C | 3 +++ .../mesh/named_entities/named_entities.e | Bin 5852 -> 9388 bytes .../mesh/named_entities/named_entities.xda | 20 +++++++++--------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/framework/src/meshgenerators/AdvancedExtruderGenerator.C b/framework/src/meshgenerators/AdvancedExtruderGenerator.C index a74087631caf..9fa11b6fd22a 100644 --- a/framework/src/meshgenerators/AdvancedExtruderGenerator.C +++ b/framework/src/meshgenerators/AdvancedExtruderGenerator.C @@ -491,10 +491,13 @@ AdvancedExtruderGenerator::generate() boundary_info.add_node(new_node, ids_to_copy); else for (const auto & id_to_copy : ids_to_copy) + { boundary_info.add_node(new_node, _boundary_swap_pairs[e].count(id_to_copy) ? _boundary_swap_pairs[e][id_to_copy] : id_to_copy); + boundary_info.add_equivalent_sideset(_boundary_swap_pairs[e][id_to_copy]); + } old_distance = current_distance; current_node_layer++; diff --git a/test/tests/mesh/named_entities/named_entities.e b/test/tests/mesh/named_entities/named_entities.e index eae9086037511054c1ccfe4508e3fc924ba3afa5..99d86dbb577afb70d773a2a519260ff3eb710d93 100644 GIT binary patch literal 9388 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 AivR!s diff --git a/test/tests/mesh/named_entities/named_entities.xda b/test/tests/mesh/named_entities/named_entities.xda index 9e3e11c74624..ee22eab2b7e0 100644 --- a/test/tests/mesh/named_entities/named_entities.xda +++ b/test/tests/mesh/named_entities/named_entities.xda @@ -126,7 +126,7 @@ left_side top_right right_side 23 5 3 2 # nodeset id to name map 2 # vector length -1 2 +1 3 2 # vector length left_nodes right_nodes 18 # number of nodesets @@ -139,12 +139,12 @@ left_nodes right_nodes 12 1 13 1 16 1 -54 2 -55 2 -56 2 -57 2 -58 2 -59 2 -60 2 -61 2 -62 2 +54 3 +55 3 +56 3 +57 3 +58 3 +59 3 +60 3 +61 3 +62 3 From 4e20226d5ed865cdf16f6b85f682290a9da93658 Mon Sep 17 00:00:00 2001 From: Daniel Yankura Date: Thu, 10 Apr 2025 12:58:27 -0600 Subject: [PATCH 2/2] Changes so that tests won't fail before libmesh PR is merged - removed call to add_equivalent_sideset from AdvancedExtruderGenerator.C - added skip to corresponding extruder boudary swap test - Two named_entities mesh files left the same --- framework/src/meshgenerators/AdvancedExtruderGenerator.C | 1 - test/tests/meshgenerators/advanced_extruder_generator/tests | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/meshgenerators/AdvancedExtruderGenerator.C b/framework/src/meshgenerators/AdvancedExtruderGenerator.C index 9fa11b6fd22a..a3e11b92b5c0 100644 --- a/framework/src/meshgenerators/AdvancedExtruderGenerator.C +++ b/framework/src/meshgenerators/AdvancedExtruderGenerator.C @@ -496,7 +496,6 @@ AdvancedExtruderGenerator::generate() _boundary_swap_pairs[e].count(id_to_copy) ? _boundary_swap_pairs[e][id_to_copy] : id_to_copy); - boundary_info.add_equivalent_sideset(_boundary_swap_pairs[e][id_to_copy]); } old_distance = current_distance; diff --git a/test/tests/meshgenerators/advanced_extruder_generator/tests b/test/tests/meshgenerators/advanced_extruder_generator/tests index 3661181f507f..eb5c3d08d334 100644 --- a/test/tests/meshgenerators/advanced_extruder_generator/tests +++ b/test/tests/meshgenerators/advanced_extruder_generator/tests @@ -120,6 +120,7 @@ requirement = 'The system shall be able to retain and swap boundary ids during extrusion.' design = 'AdvancedExtruderGenerator.md' issues = '#21852' + skip = 'Pending libmesh PR #4121 being merged' [] [helicoidal] type = Exodiff