Merge pull request #213 from lanl/MaterialCentric2

Material centric2
lanl · Aug 7, 2024 · cf29007 · cf29007
2 parents 1dc8ac3 + 0ff5b0c
commit cf29007
Show file tree

Hide file tree

Showing 34 changed files with 3,431 additions and 1,867 deletions.
diff --git a/single-node-refactor/CMakeLists.txt b/single-node-refactor/CMakeLists.txt
@@ -54,9 +54,6 @@ include_directories(src/input)
 add_subdirectory(src/input)
 
 
-include_directories(src/Solvers/SGH_solver)
-add_subdirectory(src/Solvers/SGH_solver)
-
 
 add_subdirectory(src)
 

diff --git a/single-node-refactor/input-impact-erosion.yaml b/single-node-refactor/input-impact-erosion.yaml
@@ -85,20 +85,13 @@ materials:
             - 1.0E-4
             - 1.0
         erosion_model: basic
-        void_mat_id: 2   
         erode_tension_val: 2.0e-7
         erode_density_val: 0.01
-
-    # eroded material
-    - material:
-        id: 2
-        eos_model_type: decoupled
-        eos_model: void
 
 
     # background air
     - material:
-        id: 3
+        id: 2
         eos_model_type: decoupled
         eos_model: gamma_law_gas
         # strength_model: none
@@ -115,7 +108,7 @@ regions:
     # air
     - fill_volume:
         type: global
-        material_id: 3
+        material_id: 2
         den: 0.010
         sie: 3.0e-4
         velocity: cartesian

diff --git a/single-node-refactor/input-origin-erosion.yaml b/single-node-refactor/input-origin-erosion.yaml
@@ -5,7 +5,7 @@ dynamic_options:
     dt_min: 1.e-8
     dt_max: 1.e-2
     dt_start: 1.e-5
-    cycle_stop: 300000
+    cycle_stop: 30000
 
 
 # mesh_options:
@@ -79,14 +79,23 @@ materials:
             - 1.0E-14
             - 1.0
         erosion_model: basic
-        void_mat_id: 1   
         erode_tension_val: 0.00003
         erode_density_val: 0.02
 
+
     - material:
         id: 1
         eos_model_type: decoupled
-        eos_model: void
+        eos_model: gamma_law_gas
+        # strength_model: none
+        q1: 1.0
+        q2: 1.333
+        q1ex: 1.0
+        q2ex: 1.333
+        eos_global_vars:
+            - 1.666666666666667
+            - 1.0E-14
+            - 1.0
 
 regions:
     - fill_volume:

diff --git a/single-node-refactor/input.yaml b/single-node-refactor/input.yaml
@@ -42,9 +42,6 @@ boundary_conditions:
         geometry: x_plane
         direction: x_dir
         value: 0.0
-        u: 0.0
-        v: 0.0
-        w: 1.0
         type: reflected_velocity
 
 
@@ -63,6 +60,8 @@ boundary_conditions:
         direction: z_dir
         value: 0.0
         type: reflected_velocity
+
+
 
 materials:
     - material:

diff --git a/single-node-refactor/src/CMakeLists.txt b/single-node-refactor/src/CMakeLists.txt
@@ -75,5 +75,9 @@ endif()
 
 include_directories(common)
 
-add_executable(Fierro main.cpp solver.cpp )
-target_link_libraries(Fierro PRIVATE matar parse_yaml sgh_solver Kokkos::kokkos)
+# Add SGH Solver
+include_directories(Solvers/SGH_solver/include)
+add_subdirectory(Solvers/SGH_solver)
+
+add_executable(Fierro main.cpp solver.cpp ${YAML_SRC_Files} ${SGH_SRC_Files} )
+target_link_libraries(Fierro PRIVATE matar Kokkos::kokkos) #sgh_solver  parse_yaml 
diff --git a/single-node-refactor/src/Solvers/SGH_solver/CMakeLists.txt b/single-node-refactor/src/Solvers/SGH_solver/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.1.3)
 
-
 find_package(Matar REQUIRED)
 find_package(Kokkos REQUIRED)
 
@@ -19,29 +18,18 @@ endif()
 include_directories(include)
 include_directories(src)
 
-
-set(SRC_Files 
-src/boundary.cpp 
-src/energy_sgh.cpp
-src/force_sgh.cpp
-src/position.cpp
-src/momentum.cpp
-src/properties.cpp
-src/sgh_solve.cpp
-src/time_integration.cpp)
-
-# set(SGH_Solver_SRC src/sgh_solver.cpp )
-
-message("\n ****** ADDING SGH LIBRARY ******** \n ")
-
-add_library(sgh_solver ${SRC_Files} ) # ${SGH_Solver_SRC} 
-target_include_directories(sgh_solver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-
-target_link_libraries(sgh_solver matar Kokkos::kokkos)
-
-
-
-
-
-
+message("\n ****** ADDING SGH SOURCE FILES ******** \n ")
+
+set(SGH_SRC_Files 
+${CMAKE_CURRENT_SOURCE_DIR}/src/boundary.cpp 
+${CMAKE_CURRENT_SOURCE_DIR}/src/energy_sgh.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/src/force_sgh.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/src/position.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/src/momentum.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/src/properties.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/src/sgh_solve.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/src/time_integration.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/src/sgh_setup.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/include/sgh_solver.h
+PARENT_SCOPE
+)