From 9647c1aec304fb4b944a337853ca627a877e57ae Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Wed, 14 Feb 2024 23:57:11 -0500
Subject: [PATCH] Updated build scripts for negishi

---
 buildscripts/build_negishi_gnu.sh   | 2 +-
 buildscripts/build_negishi_intel.sh | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/buildscripts/build_negishi_gnu.sh b/buildscripts/build_negishi_gnu.sh
index ff5b285d4..3eebe7dff 100755
--- a/buildscripts/build_negishi_gnu.sh
+++ b/buildscripts/build_negishi_gnu.sh
@@ -16,7 +16,7 @@ module load gcc/12.2.0
 module load hdf5/1.13.2
 module load netcdf-c/4.9.0
 module load netcdf-fortran/4.6.0
-module load shtools/gcc12.2.0/4.11.10
+module load shtools/gcc12/4.11.10
 cmake -P distclean.cmake
 if [[ BUILD_TYPE == "Release" ]]; then
     pip install --config-settings=build-dir="build" \
diff --git a/buildscripts/build_negishi_intel.sh b/buildscripts/build_negishi_intel.sh
index 5b1325e70..5a6f5bd40 100755
--- a/buildscripts/build_negishi_intel.sh
+++ b/buildscripts/build_negishi_intel.sh
@@ -15,7 +15,12 @@ module load intel-oneapi-mpi/2021.8.0
 source ${INTEL_ONEAPI_COMPILERS_HOME}/setvars.sh > /dev/null 2>&1
 module use /depot/daminton/etc/modules
 module load use.own
-module load conda-env/mintongroup-py3.9.13
+if [[ BUILD_TYPE == "Release" ]]; then
+    module load conda-env/mintongroup-py3.9.13
+else
+    module load cmake/3.24.3 
+    module load ninja/1.11.1-negishi
+fi
 module load netcdf-fortran/intel-oneapi/4.6.1
 module load shtools/intel-oneapi/4.11.10
 cmake -P distclean.cmake
@@ -31,7 +36,6 @@ if [[ BUILD_TYPE == "Release" ]]; then
             --no-build-isolation \
             -ve . 
 else
-    pip uninstall swiftest -y
     cmake -P distclean.cmake
     cmake -B ${ROOT_DIR}/build -S . -G Ninja \
     -DMACHINE_CODE_VALUE="SSE2" \