Merge pull request #25798 from farscape-project/consolidate_xfem

Consolidate XFEM tests on high order elements
idaholab · Oct 24, 2023 · a74b1e2 · a74b1e2
2 parents f1e4bf9 + ca5e8c2
commit a74b1e2
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 998 deletions.
diff --git a/modules/xfem/doc/content/source/userobjects/LineSegmentCutSetUserObject.md b/modules/xfem/doc/content/source/userobjects/LineSegmentCutSetUserObject.md
@@ -12,15 +12,15 @@ of six values in cut_data prescribes a line segment cut: start point x, start
 point y, end point x, end point y, start cut time, end cut time. The object
 checks to ensure that the length of cut_data is a multiple of six. Provided
 that the start cut time and end cut time values are different, the cut will
-lenghten by $r_{total} \cdot \frac{t_{current} - t_{start}}{t_{end} -
+lengthen by $r_{total} \cdot \frac{t_{current} - t_{start}}{t_{end} -
 t_{start}}$ at each timestep from start cut time until the specified end cut
 time. As in the `LineSegmentCutUserObject`, scaling and translation are
 available via optional parameters and apply to all applicable components of
 cut_data.
 
 ## Example Input Syntax
 
-!listing test/tests/second_order_elements/square_branch_quad9_2d.i block=UserObjects
+!listing test/tests/high_order_elements/square_branch_2d.i block=UserObjects
 
 !syntax parameters /UserObjects/LineSegmentCutSetUserObject
 

diff --git a/modules/xfem/doc/content/source/userobjects/LineSegmentCutUserObject.md b/modules/xfem/doc/content/source/userobjects/LineSegmentCutUserObject.md
@@ -8,7 +8,7 @@ The `LineSegmentCutUserObject` defines a line segment cut for XFEM to make on a
 2 dimensional mesh. The start and end points of the line segment are defined in
 cut_data as a vector of four Real values: start point x, start point y, end
 point x, end point y. By default, the entire cut specified is performed at
-$t=0$. Propogation of the cut may be prescribed along the line
+$t=0$. Propagation of the cut may be prescribed along the line
 segment by specifying the time_start_cut and time_end_cut parameters in
 simulation time. The cut will lengthen by $r_{total} \cdot \frac{t_{current} -
 t_{start}}{t_{end} - t_{start}}$ at each timestep from time_start_cut until
@@ -19,7 +19,7 @@ to both start and end points.
 
 ## Example Input Syntax
 
-!listing test/tests/second_order_elements/diffusion_2d_quad8.i block=UserObjects
+!listing test/tests/high_order_elements/diffusion_2d.i block=UserObjects
 
 !syntax parameters /UserObjects/LineSegmentCutUserObject
 

diff --git a/...second_order_elements/diffusion_2d_tri6.i → .../tests/high_order_elements/diffusion_2d.i b/...second_order_elements/diffusion_2d_tri6.i → .../tests/high_order_elements/diffusion_2d.i
diff --git a/...econd_order_elements/diffusion_3d_tet10.i → .../tests/high_order_elements/diffusion_3d.i b/...econd_order_elements/diffusion_3d_tet10.i → .../tests/high_order_elements/diffusion_3d.i
diff --git a/...er_elements/diffusion_quad9_levelsetcut.i → ...er_elements/diffusion_quad9_levelsetcut.i b/...er_elements/diffusion_quad9_levelsetcut.i → ...er_elements/diffusion_quad9_levelsetcut.i
diff --git a/...er_elements/gold/diffusion_2d_quad8_out.e → ...er_elements/gold/diffusion_2d_quad8_out.e b/...er_elements/gold/diffusion_2d_quad8_out.e → ...er_elements/gold/diffusion_2d_quad8_out.e
diff --git a/...ements/gold/diffusion_2d_quad8_out.e-s002 → ...ements/gold/diffusion_2d_quad8_out.e-s002 b/...ements/gold/diffusion_2d_quad8_out.e-s002 → ...ements/gold/diffusion_2d_quad8_out.e-s002
diff --git a/...er_elements/gold/diffusion_2d_quad9_out.e → ...er_elements/gold/diffusion_2d_quad9_out.e b/...er_elements/gold/diffusion_2d_quad9_out.e → ...er_elements/gold/diffusion_2d_quad9_out.e
diff --git a/...ements/gold/diffusion_2d_quad9_out.e-s002 → ...ements/gold/diffusion_2d_quad9_out.e-s002 b/...ements/gold/diffusion_2d_quad9_out.e-s002 → ...ements/gold/diffusion_2d_quad9_out.e-s002
diff --git a/...der_elements/gold/diffusion_2d_tri6_out.e → ...der_elements/gold/diffusion_2d_tri6_out.e b/...der_elements/gold/diffusion_2d_tri6_out.e → ...der_elements/gold/diffusion_2d_tri6_out.e
diff --git a/...lements/gold/diffusion_2d_tri6_out.e-s002 → ...lements/gold/diffusion_2d_tri6_out.e-s002 b/...lements/gold/diffusion_2d_tri6_out.e-s002 → ...lements/gold/diffusion_2d_tri6_out.e-s002
diff --git a/...der_elements/gold/diffusion_2d_tri7_out.e → ...der_elements/gold/diffusion_2d_tri7_out.e b/...der_elements/gold/diffusion_2d_tri7_out.e → ...der_elements/gold/diffusion_2d_tri7_out.e
diff --git a/...lements/gold/diffusion_2d_tri7_out.e-s002 → ...lements/gold/diffusion_2d_tri7_out.e-s002 b/...lements/gold/diffusion_2d_tri7_out.e-s002 → ...lements/gold/diffusion_2d_tri7_out.e-s002
diff --git a/...er_elements/gold/diffusion_3d_hex20_out.e → ...er_elements/gold/diffusion_3d_hex20_out.e b/...er_elements/gold/diffusion_3d_hex20_out.e → ...er_elements/gold/diffusion_3d_hex20_out.e
diff --git a/...er_elements/gold/diffusion_3d_hex27_out.e → ...er_elements/gold/diffusion_3d_hex27_out.e b/...er_elements/gold/diffusion_3d_hex27_out.e → ...er_elements/gold/diffusion_3d_hex27_out.e
diff --git a/...er_elements/gold/diffusion_3d_tet10_out.e → ...er_elements/gold/diffusion_3d_tet10_out.e b/...er_elements/gold/diffusion_3d_tet10_out.e → ...er_elements/gold/diffusion_3d_tet10_out.e
diff --git a/...ts/gold/diffusion_quad9_levelsetcut_out.e → ...ts/gold/diffusion_quad9_levelsetcut_out.e b/...ts/gold/diffusion_quad9_levelsetcut_out.e → ...ts/gold/diffusion_quad9_levelsetcut_out.e
diff --git a/...lements/gold/square_branch_quad8_2d_out.e → ...lements/gold/square_branch_quad8_2d_out.e b/...lements/gold/square_branch_quad8_2d_out.e → ...lements/gold/square_branch_quad8_2d_out.e
diff --git a/...ts/gold/square_branch_quad8_2d_out.e-s002 → ...ts/gold/square_branch_quad8_2d_out.e-s002 b/...ts/gold/square_branch_quad8_2d_out.e-s002 → ...ts/gold/square_branch_quad8_2d_out.e-s002
diff --git a/...ts/gold/square_branch_quad8_2d_out.e-s003 → ...ts/gold/square_branch_quad8_2d_out.e-s003 b/...ts/gold/square_branch_quad8_2d_out.e-s003 → ...ts/gold/square_branch_quad8_2d_out.e-s003
diff --git a/...lements/gold/square_branch_quad9_2d_out.e → ...lements/gold/square_branch_quad9_2d_out.e b/...lements/gold/square_branch_quad9_2d_out.e → ...lements/gold/square_branch_quad9_2d_out.e
diff --git a/...ts/gold/square_branch_quad9_2d_out.e-s002 → ...ts/gold/square_branch_quad9_2d_out.e-s002 b/...ts/gold/square_branch_quad9_2d_out.e-s002 → ...ts/gold/square_branch_quad9_2d_out.e-s002
diff --git a/...ts/gold/square_branch_quad9_2d_out.e-s003 → ...ts/gold/square_branch_quad9_2d_out.e-s003 b/...ts/gold/square_branch_quad9_2d_out.e-s003 → ...ts/gold/square_branch_quad9_2d_out.e-s003
diff --git a/...elements/gold/square_branch_tri6_2d_out.e → ...elements/gold/square_branch_tri6_2d_out.e b/...elements/gold/square_branch_tri6_2d_out.e → ...elements/gold/square_branch_tri6_2d_out.e
diff --git a/...nts/gold/square_branch_tri6_2d_out.e-s002 → ...nts/gold/square_branch_tri6_2d_out.e-s002 b/...nts/gold/square_branch_tri6_2d_out.e-s002 → ...nts/gold/square_branch_tri6_2d_out.e-s002
diff --git a/...nts/gold/square_branch_tri6_2d_out.e-s003 → ...nts/gold/square_branch_tri6_2d_out.e-s003 b/...nts/gold/square_branch_tri6_2d_out.e-s003 → ...nts/gold/square_branch_tri6_2d_out.e-s003
diff --git a/...elements/gold/square_branch_tri7_2d_out.e → ...elements/gold/square_branch_tri7_2d_out.e b/...elements/gold/square_branch_tri7_2d_out.e → ...elements/gold/square_branch_tri7_2d_out.e
diff --git a/...nts/gold/square_branch_tri7_2d_out.e-s002 → ...nts/gold/square_branch_tri7_2d_out.e-s002 b/...nts/gold/square_branch_tri7_2d_out.e-s002 → ...nts/gold/square_branch_tri7_2d_out.e-s002
diff --git a/...nts/gold/square_branch_tri7_2d_out.e-s003 → ...nts/gold/square_branch_tri7_2d_out.e-s003 b/...nts/gold/square_branch_tri7_2d_out.e-s003 → ...nts/gold/square_branch_tri7_2d_out.e-s003
diff --git a/...nd_order_elements/square_branch_tri6_2d.i → ...ts/high_order_elements/square_branch_2d.i b/...nd_order_elements/square_branch_tri6_2d.i → ...ts/high_order_elements/square_branch_2d.i
@@ -99,7 +99,7 @@
 
   solve_type = 'PJFNK'
   petsc_options_iname = '-ksp_gmres_restart -pc_type -pc_hypre_type -pc_hypre_boomeramg_max_iter'
-  petsc_options_value = '201                hypre    boomeramg      8'
+  petsc_options_value = '201                hypre    boomeramg      10'
 
   line_search = 'none'
 

diff --git a/...em/test/tests/second_order_elements/tests → ...xfem/test/tests/high_order_elements/tests b/...em/test/tests/second_order_elements/tests → ...xfem/test/tests/high_order_elements/tests
@@ -3,24 +3,36 @@
   issues = '#8709'
   [./diffusion_2d_tri6]
     type = Exodiff
-    input = diffusion_2d_tri6.i
+    input = diffusion_2d.i
     exodiff = 'diffusion_2d_tri6_out.e diffusion_2d_tri6_out.e-s002'
+    cli_args = 'Outputs/file_base=diffusion_2d_tri6_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of discontinuities represented with XFEM with second-order elements in 2D using TRI6 elements.'
   [../]
+  [./diffusion_2d_tri7]
+    type = Exodiff
+    input = diffusion_2d.i
+    exodiff = 'diffusion_2d_tri7_out.e diffusion_2d_tri7_out.e-s002'
+    cli_args = 'GlobalParams/order=THIRD Mesh/elem_type=TRI7 Outputs/file_base=diffusion_2d_tri7_out'
+    map = false
+    unique_id = true
+    requirement = 'The XFEM module shall permit modeling of discontinuities represented with XFEM with third-order elements in 2D using TRI7 elements.'
+  [../]
   [./diffusion_2d_quad8]
     type = Exodiff
-    input = diffusion_2d_quad8.i
+    input = diffusion_2d.i
     exodiff = 'diffusion_2d_quad8_out.e diffusion_2d_quad8_out.e-s002'
+    cli_args = 'Mesh/elem_type=QUAD8 Outputs/file_base=diffusion_2d_quad8_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of discontinuities represented with XFEM with second-order elements in 2D using QUAD8 elements.'
   [../]
   [./diffusion_2d_quad9]
     type = Exodiff
-    input = diffusion_2d_quad9.i
+    input = diffusion_2d.i
     exodiff = 'diffusion_2d_quad9_out.e diffusion_2d_quad9_out.e-s002'
+    cli_args = 'Mesh/elem_type=QUAD9 Outputs/file_base=diffusion_2d_quad9_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of discontinuities represented with XFEM with second-order elements in 2D using QUAD9 elements.'
@@ -35,50 +47,66 @@
   [../]
   [./diffusion_3d_tet10]
     type = Exodiff
-    input = diffusion_3d_tet10.i
+    input = diffusion_3d.i
     exodiff = 'diffusion_3d_tet10_out.e'
+    cli_args = 'Outputs/file_base=diffusion_3d_tet10_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of discontinuities represented with XFEM with second-order elements in 3D using TET10 elements when the XFEM cutting plane is prescribed using a level set field.'
   [../]
   [./diffusion_3d_hex20]
     type = Exodiff
-    input = diffusion_3d_hex20.i
+    input = diffusion_3d.i
     exodiff = 'diffusion_3d_hex20_out.e'
+    cli_args = 'Mesh/ny=4 Mesh/elem_type=HEX20 Outputs/file_base=diffusion_3d_hex20_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of discontinuities represented with XFEM with second-order elements in 3D using HEX20 elements when the XFEM cutting plane is prescribed using a level set field.'
   [../]
   [./diffusion_3d_hex27]
     type = Exodiff
-    input = diffusion_3d_hex27.i
+    input = diffusion_3d.i
     exodiff = 'diffusion_3d_hex27_out.e'
+    cli_args = 'Mesh/ny=4 Mesh/elem_type=HEX27 Outputs/file_base=diffusion_3d_hex27_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of discontinuities represented with XFEM with second-order elements in 3D using HEX27 elements when the XFEM cutting plane is prescribed using a level set field.'
   [../]
   [./square_branch_quad8_2d]
     type = Exodiff
-    input = square_branch_quad8_2d.i
+    input = square_branch_2d.i
     exodiff = 'square_branch_quad8_2d_out.e square_branch_quad8_2d_out.e-s002 square_branch_quad8_2d_out.e-s003'
+    cli_args = 'Modules/TensorMechanics/Master/all/planar_formulation=PLANE_STRAIN '
+               'Mesh/elem_type=QUAD8 Outputs/file_base=square_branch_quad8_2d_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of branching of discontinuities represented with XFEM by sequentially cutting second-order elements in 2D using QUAD8 elements.'
   [../]
   [./square_branch_quad9_2d]
     type = Exodiff
-    input = square_branch_quad9_2d.i
+    input = square_branch_2d.i
     exodiff = 'square_branch_quad9_2d_out.e square_branch_quad9_2d_out.e-s002 square_branch_quad9_2d_out.e-s003'
+    cli_args = 'Mesh/elem_type=QUAD9 Outputs/file_base=square_branch_quad9_2d_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of branching of discontinuities represented with XFEM by sequentially cutting second-order elements in 2D using QUAD9 elements.'
   [../]
   [./square_branch_tri6_2d]
     type = Exodiff
-    input = square_branch_tri6_2d.i
+    input = square_branch_2d.i
     exodiff = 'square_branch_tri6_2d_out.e square_branch_tri6_2d_out.e-s002 square_branch_tri6_2d_out.e-s003'
+    cli_args = 'Outputs/file_base=square_branch_tri6_2d_out'
     map = false
     unique_id = true
     requirement = 'The XFEM module shall permit modeling of branching of discontinuities represented with XFEM by sequentially cutting second-order elements in 2D using TRI6 elements.'
   [../]
+  [./square_branch_tri7_2d]
+    type = Exodiff
+    input = square_branch_2d.i
+    exodiff = 'square_branch_tri7_2d_out.e square_branch_tri7_2d_out.e-s002 square_branch_tri7_2d_out.e-s003'
+    cli_args = 'GlobalParams/order=THIRD Mesh/elem_type=TRI7 Outputs/file_base=square_branch_tri7_2d_out'
+    map = false
+    unique_id = true
+    requirement = 'The XFEM module shall permit modeling of branching of discontinuities represented with XFEM by sequentially cutting third-order elements in 2D using TRI7 elements.'
+  [../]
 []
diff --git a/modules/xfem/test/tests/second_order_elements/diffusion_2d_quad8.i b/modules/xfem/test/tests/second_order_elements/diffusion_2d_quad8.i
diff --git a/modules/xfem/test/tests/second_order_elements/diffusion_2d_quad9.i b/modules/xfem/test/tests/second_order_elements/diffusion_2d_quad9.i