Merge pull request idaholab#15893 from cticenhour/square-be-gone-14766

Remove square.e in tests in framework and modules
arovinelli · Oct 5, 2020 · 97e06a9 · 97e06a9
2 parents ef86bbe + 1dca6e5
commit 97e06a9
Show file tree

Hide file tree

Showing 227 changed files with 975 additions and 435 deletions.
diff --git a/...combined/test/tests/elastic_thermal_patch/ad_elastic_thermal_weak_plane_stress_jacobian.i b/...combined/test/tests/elastic_thermal_patch/ad_elastic_thermal_weak_plane_stress_jacobian.i
@@ -5,7 +5,12 @@
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Variables]

diff --git a/...es/combined/test/tests/elastic_thermal_patch/elastic_thermal_weak_plane_stress_jacobian.i b/...es/combined/test/tests/elastic_thermal_patch/elastic_thermal_weak_plane_stress_jacobian.i
@@ -7,7 +7,12 @@
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Variables]

diff --git a/modules/combined/test/tests/elastic_thermal_patch/square.e b/modules/combined/test/tests/elastic_thermal_patch/square.e
diff --git a/modules/tensor_mechanics/test/tests/2D_geometries/gold/planestrain_out.e b/modules/tensor_mechanics/test/tests/2D_geometries/gold/planestrain_out.e
diff --git a/modules/tensor_mechanics/test/tests/2D_geometries/planestrain.i b/modules/tensor_mechanics/test/tests/2D_geometries/planestrain.i
@@ -6,7 +6,12 @@
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Modules/TensorMechanics/Master]
@@ -26,21 +31,21 @@
 []
 
 [BCs]
-  [./leftx]
+  [./rightx]
     type = DirichletBC
-    boundary = 2
+    boundary = 1
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]
   [./pull]
     type = FunctionDirichletBC
-    boundary = 3
+    boundary = 2
     variable = disp_y
     function = pull
   [../]
@@ -49,11 +54,11 @@
 [Materials]
   [./linear_stress]
     type = ComputeLinearElasticStress
-    block = 1
+    block = 0
   [../]
   [./elasticity_tensor]
     type = ComputeIsotropicElasticityTensor
-    block = 1
+    block = 0
     poissons_ratio = 0.3
     youngs_modulus = 1e10
   [../]

diff --git a/modules/tensor_mechanics/test/tests/2D_geometries/square.e b/modules/tensor_mechanics/test/tests/2D_geometries/square.e
diff --git a/modules/tensor_mechanics/test/tests/accumulate_aux/accumulate_aux.i b/modules/tensor_mechanics/test/tests/accumulate_aux/accumulate_aux.i
@@ -4,7 +4,16 @@
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 1
+    ny = 1
+    xmin = -0.5
+    xmax = 0.5
+    ymin = -0.5
+    ymax = 0.5
+  [../]
 []
 
 [Variables]
@@ -47,14 +56,14 @@
   [./b1x]
     type = DirichletBC
     variable = v
-    boundary = 1
+    boundary = 0
     value = 0
   [../]
 
   [./b2x]
     type = DirichletBC
     variable = v
-    boundary = 3
+    boundary = 2
     value = 2
   [../]
 []

diff --git a/modules/tensor_mechanics/test/tests/accumulate_aux/gold/accumulate_aux_out.e b/modules/tensor_mechanics/test/tests/accumulate_aux/gold/accumulate_aux_out.e
diff --git a/modules/tensor_mechanics/test/tests/accumulate_aux/square.e b/modules/tensor_mechanics/test/tests/accumulate_aux/square.e
diff --git a/modules/tensor_mechanics/test/tests/accumulate_aux/square.jou b/modules/tensor_mechanics/test/tests/accumulate_aux/square.jou
diff --git a/modules/tensor_mechanics/test/tests/ad_2D_geometries/square.e b/modules/tensor_mechanics/test/tests/ad_2D_geometries/square.e
diff --git a/...es/tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_finite.i b/...es/tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_finite.i
@@ -2,11 +2,16 @@
   order = FIRST
   family = LAGRANGE
   displacements = 'disp_x disp_y'
-  block = 1
+  block = 0
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Variables]
@@ -66,13 +71,13 @@
 [BCs]
   [./bottomx]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]

diff --git a/...tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_increment.i b/...tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_increment.i
@@ -1,11 +1,16 @@
 [GlobalParams]
   displacements = 'disp_x disp_y'
   scalar_out_of_plane_strain = scalar_strain_zz
