Merge pull request idaholab#8691 from bwspenc/volumetric_locking_xfem

Fix bad interaction between volumetric locking correction and xfem
lindsayad · Mar 11, 2017 · c079d1d · c079d1d
2 parents fe3c3f3 + d4fb340
commit c079d1d
Show file tree

Hide file tree

Showing 45 changed files with 194 additions and 205 deletions.
diff --git a/modules/combined/tests/contact/4ElemTensionRelease.i b/modules/combined/tests/contact/4ElemTensionRelease.i
@@ -2,6 +2,9 @@
   file = 4ElemTensionRelease.e
   displacements = 'disp_x disp_y'
 []
+[GlobalParams]
+#  volumetric_locking_correction = false
+[]
 
 [Functions]
   [./up]
@@ -107,9 +110,9 @@
 
   l_max_its = 100
   nl_max_its = 10
-  dt = 0.1
-  dtmin = 0.1
-  num_steps = 30
+  dt = 0.2
+  dtmin = 0.2
+  end_time = 3
 
   [./Predictor]
     type = SimplePredictor

diff --git a/modules/combined/tests/contact/4ElemTensionRelease_mechanical_constraint.i b/modules/combined/tests/contact/4ElemTensionRelease_mechanical_constraint.i
@@ -109,9 +109,9 @@
 
   l_max_its = 100
   nl_max_its = 10
-  dt = 0.1
-  dtmin = 0.1
-  num_steps = 30
+  dt = 0.2
+  dtmin = 0.2
+  end_time = 3
 
   [./Predictor]
     type = SimplePredictor

diff --git a/modules/combined/tests/contact/gold/4ElemTensionRelease_out.e b/modules/combined/tests/contact/gold/4ElemTensionRelease_out.e
diff --git a/modules/combined/tests/contact_verification/patch_tests/plane_3/tests b/modules/combined/tests/contact_verification/patch_tests/plane_3/tests
@@ -9,6 +9,7 @@
     max_parallel = 1
     superlu = true
     prereq = 'glued_kin_sm'
+    skip = 'Reevaluate under PETSc 3.7.4. #8200'
   [../]
   [./glued_pen]
     type = 'CSVDiff'
@@ -31,6 +32,7 @@
     max_parallel = 1
     superlu = true
     prereq = 'frictionless_kin_sm'
+    skip = 'Reevaluate under PETSc 3.7.4. #8200'
   [../]
   [./frictionless_pen]
     type = 'CSVDiff'
@@ -62,7 +64,8 @@
     abs_zero = 1e-8
     max_parallel = 1
     superlu = true
-    prereq = 'mu_0_2_kin_sm'
+    #prereq = 'mu_0_2_kin_sm'  #Commented out because the prereq test is currently skipped #8200
+    skip = 'Reevaluate under PETSc 3.7.4. #8200'
   [../]
   [./mu_0_2_pen]
     type = 'CSVDiff'
@@ -132,6 +135,7 @@
     abs_zero = 1e-8
     max_parallel = 1
     superlu = true
+    skip = 'Reevaluate under PETSc 3.7.4. #8200'
   [../]
   [./mu_0_2_pen_sm]
     type = 'CSVDiff'

diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/blocks_2d_nogap.e b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/blocks_2d_nogap.e
diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/blocks_2d_nogap.jou b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/blocks_2d_nogap.jou
@@ -0,0 +1,16 @@
+brick x 0.6 y 2 z 1
+brick x 0.6 y 0.8 z 1
+volume 2 move {0.6}
+volume all move 0 0 -0.5
+surface 1 size 0.15
+surface 7 size 0.1
+mesh surface 1
+mesh surface 7
+sideset 1 curve 3
+sideset 2 curve 1
+sideset 3 curve 15
+sideset 4 curve 13
+block 1 surface 1
+block 2 surface 7
+block all element type QUAD4
+export mesh "blocks_2d_nogap.e" overwrite
diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_kinematic.i b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_kinematic.i
@@ -1,5 +1,5 @@
 [Mesh]
-  file = blocks_2d.e
+  file = blocks_2d_nogap.e
   displacements = 'disp_x disp_y'
 []
 
@@ -92,7 +92,7 @@
     variable = disp_x
     boundary = 4
     #Initial gap is 0.01
-    value = -0.02
+    value = -0.01
   [../]
   [./right_y]
     type = FunctionPresetBC

diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_kinematic_dirac.i b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_kinematic_dirac.i
@@ -1,6 +1,6 @@
 # This is a dirac (contact formulation) version of glued_kinematic.i
 [Mesh]
-  file = blocks_2d.e
+  file = blocks_2d_nogap.e
   displacements = 'disp_x disp_y'
 []
 
@@ -93,7 +93,7 @@
     variable = disp_x
     boundary = 4
     #Initial gap is 0.01
-    value = -0.02
+    value = -0.01
   [../]
   [./right_y]
     type = FunctionPresetBC

diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_penalty.i b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_penalty.i
@@ -1,5 +1,5 @@
 [Mesh]
-  file = blocks_2d.e
+  file = blocks_2d_nogap.e
   displacements = 'disp_x disp_y'
 []
 
@@ -92,7 +92,7 @@
     variable = disp_x
     boundary = 4
     #Initial gap is 0.01
-    value = -0.02
+    value = -0.01
   [../]
   [./right_y]
     type = FunctionPresetBC

diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_penalty_dirac.i b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/glued_penalty_dirac.i
@@ -1,6 +1,6 @@
 # This is a dirac (contact formulation) version of glued_penalty.i
 [Mesh]
