Merge pull request #5842 from knelli2/hpc_update

Update Caltech HPC Skylake env

docs/Installation/InstallationOnClusters.md

@@ -93,7 +93,7 @@ To ensure you get an entire node to build on, use the following commands.
 
 1. For Skylake Intel nodes
 ```
-srun -t 02:00:00 -N 1 -c 56 -D . --pty /bin/bash
+srun --partition=expansion -t 02:00:00 -N 1 -c 56 -D . --pty /bin/bash
 ```
 2. For Icelake Intel nodes
 ```
@@ -102,8 +102,13 @@ srun --partition=expansion --constraint=icelake -t 02:00:00 \
 ```
 
 If you are part of the SXS collaboration, you can add `-A sxs` to bill the SXS
-allocation. Be sure to re-source the correct environment files once you get the
-interactive node shell.
+allocation. Also, if you are part of the collaboration, you can use our
+reserved nodes by specifying `--reservation=sxs`. However, our reserved nodes
+are Skylake nodes only, so adding the reservation flag won't work for the
+Icelake nodes.
+
+Be sure to re-source the correct environment files once you get the interactive
+node shell.
 
 ## Ocean at Fullerton
 

support/Environments/caltech_hpc_gcc_icelake.sh

@@ -5,28 +5,28 @@
 
 spectre_setup_modules() {
     module use /central/groups/sxs/modules
-    echo "Place the following line in you '~/.bashrc' so you don't have to "
+    echo "Place the following line in your '~/.bashrc' so you don't have to "
     echo "run 'spectre_setup_modules' every time you log in:"
     echo ""
     echo "module use /central/groups/sxs/modules"
 }
 
 spectre_load_modules() {
     module use /central/groups/sxs/modules
-    module load libraries/spectre-deps/icelake-2024-02 > /dev/null 2>&1
+    module load libraries/spectre-deps/icelake-2024-02
 }
 
 spectre_unload_modules() {
     module use /central/groups/sxs/modules
-    module unload libraries/spectre-deps/icelake-2024-02 > /dev/null 2>&1
+    module unload libraries/spectre-deps/icelake-2024-02
 }
 
 spectre_run_cmake() {
     if [ -z ${SPECTRE_HOME} ]; then
         echo "You must set SPECTRE_HOME to the cloned SpECTRE directory"
         return 1
     fi
-    spectre_load_modules > /dev/null 2>&1
+    spectre_load_modules
 
     # Note that choosing the memory allocator to be JEMALLOC is important. When
     # using the SYSTEM allocator, during BBH runs dumping volume data too often

support/Environments/caltech_hpc_gcc_skylake.sh

@@ -5,20 +5,20 @@
 
 spectre_setup_modules() {
     module use /central/groups/sxs/modules/
-    echo "Place the following line in you '~/.bashrc' so you don't have to "
+    echo "Place the following line in your '~/.bashrc' so you don't have to "
     echo "run 'spectre_setup_modules' every time you log in:"
     echo ""
     echo "module use /central/groups/sxs/modules/"
 }
 
 spectre_load_modules() {
     module use /central/groups/sxs/modules/
-    module load libraries/spectre-deps/skylake-2024-02
+    module load libraries/spectre-deps/skylake-2024-03
 }
 
 spectre_unload_modules() {
     module use /central/groups/sxs/modules/
-    module unload libraries/spectre-deps/skylake-2024-02
+    module unload libraries/spectre-deps/skylake-2024-03
 }
 
 spectre_run_cmake() {