-  block = 1
+  block = 0
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Variables]
@@ -66,13 +71,13 @@
 [BCs]
   [./bottomx]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]

diff --git a/...tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_ref_resid.i b/...tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_ref_resid.i
@@ -3,7 +3,12 @@
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Problem]
@@ -91,13 +96,13 @@
 [BCs]
   [./bottomx]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]

diff --git a/...les/tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_small.i b/...les/tensor_mechanics/test/tests/generalized_plane_strain/generalized_plane_strain_small.i
@@ -3,7 +3,12 @@
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Variables]
@@ -70,13 +75,13 @@
 [BCs]
   [./bottomx]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]

diff --git a/..._mechanics/test/tests/generalized_plane_strain/gold/generalized_plane_strain_finite_out.e b/..._mechanics/test/tests/generalized_plane_strain/gold/generalized_plane_strain_finite_out.e
diff --git a/...chanics/test/tests/generalized_plane_strain/gold/generalized_plane_strain_increment_out.e b/...chanics/test/tests/generalized_plane_strain/gold/generalized_plane_strain_increment_out.e
diff --git a/...r_mechanics/test/tests/generalized_plane_strain/gold/generalized_plane_strain_small_out.e b/...r_mechanics/test/tests/generalized_plane_strain/gold/generalized_plane_strain_small_out.e
diff --git a/...les/tensor_mechanics/test/tests/generalized_plane_strain/gold/out_of_plane_pressure_out.e b/...les/tensor_mechanics/test/tests/generalized_plane_strain/gold/out_of_plane_pressure_out.e
diff --git a/modules/tensor_mechanics/test/tests/generalized_plane_strain/gold/plane_strain_out.e b/modules/tensor_mechanics/test/tests/generalized_plane_strain/gold/plane_strain_out.e
diff --git a/...s/tensor_mechanics/test/tests/generalized_plane_strain/gold/plane_strain_prescribed_out.e b/...s/tensor_mechanics/test/tests/generalized_plane_strain/gold/plane_strain_prescribed_out.e
diff --git a/modules/tensor_mechanics/test/tests/generalized_plane_strain/out_of_plane_pressure.i b/modules/tensor_mechanics/test/tests/generalized_plane_strain/out_of_plane_pressure.i
@@ -1,7 +1,12 @@
 # Tests for application of out-of-plane pressure in generalized plane strain.
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
   displacements = 'disp_x disp_y'
 []
 
@@ -163,13 +168,13 @@
 [BCs]
   [./leftx]
     type = DirichletBC
-    boundary = 4
+    boundary = 3
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]

diff --git a/modules/tensor_mechanics/test/tests/generalized_plane_strain/plane_strain.i b/modules/tensor_mechanics/test/tests/generalized_plane_strain/plane_strain.i
@@ -2,11 +2,16 @@
   order = FIRST
   family = LAGRANGE
   displacements = 'disp_x disp_y'
-  block = 1
+  block = 0
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [AuxVariables]
@@ -37,13 +42,13 @@
 [BCs]
   [./bottomx]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]

diff --git a/modules/tensor_mechanics/test/tests/generalized_plane_strain/plane_strain_prescribed.i b/modules/tensor_mechanics/test/tests/generalized_plane_strain/plane_strain_prescribed.i
@@ -3,11 +3,16 @@
   family = LAGRANGE
   displacements = 'disp_x disp_y'
   scalar_out_of_plane_strain = scalar_strain_zz
-  block = 1
+  block = 0
 []
 
 [Mesh]
-  file = square.e
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [AuxVariables]
@@ -56,13 +61,13 @@
 [BCs]
   [./bottomx]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_x
     value = 0.0
   [../]
   [./bottomy]
     type = DirichletBC
-    boundary = 1
+    boundary = 0
     variable = disp_y
     value = 0.0
   [../]

diff --git a/modules/tensor_mechanics/test/tests/generalized_plane_strain/square.e b/modules/tensor_mechanics/test/tests/generalized_plane_strain/square.e
diff --git a/modules/tensor_mechanics/test/tests/plane_stress/ad_weak_plane_stress_elastic_jacobian.i b/modules/tensor_mechanics/test/tests/plane_stress/ad_weak_plane_stress_elastic_jacobian.i
@@ -4,7 +4,12 @@
 []
 
 [Mesh]
-  file = 'square.e'
+  [./square]
+    type = GeneratedMeshGenerator
+    dim = 2
+    nx = 2
+    ny = 2
+  [../]
 []
 
 [Variables]