COMP: Merge commit

lanl · Feb 23, 2024 · e0c64d1 · e0c64d1
2 parents c650b8a + 2510cdf
commit e0c64d1
Show file tree

Hide file tree

Showing 96 changed files with 5,335 additions and 4,056 deletions.
diff --git a/scripts/build-fierro.sh b/scripts/build-fierro.sh
@@ -2,7 +2,7 @@
 show_help() {
     echo "Usage: source $(basename "$BASH_SOURCE") [OPTION]"
     echo "Valid options:"
-    echo "  --solver=<all|explicit|explicit-evpfft|explicit-ls-evpfft|explicit-evp|implicit>. Default is 'explicit'"
+    echo "  --solver=<all|explicit|explicit-evpfft|explicit-ls-evpfft|implicit>. Default is 'explicit'"
     echo "  --kokkos_build_type=<serial|openmp|pthreads|cuda|hip>. Default is 'serial'"
     echo "  --build_action=<full-app|set-env|install-trilinos|install-hdf5|install-heffte|fierro>. Default is 'full-app'"
     echo "  --machine=<darwin|chicoma|linux|mac>. Default is 'linux'"
@@ -65,7 +65,7 @@ build_cores="1"
 
 # Define arrays of valid options
 valid_build_action=("full-app" "set-env" "install-trilinos" "install-hdf5" "install-heffte" "fierro")
-valid_solver=("all" "explicit" "explicit-evpfft" "explicit-ls-evpfft" "explicit-evp" "implicit")
+valid_solver=("all" "explicit" "explicit-evpfft" "explicit-ls-evpfft" "implicit")
 valid_kokkos_build_types=("serial" "openmp" "pthreads" "cuda" "hip")
 valid_heffte_build_types=("fftw" "cufft" "rocfft")
 valid_machines=("darwin" "chicoma" "linux" "mac" "msu")

diff --git a/scripts/cmake_build.sh b/scripts/cmake_build.sh
@@ -88,12 +88,6 @@ elif [ "$solver" = "explicit-evpfft" ] || [ "$solver" = "explicit-ls-evpfft" ];
             -D USE_FFTW=ON
         )
     fi
-elif [ "$solver" = "explicit-evp" ]; then
-    cmake_options+=(
-        -D BUILD_PARALLEL_EXPLICIT_SOLVER=ON
-        -D BUILD_IMPLICIT_SOLVER=OFF
-        -D BUILD_EVP_FIERRO=ON
-    )
 else
     cmake_options+=(
         -D BUILD_PARALLEL_EXPLICIT_SOLVER=ON

diff --git a/src/EVP/src/CMakeLists.txt b/src/EVP/src/CMakeLists.txt
diff --git a/src/EVP/src/UserEOSModel.cpp b/src/EVP/src/UserEOSModel.cpp
diff --git a/src/EVP/src/UserEOSModel.h b/src/EVP/src/UserEOSModel.h
diff --git a/src/EVP/src/UserStrengthModel.h b/src/EVP/src/UserStrengthModel.h