lanl · Adrian-Diaz · Apr 4, 2025 · Apr 7, 2025 · Apr 8, 2025 · Apr 9, 2025
diff --git a/single-node-refactor/CMakeLists.txt b/single-node-refactor/CMakeLists.txt
@@ -29,8 +29,8 @@ endif()
 
 
 if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo)
- # set(CMAKE_BUILD_TYPE Release)
+ # set(CMAKE_BUILD_TYPE RelWithDebInfo)
+  set(CMAKE_BUILD_TYPE Release)
 endif(NOT CMAKE_BUILD_TYPE)
 
 include_directories(../lib/Elements/matar)
@@ -40,20 +40,22 @@ add_subdirectory(../lib/Elements/matar cbin)
 # include_directories(Mesh-Builder)
 # add_subdirectory(Mesh-Builder)
 
+find_package(MPI REQUIRED)
+add_definitions(-DHAVE_MPI=1)
+set(LINKING_LIBRARIES MPI::MPI_CXX)
+if (GPU_AWARE_MPI)
+    add_definitions(-DHAVE_GPU_AWARE_MPI)
+#   elseif (GPU_SHARED_MEM)
+#       add_definitions(-DHAVE_GPU_SHARED_MEM)
+endif()
 if (FIERRO_ENABLE_TRILINOS)
+
   find_package(Trilinos REQUIRED) #new
   # Assume if the CXX compiler exists, the rest do too.
-  if (EXISTS ${Trilinos_CXX_COMPILER})
     set(CMAKE_CXX_COMPILER ${Trilinos_CXX_COMPILER})
     set(CMAKE_C_COMPILER ${Trilinos_C_COMPILER})
     set(CMAKE_Fortran_COMPILER ${Trilinos_Fortran_COMPILER})
-  endif()
-  if(NOT DISTRIBUTION)
-    # Make sure to use same compilers and flags as Trilinos
-    set(CMAKE_CXX_FLAGS  "${Trilinos_CXX_COMPILER_FLAGS} ${CMAKE_CXX_FLAGS}")
-    set(CMAKE_C_FLAGS  "${Trilinos_C_COMPILER_FLAGS} ${CMAKE_C_FLAGS}")
-    set(CMAKE_Fortran_FLAGS  "${Trilinos_Fortran_COMPILER_FLAGS} ${CMAKE_Fortran_FLAGS}")
-  endif()
+
 
   message("\nFound Trilinos!  Here are the details: ")
   message("   Trilinos_DIR = ${Trilinos_DIR}")
@@ -71,12 +73,14 @@ if (FIERRO_ENABLE_TRILINOS)
 
   include_directories(${Trilinos_INCLUDE_DIRS} ${Trilinos_TPL_INCLUDE_DIRS})
   list(APPEND LINKING_LIBRARIES Trilinos::all_selected_libs)
-  add_definitions(-DTRILINOS_INTERFACE=1 -DHAVE_MPI=1)
+  add_definitions(-DTRILINOS_INTERFACE=1 -DHAVE_KOKKOS=1)
 else()
   find_package(Kokkos REQUIRED)
   list(APPEND LINKING_LIBRARIES Kokkos::kokkos)
+  add_definitions(-DHAVE_KOKKOS=1)
 endif()
-find_package(Matar REQUIRED)
+#find_package(Matar REQUIRED)
+include_directories(${MATAR_SOURCE_DIR}/src/include)
 
 include_directories(src/material_models/artificial_viscosity)
 include_directories(src/material_models/eos)
@@ -96,13 +100,8 @@ include_directories(src/common)
 include_directories(src/input)
 add_subdirectory(src/input)
 
-
-
 add_subdirectory(src)
 
