Merge pull request #241 from lanl/strength

refactoring dissipation models
lanl · Dec 6, 2024 · a3ea452 · a3ea452
2 parents d02e43b + a8fa267
commit a3ea452
Show file tree

Hide file tree

Showing 24 changed files with 1,646 additions and 642 deletions.
diff --git a/single-node-refactor/input-impact-erosion.yaml b/single-node-refactor/input-impact-erosion.yaml
@@ -29,7 +29,7 @@ output_options:
 
 solver_options:
   - solver:
-        method: SGH
+        method: SGH3D
         # solver_vars:
         #  - blah
         #  - blah
@@ -39,15 +39,15 @@ boundary_conditions:
 
     # Tag Y plane
     - boundary_condition:
-        solver: SGH
+        solver: SGH3D
         geometry: y_plane
         direction: y_dir
         value: 0.0
         type: reflected_velocity
 
     # Tag z plane
     - boundary_condition:
-        solver: SGH
+        solver: SGH3D
         geometry: z_plane
         direction: z_dir
         value: 0.0
@@ -61,13 +61,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
             - 0.0   # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 3.0
             - 1.0E-4
@@ -79,11 +80,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS
         dissipation_global_vars:
             - 1.0   # q1
-            - 1.333 # q1ex
-            - 1.0   # q2
+            - 1.0   # q1ex
+            - 1.333 # q2
             - 1.333 # q2ex
+            - 0.0   # phi_min
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-4
@@ -99,10 +103,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
-        q1: 1.0
-        q2: 1.333
-        q1ex: 1.0
-        q2ex: 1.333
+        dissipation_model: MARS
+        dissipation_global_vars:
+            - 1.0   # q1
+            - 1.0   # q1ex
+            - 1.333 # q2
+            - 1.333 # q2ex
+            - 0.0   # phi_min
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-4

diff --git a/single-node-refactor/input-lattice.yaml b/single-node-refactor/input-lattice.yaml
@@ -0,0 +1,129 @@
+# num_dims: 3
+
+dynamic_options:
+    time_final: 1.0
+    dt_min: 1.e-8
+    dt_max: 1.e-2
+    dt_start: 1.e-5
+    cycle_stop: 300000
+
+
+# mesh_options:
+#     source: file
+#     file_path: /var/tmp/repos/Fierro/fork/Fierro/testing/meshes/mesh_Sedov_8.geo
+
+mesh_options:
+    source: generate
+    num_dims: 3
+    type: box
+    origin: [0.0, 0.0, 0.0]
+    length: [1, 1, 1]
+    num_elems: [64, 64, 64]
+
+
+output_options:
+    timer_output_level: thorough
+    output_file_format: ensight
+    graphics_time_step: 0.25
+    # graphics_iteration_step: 10
+
+solver_options:
+  - solver:
+        method: SGH3D
+        # solver_vars:
+        #  - blah
+        #  - blah
+        #  - blah
+
+boundary_conditions:
+    # Tag X plane
+    - boundary_condition:
+        solver: SGH3D
+        geometry: x_plane
+        direction: x_dir
+        value: 0.0
+        type: reflected_velocity
+
+
+    # Tag Y plane
+    - boundary_condition:
+        solver: SGH3D
+        geometry: y_plane
+        direction: y_dir
+        value: 0.0
+        type: reflected_velocity
+
+    # Tag z plane
+    - boundary_condition:
+        solver: SGH3D
+        geometry: z_plane
+        direction: z_dir
+        value: 0.0
+        type: reflected_velocity
+
+materials:
+    - material:
+        id: 0
+        eos_model_type: decoupled
+        eos_model: gamma_law_gas
+        # strength_model: none
+        dissipation_model: MARS
+        dissipation_global_vars:
+            - 1.0   # q1
+            - 1.0   # q1ex
+            - 1.333 # q2
+            - 1.333 # q2ex
+            - 0.1   # phi_min
+            - 1.0   # phi_curl_min
+        eos_global_vars:
+            - 1.666666666666667
+            - 1.0E-14
+            - 1.0
+
+    - material:
+        id: 1
+        eos_model_type: decoupled
+        eos_model: gamma_law_gas
+        # strength_model: none
+        dissipation_global_vars:
+            - 1.0   # q1
+            - 1.0   # q1ex
+            - 1.333 # q2
+            - 1.333 # q2ex
+            - 0.1   # phi_min
+            - 1.0   # phi_curl_min
+        eos_global_vars:
+            - 1.666666666666667
+            - 1.0E-14
+            - 1.0
+
+regions:
+    - fill_volume:
+        type: global
+        material_id: 0
+        den: 1.0
+        sie: 1.e-10
+        velocity: cartesian
+        u: 0.0
+        v: 0.0
+        w: 0.0
+
+
+
+    - fill_volume:
+        type: voxel_file
+        file_path: ../../VTK_Geometry_lattice.vtk 
+        #/Users/nmorgan/Documents/Fierro/REPO/2024_06_21/Fierro/single-node-refactor/VTK_Geometry_lattice.vtk
+        material_id: 1
+        den: 2.0
+        sie: 0.001
+        velocity: cartesian
+        u: 0.0
+        v: 0.0
+        w: 0.0
+        scale_x: 0.01
+        scale_y: 0.01
+        scale_z: 0.01
+        origin: [0.3, 0.3, 0.3]
+
+
diff --git a/single-node-refactor/input-noh-rz.yaml b/single-node-refactor/input-noh-rz.yaml
@@ -62,13 +62,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS_rz
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
             - 0     # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14