-  file = blocks_2d.e
+  file = blocks_2d_nogap.e
   displacements = 'disp_x disp_y'
 []
 
@@ -93,7 +93,7 @@
     variable = disp_x
     boundary = 4
     #Initial gap is 0.01
-    value = -0.02
+    value = -0.01
   [../]
   [./right_y]
     type = FunctionPresetBC

diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/gold/glued_kinematic_out.e b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/gold/glued_kinematic_out.e
diff --git a/modules/combined/tests/mechanical_contact_constraint/blocks_2d/gold/glued_penalty_out.e b/modules/combined/tests/mechanical_contact_constraint/blocks_2d/gold/glued_penalty_out.e
diff --git a/modules/combined/tests/sliding_block/in_and_out/constraint/frictionless_penalty.i b/modules/combined/tests/sliding_block/in_and_out/constraint/frictionless_penalty.i
@@ -154,6 +154,13 @@
   [../]
 []
 
+[Preconditioning]
+  [./smp]
+     type = SMP
+     full = true
+  [../]
+[]
+
 [Executioner]
   type = Transient
 

diff --git a/modules/combined/tests/solid_mechanics/interaction_integral/tests b/modules/combined/tests/solid_mechanics/interaction_integral/tests
@@ -18,6 +18,7 @@
    input = 'interaction_integral_3d_as_2d.i'
    exodiff = 'interaction_integral_3d_as_2d_out.e'
    abs_zero = 1e-7
+   rel_err = 5e-5
    max_parallel = 1           # nl_its and lin_its will not be the same in parallel and serial
  [../]
  [./ii_3d]

diff --git a/modules/combined/tests/solid_mechanics/j_integral/tests b/modules/combined/tests/solid_mechanics/j_integral/tests
@@ -23,11 +23,13 @@
    type = 'Exodiff'
    input = 'j_integral_3d_as_2d.i'
    exodiff = 'j_integral_3d_as_2d_out.e'
+   rel_err = 5e-5
  [../]
  [./j_3d_as_2d_topo_q]
    type = 'Exodiff'
    input = 'j_integral_3d_as_2d_topo_q_func.i'
    exodiff = 'j_integral_3d_as_2d_topo_q_func_out.e'
+   rel_err = 5e-5
  [../]
  [./j_3d]
    type = 'Exodiff'

diff --git a/modules/combined/tests/solid_mechanics/t_stress/gold/t_stress_crack_infinite_plate_out.e b/modules/combined/tests/solid_mechanics/t_stress/gold/t_stress_crack_infinite_plate_out.e
diff --git a/modules/combined/tests/solid_mechanics/t_stress/gold/t_stress_ellip_crack_out.e b/modules/combined/tests/solid_mechanics/t_stress/gold/t_stress_ellip_crack_out.e
diff --git a/modules/combined/tests/solid_mechanics/t_stress/t_stress_crack_infinite_plate_2d.i b/modules/combined/tests/solid_mechanics/t_stress/t_stress_crack_infinite_plate_2d.i
@@ -171,8 +171,8 @@
 
    l_max_its = 50
    nl_max_its = 20
-   nl_abs_tol = 1e-5
-   nl_rel_tol = 1e-8
+   nl_abs_tol = 1e-9
+   nl_rel_tol = 1e-12
    l_tol = 1e-2
 
    start_time = 0.0
@@ -183,22 +183,6 @@
 
 []
 
-[Postprocessors]
-  [./_dt]
-    type = TimestepSize
-  [../]
-
-  [./nl_its]
-    type = NumNonlinearIterations
-  [../]
-
-  [./lin_its]
-    type = NumLinearIterations
-  [../]
-
-[]
-
-
 [Outputs]
   file_base = t_stress_crack_infinite_plate_out
   exodus = true

diff --git a/modules/combined/tests/solid_mechanics/t_stress/t_stress_ellip_crack_3d.cmp b/modules/combined/tests/solid_mechanics/t_stress/t_stress_ellip_crack_3d.cmp
diff --git a/modules/combined/tests/solid_mechanics/t_stress/t_stress_ellip_crack_3d.i b/modules/combined/tests/solid_mechanics/t_stress/t_stress_ellip_crack_3d.i
@@ -229,21 +229,6 @@
 
 []
 
-[Postprocessors]
-  [./_dt]
-    type = TimestepSize
-  [../]
-
-  [./nl_its]
-    type = NumNonlinearIterations
-  [../]
-
-  [./lin_its]
-    type = NumLinearIterations
-  [../]
-[]
-
-
 [Outputs]
   execute_on = 'timestep_end'
   file_base = t_stress_ellip_crack_out

diff --git a/modules/combined/tests/solid_mechanics/t_stress/tests b/modules/combined/tests/solid_mechanics/t_stress/tests
@@ -4,13 +4,11 @@
    input = 't_stress_crack_infinite_plate_2d.i'
    exodiff = 't_stress_crack_infinite_plate_out.e'
    abs_zero = 1e-7
-   max_parallel = 1 # nl_its and lin_its will not be the same in parallel and serial
  [../]
  [./3d]
    type = 'Exodiff'
    input = 't_stress_ellip_crack_3d.i'
    exodiff = 't_stress_ellip_crack_out.e'
    abs_zero = 1e-7
-   custom_cmp = 't_stress_ellip_crack_3d.cmp' # Ignore nl_its and lin_its
 [../]
 []