-
-
-
 # Add uninstall target
 if(NOT TARGET uninstall)
   configure_file(

diff --git a/single-node-refactor/regression_tests/standard_inputs/confined_preload.yaml b/single-node-refactor/regression_tests/standard_inputs/confined_preload.yaml
@@ -10,7 +10,7 @@ dynamic_options:
 
 mesh_options:
   source: file
-  file_path: ./standard_inputs/meshes/preload.geo
+  file_path: ./standard_inputs/meshes/preload.vtk
   num_dims: 3
 
 #mesh_options:

diff --git a/single-node-refactor/regression_tests/standard_inputs/edge_flat_contact.yaml b/single-node-refactor/regression_tests/standard_inputs/edge_flat_contact.yaml
@@ -10,7 +10,7 @@ dynamic_options:
 
 mesh_options:
   source: file
-  file_path: ./standard_inputs/meshes/edge_flat_contact.geo
+  file_path: ./standard_inputs/meshes/edge_flat_contact.vtk
   num_dims: 3
 
 #mesh_options:

diff --git a/single-node-refactor/regression_tests/standard_inputs/meshes/edge_flat_contact.vtk b/single-node-refactor/regression_tests/standard_inputs/meshes/edge_flat_contact.vtk
@@ -0,0 +1,42 @@
+# vtk DataFile Version 3.0
+Hexahedral element example
+ASCII
+DATASET UNSTRUCTURED_GRID
+
+POINTS 24 float
+-0.500000 -2.000000 1.000000
+-0.500000 0.000000 1.000000
+-0.500000 2.000000 1.000000
+-0.500000 -2.000000 0.000000
+-0.500000 0.000000 0.000000
+-0.500000 2.000000 0.000000
+0.500000 -2.000000 1.000000
+0.500000 0.000000 1.000000
+0.500000 2.000000 1.000000
+0.500000 -2.000000 0.000000
+0.500000 0.000000 0.000000
+0.500000 2.000000 0.000000
+-0.500000 -1.000000 2.500000
+-0.500000 0.000000 2.500000
+-0.500000 1.000000 2.500000
+-0.500000 1.000000 3.500000
+-0.500000 0.000000 3.500000
+-0.500000 -1.000000 3.500000
+0.500000 -1.000000 2.500000
+0.500000 0.000000 2.500000
+0.500000 1.000000 2.500000
+0.500000 1.000000 3.500000
+0.500000 0.000000 3.500000
+0.500000 -1.000000 3.500000
+
+CELLS 4 32
+8 6 7 10 9 0 1 4 3
+8 7 8 11 10 1 2 5 4
+8 12 13 16 17 18 19 22 23
+8 13 14 15 16 19 20 21 22
+
+CELL_TYPES 4
+12
+12
+12
+12
diff --git a/single-node-refactor/regression_tests/standard_inputs/meshes/preload.vtk b/single-node-refactor/regression_tests/standard_inputs/meshes/preload.vtk
@@ -0,0 +1,46 @@
+# vtk DataFile Version 3.0
+Hexahedral element example
+ASCII
+DATASET UNSTRUCTURED_GRID
+
+POINTS 26 float
+1.000000 -1.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 1.000000 0.000000
+1.000000 1.000000 1.000000
+1.000000 0.000000 1.000000
+1.000000 -1.000000 1.000000
+0.000000 -1.000000 0.000000
+0.000000 0.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 -1.000000 1.000000
+-1.000000 -1.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 1.000000 0.000000
+-1.000000 1.000000 1.000000
+-1.000000 0.000000 1.000000
+-1.000000 -1.000000 1.000000
+-0.250000 -0.250000 0.500000
+-0.250000 0.250000 0.500000
+-0.250000 0.250000 1.500000
+-0.250000 -0.250000 1.500000
+0.250000 -0.250000 0.500000
+0.250000 0.250000 0.500000
+0.250000 0.250000 1.500000
+0.250000 -0.250000 1.500000
+
+CELLS 5 40
+8 6 7 10 11 0 1 4 5
+8 7 8 9 10 1 2 3 4
+8 12 13 16 17 6 7 10 11
+8 13 14 15 16 7 8 9 10
+8 18 19 20 21 22 23 24 25
+
+CELL_TYPES 5
+12
+12
+12
+12
+12
diff --git a/single-node-refactor/regression_tests/standard_inputs/meshes/sie_expansion_contact.vtk b/single-node-refactor/regression_tests/standard_inputs/meshes/sie_expansion_contact.vtk
@@ -0,0 +1,46 @@
+# vtk DataFile Version 3.0
+Hexahedral element example
+ASCII
+DATASET UNSTRUCTURED_GRID
+
+POINTS 26 float
+1.000000 -1.000000 0.000000
+1.000000 0.000000 0.000000
+1.000000 1.000000 0.000000
+1.000000 1.000000 1.000000
+1.000000 0.000000 1.000000
+1.000000 -1.000000 1.000000
+0.000000 -1.000000 0.000000
+0.000000 0.000000 0.000000
+0.000000 1.000000 0.000000
+0.000000 1.000000 1.000000
+0.000000 0.000000 1.000000
+0.000000 -1.000000 1.000000
+-1.000000 -1.000000 0.000000
+-1.000000 0.000000 0.000000
+-1.000000 1.000000 0.000000
+-1.000000 1.000000 1.000000
+-1.000000 0.000000 1.000000
+-1.000000 -1.000000 1.000000
+-0.250000 -0.250000 1.000010
+-0.250000 0.250000 1.000010
+-0.250000 0.250000 1.500000
+-0.250000 -0.250000 1.500000
+0.250000 -0.250000 1.000010
+0.250000 0.250000 1.000010
+0.250000 0.250000 1.500000
+0.250000 -0.250000 1.500000
+
+CELLS 5 40
+8 6 7 10 11 0 1 4 5
+8 7 8 9 10 1 2 3 4
+8 12 13 16 17 6 7 10 11
+8 13 14 15 16 7 8 9 10
+8 18 19 20 21 22 23 24 25
+
+CELL_TYPES 5
+12
+12
+12
+12
+12
diff --git a/single-node-refactor/regression_tests/standard_inputs/meshes/slanted_bounce_contact.vtk b/single-node-refactor/regression_tests/standard_inputs/meshes/slanted_bounce_contact.vtk
@@ -0,0 +1,36 @@
+# vtk DataFile Version 3.0
+Hexahedral element example
+ASCII
+DATASET UNSTRUCTURED_GRID
+
+POINTS 20 float
+-0.500000 -2.000000 1.000000
+-0.500000 0.000000 2.000000
+-0.500000 2.000000 1.000000
+-0.500000 -2.000000 0.000000
+-0.500000 0.000000 1.000000
+-0.500000 2.000000 0.000000
+0.500000 -2.000000 1.000000
+0.500000 0.000000 2.000000
+0.500000 2.000000 1.000000
+0.500000 -2.000000 0.000000
+0.500000 0.000000 1.000000
+0.500000 2.000000 0.000000
+0.000000 1.000000 1.600000
+0.000000 2.000000 1.600000
+0.000000 2.000000 2.850000
+0.000000 1.000000 2.850000
+0.450000 1.000000 1.600000
+0.450000 2.000000 1.600000
+0.450000 2.000000 2.850000
+0.450000 1.000000 2.850000
+
+CELLS 3 24
+8 6 7 10 9 0 1 4 3
+8 7 8 11 10 1 2 5 4
+8 12 13 14 15 16 17 18 19
+
+CELL_TYPES 3
+12
+12
+12
diff --git a/single-node-refactor/regression_tests/standard_inputs/meshes/slanted_impact_contact.vtk b/single-node-refactor/regression_tests/standard_inputs/meshes/slanted_impact_contact.vtk
@@ -0,0 +1,36 @@
+# vtk DataFile Version 3.0
+Hexahedral element example
+ASCII
+DATASET UNSTRUCTURED_GRID
+
+POINTS 20 float
+-0.500000 -2.000000 1.000000
+-0.500000 0.000000 2.000000
+-0.500000 2.000000 1.000000
+-0.500000 -2.000000 0.000000
+-0.500000 0.000000 0.000000
+-0.500000 2.000000 0.000000
+0.500000 -2.000000 1.000000
+0.500000 0.000000 2.000000
+0.500000 2.000000 1.000000
+0.500000 -2.000000 0.000000
+0.500000 0.000000 0.000000
+0.500000 2.000000 0.000000
+-0.250000 0.000000 2.500000
+-0.250000 1.000000 2.500000
+-0.250000 1.000000 3.500000
+-0.250000 0.000000 3.500000
+0.250000 0.000000 2.500000
+0.250000 1.000000 2.500000
+0.250000 1.000000 3.500000
+0.250000 0.000000 3.500000
+
+CELLS 3 24
+8 6 7 10 9 0 1 4 3
+8 7 8 11 10 1 2 5 4
+8 12 13 14 15 16 17 18 19
+
+CELL_TYPES 3
+12
+12
+12
diff --git a/single-node-refactor/regression_tests/standard_inputs/sie_expansion_contact.yaml b/single-node-refactor/regression_tests/standard_inputs/sie_expansion_contact.yaml
@@ -10,7 +10,7 @@ dynamic_options:
 
 mesh_options:
   source: file
-  file_path: ./standard_inputs/meshes/sie_expansion_contact.geo
+  file_path: ./standard_inputs/meshes/sie_expansion_contact.vtk
   num_dims: 3
 
 #mesh_options:

diff --git a/single-node-refactor/regression_tests/standard_inputs/slanted_bounce_contact.yaml b/single-node-refactor/regression_tests/standard_inputs/slanted_bounce_contact.yaml
@@ -10,7 +10,7 @@ dynamic_options:
 
 mesh_options:
   source: file
-  file_path: ./standard_inputs/meshes/slanted_bounce_contact.geo
+  file_path: ./standard_inputs/meshes/slanted_bounce_contact.vtk
   num_dims: 3
 
 #mesh_options:

diff --git a/single-node-refactor/regression_tests/standard_inputs/slanted_impact_contact.yaml b/single-node-refactor/regression_tests/standard_inputs/slanted_impact_contact.yaml
@@ -10,7 +10,7 @@ dynamic_options:
 
 mesh_options:
   source: file
-  file_path: ./standard_inputs/meshes/slanted_impact_contact.geo
+  file_path: ./standard_inputs/meshes/slanted_impact_contact.vtk
   num_dims: 3
 
 #mesh_options:

diff --git a/single-node-refactor/regression_tests/standard_inputs/unconfined_preload.yaml b/single-node-refactor/regression_tests/standard_inputs/unconfined_preload.yaml
@@ -10,7 +10,7 @@ dynamic_options:
 
 mesh_options:
   source: file
-  file_path: ./standard_inputs/meshes/preload.geo
+  file_path: ./standard_inputs/meshes/preload.vtk
   num_dims: 3
 
 #mesh_options:

diff --git a/single-node-refactor/regression_tests/test_refactor.py b/single-node-refactor/regression_tests/test_refactor.py
@@ -13,9 +13,17 @@
 solvers = ["Fierro"]
 
 # Add names of each test
+# tests = ["TaylorAnvil", "TaylorAnvil_rz", "Compaction", "Compaction_rz", \
+#          "Sedov", "Sod_X", "Sod_Y", "Sod_Z", "Sedov_Erosion", \
+#         "Sedov_Read_Ensight", "Sedov_rz_polar", "Abaqus_read", \
+#         "Pressure_bc_box","vtu_read","SGTM_cooling_cube", \
+#         "lin_vol_frac_two_mat", "Bending-3D-plate", "Vel_bc_box", \
+#         "slanted_bounce_contact", "slanted_impact_contact", \
+#         "sie_expansion_contact", "confined_preload", "unconfined_preload", \
+#         "edge_flat_contact"]
 tests = ["TaylorAnvil", "TaylorAnvil_rz", "Compaction", "Compaction_rz", \
          "Sedov", "Sod_X", "Sod_Y", "Sod_Z", "Sedov_Erosion", \
-        "Sedov_Read_Ensight", "Sedov_rz_polar", "Abaqus_read", \
+         "Sedov_rz_polar", \
         "Pressure_bc_box","vtu_read","SGTM_cooling_cube", \
         "lin_vol_frac_two_mat", "Bending-3D-plate", "Vel_bc_box", \
         "slanted_bounce_contact", "slanted_impact_contact", \

diff --git a/single-node-refactor/scripts/build-fierro.sh b/single-node-refactor/scripts/build-fierro.sh
@@ -211,7 +211,6 @@ if [ "$build_action" = "full-app" ]; then
     elif [ "$trilinos" = "enabled" ]; then    
         source trilinos-install.sh ${kokkos_build_type}  ${intel_mkl} ${debug}
     fi
-    source matar-install.sh ${kokkos_build_type} ${debug} ${trilinos}
     source cmake_build.sh ${solver} ${debug} ${trilinos}
 elif [ "$build_action" = "install-kokkos" ]; then
     source kokkos-install.sh ${kokkos_build_type}

diff --git a/single-node-refactor/scripts/cmake_build.sh b/single-node-refactor/scripts/cmake_build.sh
@@ -16,7 +16,6 @@ if [ "$trilinos" = "enabled" ]; then
         Trilinos_DIR=${TRILINOS_INSTALL_DIR}/lib/cmake/Trilinos
     fi
     cmake_options+=(
-        -D CMAKE_PREFIX_PATH="${MATAR_INSTALL_DIR}"
         -D Trilinos_DIR="$Trilinos_DIR"
         -D FIERRO_ENABLE_TRILINOS=ON
     )
@@ -49,6 +48,6 @@ echo "CMake Options: ${cmake_options[@]}"
 cmake "${cmake_options[@]}" -B "${SGH_BUILD_DIR}" -S "${SGH_BASE_DIR}"
 
 # Build SGH
-make -C "${SGH_BUILD_DIR}" -j${SGH_BUILD_CORES}
+make -C "${SGH_BUILD_DIR}" -j${FIERRO_BUILD_CORES}
 
 cd $basedir