diff --git a/single-node-refactor/input-noh.yaml b/single-node-refactor/input-noh.yaml
@@ -69,13 +69,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
             - 0     # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_curl
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14

diff --git a/single-node-refactor/input-origin-erosion.yaml b/single-node-refactor/input-origin-erosion.yaml
@@ -29,7 +29,7 @@ output_options:
 
 solver_options:
   - solver:
-        method: SGH
+        method: SGH3D
         # solver_vars:
         #  - blah
         #  - blah
@@ -38,7 +38,7 @@ solver_options:
 boundary_conditions:
     # Tag X plane
     - boundary_condition:
-        solver: SGH
+        solver: SGH3D
         geometry: x_plane
         direction: x_dir
         value: 0.0
@@ -50,15 +50,15 @@ boundary_conditions:
 
     # Tag Y plane
     - boundary_condition:
-        solver: SGH
+        solver: SGH3D
         geometry: y_plane
         direction: y_dir
         value: 0.0
         type: reflected_velocity
 
     # Tag z plane
     - boundary_condition:
-        solver: SGH
+        solver: SGH3D
         geometry: z_plane
         direction: z_dir
         value: 0.0
@@ -76,7 +76,7 @@ materials:
             - 1.333 # q2
             - 1.333 # q2ex
             - 0.0   # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14

diff --git a/single-node-refactor/input-rz-polar.yaml b/single-node-refactor/input-rz-polar.yaml
@@ -78,13 +78,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS_rz
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
             - 0.0   # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14

diff --git a/single-node-refactor/input-rz.yaml b/single-node-refactor/input-rz.yaml
@@ -61,13 +61,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS_rz
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
             - 0.0   # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14
@@ -78,11 +79,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS_rz
         dissipation_global_vars:
             - 1.0   # q1
             - 1.333 # q1ex
             - 1.0   # q2
             - 1.333 # q2ex
+            - 0.0   # phi_min
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14

diff --git a/single-node-refactor/input-sgtm-test.yaml b/single-node-refactor/input-sgtm-test.yaml
@@ -69,13 +69,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
             - 0.0   # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_curl_min
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14

diff --git a/single-node-refactor/input.yaml b/single-node-refactor/input.yaml
@@ -68,18 +68,20 @@ materials:
         id: 0
         eos_model_type: decoupled
         eos_model: gamma_law_gas
+        eos_global_vars:
+            - 1.666666666666667
+            - 1.0E-14
+            - 1.0
         # strength_model: none
+        dissipation_model: MARS
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
-            - 0     # phi_min
-            - 0     # use edge normals
-        eos_global_vars:
-            - 1.666666666666667
-            - 1.0E-14
-            - 1.0
+            - 0.0   # phi_min
+            - 1.0   # pin_curl_min
+
 
 regions:
     - fill_volume:

diff --git a/single-node-refactor/regression_tests/standard_inputs/Abaqus_read.yaml b/single-node-refactor/regression_tests/standard_inputs/Abaqus_read.yaml
@@ -82,13 +82,14 @@ materials:
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
+        dissipation_model: MARS
         dissipation_global_vars:
             - 1.0   # q1
             - 1.0   # q1ex
             - 1.333 # q2
             - 1.333 # q2ex
             - 0.0   # phi_min
-            - 0     # use edge normals
+            - 1.0   # phi_min_curl
         eos_global_vars:
             - 1.666666666666667
             - 1.0E-14