From 4111a1383ad493932a1b1d60b21421687f3804cb Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Sun, 18 Feb 2024 10:59:04 -0500
Subject: [PATCH] Rearranged rcac build scripts

---
 buildscripts/build_rcac_gnu.sh   | 12 ++++--------
 buildscripts/build_rcac_intel.sh |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/buildscripts/build_rcac_gnu.sh b/buildscripts/build_rcac_gnu.sh
index 3c2238690..aefc6fc71 100755
--- a/buildscripts/build_rcac_gnu.sh
+++ b/buildscripts/build_rcac_gnu.sh
@@ -45,31 +45,27 @@ fi
 if [[ $MACHINE_NAME == "bell" ]]; then
     module purge
     module use /depot/daminton/etc/modules/bell
+    module load use.own
     module load gcc/10.2.0
+    module load conda-env/mintongroup-py3.8.5
     module load hdf5/1.10.6
     module load netcdf/4.7.4
     module load netcdf-fortran/4.5.3
     module load shtools/gcc10/4.11.10
     module load cmake/3.20.6 
     module load ninja/1.11.1
-    if [[ $BUILD_TYPE == "Release" ]]; then
-        module load use.own
-        module load conda-env/mintongroup-py3.8.5
-    fi    
 elif [[ $MACHINE_NAME == "negishi" ]]; then
     module purge
     module use /depot/daminton/etc/modules/negishi
+    module load use.own
     module load gcc/12.2.0
+    module load conda-env/mintongroup-py3.9.13
     module load hdf5/1.13.2
     module load netcdf-c/4.9.0
     module load netcdf-fortran/4.6.0
     module load shtools/gcc12/4.11.10    
     module load cmake/3.24.3 
     module load ninja/1.11.1
-    if [[ $BUILD_TYPE == "Release" ]]; then
-        module load use.own
-        module load conda-env/mintongroup-py3.9.13
-    fi
 fi
 
 cmake -P distclean.cmake
diff --git a/buildscripts/build_rcac_intel.sh b/buildscripts/build_rcac_intel.sh
index 968bdc60f..8e7ae495e 100755
--- a/buildscripts/build_rcac_intel.sh
+++ b/buildscripts/build_rcac_intel.sh
@@ -46,32 +46,32 @@ fi
 if [[ $MACHINE_NAME == "bell" ]]; then
     module purge
     module use /depot/daminton/etc/modules/bell
+    module load use.own
     module load intel/19.0.5.281
     module load intel-mkl/2019.5.281
     module load impi/2019.5.281
+    module load conda-env/mintongroup-py3.8.5
     module load shtools/intel19/4.11.10
     module load cmake/3.20.6 
     module load ninja/1.11.1
     module load hdf5/1.10.6
     module load netcdf/4.7.4
     module load netcdf-fortran/4.5.3
-    module load use.own
-    module load conda-env/mintongroup-py3.8.5
     MACHINE_CODE_VALUE="Host"
 elif [[ $MACHINE_NAME == "negishi" ]]; then
     module purge
     module use /depot/daminton/etc/modules/negishi
+    module load use.own
     module load intel/19.1.3.304
     module load intel-mkl/2019.9.304
     module load impi/2019.9.304
+    module load conda-env/mintongroup-py3.9.13
     module load shtools/intel19/4.11.10
     module load cmake/3.24.3 
     module load ninja/1.11.1
     module load hdf5/1.13.2
     module load netcdf-c/4.9.0
     module load netcdf-fortran/4.6.0
-    module load use.own
-    module load conda-env/mintongroup-py3.9.13
     MACHINE_CODE_VALUE="SSE2"
 fi