diff --git a/AUTOTEST/machine-tioga.sh b/AUTOTEST/machine-tioga.sh
new file mode 100755
index 000000000..687a695b7
--- /dev/null
+++ b/AUTOTEST/machine-tioga.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Copyright (c) 1998 Lawrence Livermore National Security, LLC and other
+# HYPRE Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+testname=`basename $0 .sh`
+
+# Echo usage information
+case $1 in
+   -h|-help)
+      cat <<EOF
+
+   **** Only run this script on the redwood cluster ****
+
+   $0 [-h|-help] {src_dir}
+
+   where: -h|-help   prints this usage information and exits
+          {src_dir}  is the hypre source directory
+
+   This script runs a number of tests suitable for the tioga cluster.
+
+   Example usage: $0 ../src
+
+EOF
+      exit
+      ;;
+esac
+
+# Setup
+test_dir=`pwd`
+output_dir=`pwd`/$testname.dir
+rm -fr $output_dir
+mkdir -p $output_dir
+src_dir=`cd $1; pwd`
+shift
+
+# Basic build and run tests
+mo="-j test"
+eo=""
+
+rtol="0.0"
+atol="3e-15"
+
+#save=`echo $(hostname) | sed 's/[0-9]\+$//'`
+save="tioga"
+
+##########
+## HIP  ##
+##########
+
+# HIP without UM [benchmark, struct]
+co="--with-hip --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+ro="-bench -struct -rt -mpibind -save ${save}"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
+./renametest.sh basic $output_dir/basic-hip-nonum
+
+#HIP with UM and single precision [no run]
+co="--with-hip --enable-unified-memory --enable-single --enable-debug --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+./test.sh basic.sh $src_dir -co: $co -mo: $mo
+./renametest.sh basic $output_dir/basic-hip-um-single
+
+# Echo to stderr all nonempty error files in $output_dir
+for errfile in $( find $output_dir ! -size 0 -name "*.err" )
+do
+   echo $errfile >&2
+done
+
diff --git a/src/test/TEST_bench/benchmark_ij.perf.saved.tioga b/src/test/TEST_bench/benchmark_ij.perf.saved.tioga
new file mode 100644
index 000000000..cccf4c6a9
--- /dev/null
+++ b/src/test/TEST_bench/benchmark_ij.perf.saved.tioga
@@ -0,0 +1,81 @@
+# Output file: benchmark_ij.out.1
+PCG Setup wall clock time = 0.512658 seconds
+PCG Solve wall clock time = 0.552540 seconds
+# Output file: benchmark_ij.out.2
+PCG Setup wall clock time = 0.333322 seconds
+PCG Solve wall clock time = 0.450435 seconds
+# Output file: benchmark_ij.out.3
+PCG Setup wall clock time = 0.471184 seconds
+PCG Solve wall clock time = 1.044233 seconds
+# Output file: benchmark_ij.out.4
+PCG Setup wall clock time = 0.504893 seconds
+PCG Solve wall clock time = 0.255745 seconds
+# Output file: benchmark_ij.out.5
+PCG Setup wall clock time = 0.480607 seconds
+PCG Solve wall clock time = 0.179937 seconds
+# Output file: benchmark_ij.out.6
+PCG Setup wall clock time = 0.459764 seconds
+PCG Solve wall clock time = 0.937065 seconds
+# Output file: benchmark_ij.out.7
+PCG Setup wall clock time = 0.589380 seconds
+PCG Solve wall clock time = 0.227287 seconds
+# Output file: benchmark_ij.out.8
+PCG Setup wall clock time = 0.371488 seconds
+PCG Solve wall clock time = 0.539031 seconds
+# Output file: benchmark_ij.out.9
+PCG Setup wall clock time = 0.314890 seconds
+PCG Solve wall clock time = 0.434536 seconds
+# Output file: benchmark_ij.out.10
+PCG Setup wall clock time = 0.469411 seconds
+PCG Solve wall clock time = 1.003551 seconds
+# Output file: benchmark_ij.out.11
+PCG Setup wall clock time = 0.500090 seconds
+PCG Solve wall clock time = 0.241589 seconds
+# Output file: benchmark_ij.out.12
+PCG Setup wall clock time = 0.462413 seconds
+PCG Solve wall clock time = 0.184819 seconds
+# Output file: benchmark_ij.out.13
+PCG Setup wall clock time = 0.439033 seconds
+PCG Solve wall clock time = 0.940684 seconds
+# Output file: benchmark_ij.out.14
+PCG Setup wall clock time = 1.236288 seconds
+PCG Solve wall clock time = 0.873573 seconds
+# Output file: benchmark_ij.out.15
+PCG Setup wall clock time = 1.140977 seconds
+PCG Solve wall clock time = 0.990117 seconds
+# Output file: benchmark_ij.out.16
+PCG Setup wall clock time = 1.167420 seconds
+PCG Solve wall clock time = 0.876063 seconds
+# Output file: benchmark_ij.out.17
+PCG Setup wall clock time = 0.467263 seconds
+PCG Solve wall clock time = 0.192955 seconds
+# Output file: benchmark_ij.out.18
+PCG Setup wall clock time = 0.584768 seconds
+PCG Solve wall clock time = 0.181109 seconds
+# Output file: benchmark_ij.out.19
+PCG Setup wall clock time = 0.529740 seconds
+PCG Solve wall clock time = 0.473137 seconds
+# Output file: benchmark_ij.out.20
+PCG Setup wall clock time = 0.342027 seconds
+PCG Solve wall clock time = 0.270525 seconds
+# Output file: benchmark_ij.out.21
+PCG Setup wall clock time = 0.503688 seconds
+PCG Solve wall clock time = 0.272246 seconds
+# Output file: benchmark_ij.out.22
+PCG Setup wall clock time = 0.578109 seconds
+PCG Solve wall clock time = 0.189868 seconds
+# Output file: benchmark_ij.out.23
+PCG Setup wall clock time = 0.582089 seconds
+PCG Solve wall clock time = 0.211962 seconds
+# Output file: benchmark_ij.out.24
+PCG Setup wall clock time = 0.545068 seconds
+PCG Solve wall clock time = 0.232222 seconds
+# Output file: benchmark_ij.out.25
+PCG Setup wall clock time = 0.529062 seconds
+PCG Solve wall clock time = 0.254237 seconds
+# Output file: benchmark_ij.out.26
+PCG Setup wall clock time = 0.487924 seconds
+PCG Solve wall clock time = 0.566693 seconds
+# Output file: benchmark_ij.out.27
+PCG Setup wall clock time = 0.548090 seconds
+PCG Solve wall clock time = 0.406431 seconds
diff --git a/src/test/TEST_bench/benchmark_ij.saved.tioga b/src/test/TEST_bench/benchmark_ij.saved.tioga
new file mode 100644
index 000000000..dcfcd53fd
--- /dev/null
+++ b/src/test/TEST_bench/benchmark_ij.saved.tioga
@@ -0,0 +1,108 @@
+# Output file: benchmark_ij.out.1
+Iterations = 57
+Final Relative Residual Norm = 9.852266e-09
+
+# Output file: benchmark_ij.out.2
+Iterations = 47
+Final Relative Residual Norm = 8.930988e-09
+
+# Output file: benchmark_ij.out.3
+Iterations = 95
+Final Relative Residual Norm = 7.745498e-09
+
+# Output file: benchmark_ij.out.4
+Iterations = 21
+Final Relative Residual Norm = 4.026296e-09
+
+# Output file: benchmark_ij.out.5
+Iterations = 18
+Final Relative Residual Norm = 8.938045e-09
+
+# Output file: benchmark_ij.out.6
+Iterations = 87
+Final Relative Residual Norm = 8.301552e-09
+
+# Output file: benchmark_ij.out.7
+Iterations = 20
+Final Relative Residual Norm = 4.830682e-09
+
+# Output file: benchmark_ij.out.8
+Iterations = 55
+Final Relative Residual Norm = 7.448484e-09
+
+# Output file: benchmark_ij.out.9
+Iterations = 46
+Final Relative Residual Norm = 8.999363e-09
+
+# Output file: benchmark_ij.out.10
+Iterations = 93
+Final Relative Residual Norm = 8.530801e-09
+
+# Output file: benchmark_ij.out.11
+Iterations = 21
+Final Relative Residual Norm = 4.026296e-09
+
+# Output file: benchmark_ij.out.12
+Iterations = 18
+Final Relative Residual Norm = 8.938045e-09
+
+# Output file: benchmark_ij.out.13
+Iterations = 87
+Final Relative Residual Norm = 8.301486e-09
+
+# Output file: benchmark_ij.out.14
+Iterations = 20
+Final Relative Residual Norm = 8.245385e-09
+
+# Output file: benchmark_ij.out.15
+Iterations = 22
+Final Relative Residual Norm = 4.816512e-09
+
+# Output file: benchmark_ij.out.16
+Iterations = 20
+Final Relative Residual Norm = 8.240873e-09
+
+# Output file: benchmark_ij.out.17
+Iterations = 20
+Final Relative Residual Norm = 3.529822e-09
+
+# Output file: benchmark_ij.out.18
+Iterations = 20
+Final Relative Residual Norm = 3.555075e-09
+
+# Output file: benchmark_ij.out.19
+Iterations = 43
+Final Relative Residual Norm = 6.278339e-09
+
+# Output file: benchmark_ij.out.20
+Iterations = 38
+Final Relative Residual Norm = 7.063480e-09
+
+# Output file: benchmark_ij.out.21
+Iterations = 26
+Final Relative Residual Norm = 8.638600e-09
+
+# Output file: benchmark_ij.out.22
+Iterations = 12
+Final Relative Residual Norm = 8.893885e-09
+
+# Output file: benchmark_ij.out.23
+Iterations = 13
+Final Relative Residual Norm = 6.269155e-09
+
+# Output file: benchmark_ij.out.24
+Iterations = 14
+Final Relative Residual Norm = 2.060470e-09
+
+# Output file: benchmark_ij.out.25
+Iterations = 15
+Final Relative Residual Norm = 5.160772e-09
+
+# Output file: benchmark_ij.out.26
+Iterations = 37
+Final Relative Residual Norm = 6.305999e-09
+
+# Output file: benchmark_ij.out.27
+Iterations = 22
+Final Relative Residual Norm = 8.787135e-09
+
diff --git a/src/test/TEST_bench/benchmark_struct.perf.saved.tioga b/src/test/TEST_bench/benchmark_struct.perf.saved.tioga
new file mode 100644
index 000000000..740451765
--- /dev/null
+++ b/src/test/TEST_bench/benchmark_struct.perf.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: benchmark_struct.out.1
+PCG Setup wall clock time = 0.901832 seconds
+PCG Solve wall clock time = 0.700184 seconds
+# Output file: benchmark_struct.out.2
+PCG Setup wall clock time = 1.046741 seconds
+PCG Solve wall clock time = 0.867303 seconds
+# Output file: benchmark_struct.out.3
+PCG Setup wall clock time = 8.931370 seconds
+PCG Solve wall clock time = 6.930335 seconds
+# Output file: benchmark_struct.out.4
+PCG Setup wall clock time = 12.306432 seconds
+PCG Solve wall clock time = 11.384939 seconds
+# Output file: benchmark_struct.out.5
+PCG Setup wall clock time = 0.174218 seconds
+PCG Solve wall clock time = 0.190781 seconds
+# Output file: benchmark_struct.out.6
+PCG Setup wall clock time = 0.200355 seconds
+PCG Solve wall clock time = 0.377829 seconds
+# Output file: benchmark_struct.out.7
+PCG Setup wall clock time = 0.250921 seconds
+PCG Solve wall clock time = 0.444261 seconds
+# Output file: benchmark_struct.out.8
+PCG Setup wall clock time = 0.262308 seconds
+PCG Solve wall clock time = 0.687628 seconds
diff --git a/src/test/TEST_bench/benchmark_struct.saved.tioga b/src/test/TEST_bench/benchmark_struct.saved.tioga
new file mode 100644
index 000000000..6d600499d
--- /dev/null
+++ b/src/test/TEST_bench/benchmark_struct.saved.tioga
@@ -0,0 +1,32 @@
+# Output file: benchmark_struct.out.1
+Iterations = 6
+Final Relative Residual Norm = 1.399448e-07
+
+# Output file: benchmark_struct.out.2
+Iterations = 6
+Final Relative Residual Norm = 2.351905e-07
+
+# Output file: benchmark_struct.out.3
+Iterations = 5
+Final Relative Residual Norm = 1.230948e-07
+
+# Output file: benchmark_struct.out.4
+Iterations = 5
+Final Relative Residual Norm = 2.015486e-07
+
+# Output file: benchmark_struct.out.5
+Iterations = 10
+Final Relative Residual Norm = 5.748202e-07
+
+# Output file: benchmark_struct.out.6
+Iterations = 11
+Final Relative Residual Norm = 1.451552e-07
+
+# Output file: benchmark_struct.out.7
+Iterations = 10
+Final Relative Residual Norm = 2.886212e-07
+
+# Output file: benchmark_struct.out.8
+Iterations = 10
+Final Relative Residual Norm = 3.341658e-07
+
diff --git a/src/test/TEST_struct/cgpfmg3d.saved.tioga b/src/test/TEST_struct/cgpfmg3d.saved.tioga
new file mode 100644
index 000000000..088028770
--- /dev/null
+++ b/src/test/TEST_struct/cgpfmg3d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: cgpfmg3d.out.0
+Iterations = 9
+Final Relative Residual Norm = 4.287624e-07
+
+# Output file: cgpfmg3d.out.1
+Iterations = 9
+Final Relative Residual Norm = 4.287624e-07
+
diff --git a/src/test/TEST_struct/emptyproc.saved.tioga b/src/test/TEST_struct/emptyproc.saved.tioga
new file mode 100644
index 000000000..4d3786f59
--- /dev/null
+++ b/src/test/TEST_struct/emptyproc.saved.tioga
@@ -0,0 +1,68 @@
+# Output file: emptyproc.out.00a
+Iterations = 6
+Final Relative Residual Norm = 1.883632e-07
+
+# Output file: emptyproc.out.01a
+Iterations = 16
+Final Relative Residual Norm = 5.557193e-07
+
+# Output file: emptyproc.out.01b
+Iterations = 17
+Final Relative Residual Norm = 6.926794e-07
+
+# Output file: emptyproc.out.03a
+Iterations = 23
+Final Relative Residual Norm = 9.157321e-07
+
+# Output file: emptyproc.out.03b
+Iterations = 20
+Final Relative Residual Norm = 6.594761e-07
+
+# Output file: emptyproc.out.04a
+Iterations = 15
+Final Relative Residual Norm = 9.712834e-07
+
+# Output file: emptyproc.out.04b
+Iterations = 15
+Final Relative Residual Norm = 9.646051e-07
+
+# Output file: emptyproc.out.11a
+Iterations = 8
+Final Relative Residual Norm = 9.301342e-07
+
+# Output file: emptyproc.out.13a
+Iterations = 11
+Final Relative Residual Norm = 3.054686e-07
+
+# Output file: emptyproc.out.14a
+Iterations = 8
+Final Relative Residual Norm = 6.561630e-07
+
+# Output file: emptyproc.out.17a
+Iterations = 20
+Final Relative Residual Norm = 6.766509e-07
+
+# Output file: emptyproc.out.18a
+Iterations = 42
+Final Relative Residual Norm = 7.820632e-07
+
+# Output file: emptyproc.out.21a
+Iterations = 11
+Final Relative Residual Norm = 5.851154e-07
+
+# Output file: emptyproc.out.31a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
+# Output file: emptyproc.out.41a
+Iterations = 5
+Final Relative Residual Norm = 1.853522e-07
+
+# Output file: emptyproc.out.51a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
+# Output file: emptyproc.out.61a
+Iterations = 9
+Final Relative Residual Norm = 1.848351e-07
+
diff --git a/src/test/TEST_struct/hybrid.saved.tioga b/src/test/TEST_struct/hybrid.saved.tioga
new file mode 100644
index 000000000..5054c85e2
--- /dev/null
+++ b/src/test/TEST_struct/hybrid.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: hybrid.out.0
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.1
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.2
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: hybrid.out.3
+Iterations = 6
+Final Relative Residual Norm = 1.175679e-07
+
+# Output file: hybrid.out.4
+Iterations = 10
+Final Relative Residual Norm = 3.092333e-07
+
diff --git a/src/test/TEST_struct/hybridswitch.saved.tioga b/src/test/TEST_struct/hybridswitch.saved.tioga
new file mode 100644
index 000000000..c5ef6e03b
--- /dev/null
+++ b/src/test/TEST_struct/hybridswitch.saved.tioga
@@ -0,0 +1,32 @@
+# Output file: hybridswitch.out.0
+Iterations = 6
+Final Relative Residual Norm = 8.777304e-07
+
+# Output file: hybridswitch.out.1
+Iterations = 11
+Final Relative Residual Norm = 4.303572e-07
+
+# Output file: hybridswitch.out.2
+Iterations = 6
+Final Relative Residual Norm = 8.777304e-07
+
+# Output file: hybridswitch.out.3
+Iterations = 4
+Final Relative Residual Norm = 7.591871e-07
+
+# Output file: hybridswitch.out.4
+Iterations = 8
+Final Relative Residual Norm = 7.771813e-07
+
+# Output file: hybridswitch.out.5
+Iterations = 36
+Final Relative Residual Norm = 9.833457e-07
+
+# Output file: hybridswitch.out.6
+Iterations = 64
+Final Relative Residual Norm = 9.962554e-07
+
+# Output file: hybridswitch.out.7
+Iterations = 64
+Final Relative Residual Norm = 9.962554e-07
+
diff --git a/src/test/TEST_struct/migrate.saved.tioga b/src/test/TEST_struct/migrate.saved.tioga
new file mode 100644
index 000000000..c913c5fc1
--- /dev/null
+++ b/src/test/TEST_struct/migrate.saved.tioga
@@ -0,0 +1,27 @@
+# Output file: migrate.out.10
+Check = 0 (success = 0)
+
+# Output file: migrate.out.11
+Check = 0 (success = 0)
+
+# Output file: migrate.out.12
+Check = 0 (success = 0)
+
+# Output file: migrate.out.20
+Check = 0 (success = 0)
+
+# Output file: migrate.out.21
+Check = 0 (success = 0)
+
+# Output file: migrate.out.22
+Check = 0 (success = 0)
+
+# Output file: migrate.out.30
+Check = 0 (success = 0)
+
+# Output file: migrate.out.31
+Check = 0 (success = 0)
+
+# Output file: migrate.out.32
+Check = 0 (success = 0)
+
diff --git a/src/test/TEST_struct/parflow.saved.tioga b/src/test/TEST_struct/parflow.saved.tioga
new file mode 100644
index 000000000..c3946d0d6
--- /dev/null
+++ b/src/test/TEST_struct/parflow.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: parflow.out.0
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.1
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.2
+Iterations = 10
+Final Relative Residual Norm = 8.112584e-07
+
+# Output file: parflow.out.3
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
+# Output file: parflow.out.4
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
+# Output file: parflow.out.5
+Iterations = 15
+Final Relative Residual Norm = 9.466307e-07
+
diff --git a/src/test/TEST_struct/periodic.saved.tioga b/src/test/TEST_struct/periodic.saved.tioga
new file mode 100644
index 000000000..7873f9924
--- /dev/null
+++ b/src/test/TEST_struct/periodic.saved.tioga
@@ -0,0 +1,68 @@
+# Output file: periodic.out.10
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.11
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.12
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.13
+Iterations = 16
+Final Relative Residual Norm = 5.765014e-07
+
+# Output file: periodic.out.20
+Iterations = 23
+Final Relative Residual Norm = 6.111317e-07
+
+# Output file: periodic.out.21
+Iterations = 23
+Final Relative Residual Norm = 6.111317e-07
+
+# Output file: periodic.out.30
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.31
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.32
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.33
+Iterations = 21
+Final Relative Residual Norm = 4.973134e-07
+
+# Output file: periodic.out.40
+Iterations = 43
+Final Relative Residual Norm = 8.515463e-07
+
+# Output file: periodic.out.41
+Iterations = 43
+Final Relative Residual Norm = 8.515463e-07
+
+# Output file: periodic.out.50
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.51
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.52
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.53
+Iterations = 7
+Final Relative Residual Norm = 3.701014e-07
+
+# Output file: periodic.out.60
+Iterations = 10
+Final Relative Residual Norm = 1.565392e-07
+
diff --git a/src/test/TEST_struct/pfmgbase1d.saved.tioga b/src/test/TEST_struct/pfmgbase1d.saved.tioga
new file mode 100644
index 000000000..af3f57c48
--- /dev/null
+++ b/src/test/TEST_struct/pfmgbase1d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: pfmgbase1d.out.0
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgbase1d.out.1
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
diff --git a/src/test/TEST_struct/pfmgbase2d.saved.tioga b/src/test/TEST_struct/pfmgbase2d.saved.tioga
new file mode 100644
index 000000000..e4b1c5472
--- /dev/null
+++ b/src/test/TEST_struct/pfmgbase2d.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: pfmgbase2d.out.0
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.1
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.2
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.3
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.4
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
+# Output file: pfmgbase2d.out.5
+Iterations = 13
+Final Relative Residual Norm = 3.655647e-07
+
diff --git a/src/test/TEST_struct/pfmgbase3d.saved.tioga b/src/test/TEST_struct/pfmgbase3d.saved.tioga
new file mode 100644
index 000000000..7d0a285c8
--- /dev/null
+++ b/src/test/TEST_struct/pfmgbase3d.saved.tioga
@@ -0,0 +1,32 @@
+# Output file: pfmgbase3d.out.0
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.1
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.2
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.3
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.4
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.5
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.6
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
+# Output file: pfmgbase3d.out.7
+Iterations = 10
+Final Relative Residual Norm = 3.298941e-07
+
diff --git a/src/test/TEST_struct/pfmgconstcoeffmp.saved.tioga b/src/test/TEST_struct/pfmgconstcoeffmp.saved.tioga
new file mode 100644
index 000000000..15eade03f
--- /dev/null
+++ b/src/test/TEST_struct/pfmgconstcoeffmp.saved.tioga
@@ -0,0 +1,80 @@
+# Output file: pfmgconstcoeffmp.out.10
+Iterations = 13
+Final Relative Residual Norm = 5.378609e-07
+
+# Output file: pfmgconstcoeffmp.out.11
+Iterations = 13
+Final Relative Residual Norm = 5.378609e-07
+
+# Output file: pfmgconstcoeffmp.out.12
+Iterations = 12
+Final Relative Residual Norm = 3.999260e-07
+
+# Output file: pfmgconstcoeffmp.out.13
+Iterations = 12
+Final Relative Residual Norm = 3.999260e-07
+
+# Output file: pfmgconstcoeffmp.out.20
+Iterations = 19
+Final Relative Residual Norm = 5.033356e-07
+
+# Output file: pfmgconstcoeffmp.out.21
+Iterations = 19
+Final Relative Residual Norm = 5.033356e-07
+
+# Output file: pfmgconstcoeffmp.out.22
+Iterations = 15
+Final Relative Residual Norm = 8.833880e-07
+
+# Output file: pfmgconstcoeffmp.out.23
+Iterations = 15
+Final Relative Residual Norm = 8.833880e-07
+
+# Output file: pfmgconstcoeffmp.out.30
+Iterations = 200
+Final Relative Residual Norm = 1.095973e+00
+
+# Output file: pfmgconstcoeffmp.out.31
+Iterations = 200
+Final Relative Residual Norm = 1.095973e+00
+
+# Output file: pfmgconstcoeffmp.out.32
+Iterations = 43
+Final Relative Residual Norm = 9.925149e-07
+
+# Output file: pfmgconstcoeffmp.out.33
+Iterations = 43
+Final Relative Residual Norm = 9.925149e-07
+
+# Output file: pfmgconstcoeffmp.out.34
+Iterations = 14
+Final Relative Residual Norm = 5.920399e-07
+
+# Output file: pfmgconstcoeffmp.out.35
+Iterations = 14
+Final Relative Residual Norm = 5.920399e-07
+
+# Output file: pfmgconstcoeffmp.out.40
+Iterations = 18
+Final Relative Residual Norm = 8.028630e-07
+
+# Output file: pfmgconstcoeffmp.out.41
+Iterations = 18
+Final Relative Residual Norm = 8.028630e-07
+
+# Output file: pfmgconstcoeffmp.out.42
+Iterations = 16
+Final Relative Residual Norm = 6.371573e-07
+
+# Output file: pfmgconstcoeffmp.out.43
+Iterations = 16
+Final Relative Residual Norm = 6.371573e-07
+
+# Output file: pfmgconstcoeffmp.out.44
+Iterations = 13
+Final Relative Residual Norm = 9.856117e-07
+
+# Output file: pfmgconstcoeffmp.out.45
+Iterations = 13
+Final Relative Residual Norm = 9.856117e-07
+
diff --git a/src/test/TEST_struct/pfmgorient.saved.tioga b/src/test/TEST_struct/pfmgorient.saved.tioga
new file mode 100644
index 000000000..ad4e63f87
--- /dev/null
+++ b/src/test/TEST_struct/pfmgorient.saved.tioga
@@ -0,0 +1,12 @@
+# Output file: pfmgorient.out.0
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
+# Output file: pfmgorient.out.1
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
+# Output file: pfmgorient.out.2
+Iterations = 9
+Final Relative Residual Norm = 1.987658e-07
+
diff --git a/src/test/TEST_struct/pfmgtest1d.saved.tioga b/src/test/TEST_struct/pfmgtest1d.saved.tioga
new file mode 100644
index 000000000..84e6234a6
--- /dev/null
+++ b/src/test/TEST_struct/pfmgtest1d.saved.tioga
@@ -0,0 +1,12 @@
+# Output file: pfmgtest1d.out.0
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgtest1d.out.1
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
+# Output file: pfmgtest1d.out.2
+Iterations = 9
+Final Relative Residual Norm = 2.021867e-07
+
diff --git a/src/test/TEST_struct/pfmgvcycle.saved.tioga b/src/test/TEST_struct/pfmgvcycle.saved.tioga
new file mode 100644
index 000000000..f4304e4f7
--- /dev/null
+++ b/src/test/TEST_struct/pfmgvcycle.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: pfmgvcycle.out.0
+Iterations = 30
+Final Relative Residual Norm = 8.360175e-07
+
+# Output file: pfmgvcycle.out.1
+Iterations = 30
+Final Relative Residual Norm = 7.107142e-07
+
diff --git a/src/test/TEST_struct/psmgbase3d.saved.tioga b/src/test/TEST_struct/psmgbase3d.saved.tioga
new file mode 100644
index 000000000..4fb7bfe52
--- /dev/null
+++ b/src/test/TEST_struct/psmgbase3d.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: psmgbase3d.out.0
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.1
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.2
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.3
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
+# Output file: psmgbase3d.out.4
+Iterations = 6
+Final Relative Residual Norm = 7.016404e-07
+
diff --git a/src/test/TEST_struct/psmgtest3d.saved.tioga b/src/test/TEST_struct/psmgtest3d.saved.tioga
new file mode 100644
index 000000000..1f7fa8364
--- /dev/null
+++ b/src/test/TEST_struct/psmgtest3d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: psmgtest3d.out.0
+Iterations = 5
+Final Relative Residual Norm = 6.944705e-08
+
+# Output file: psmgtest3d.out.1
+Iterations = 5
+Final Relative Residual Norm = 6.944705e-08
+
diff --git a/src/test/TEST_struct/smgbase1d.saved.tioga b/src/test/TEST_struct/smgbase1d.saved.tioga
new file mode 100644
index 000000000..5a24e4ac1
--- /dev/null
+++ b/src/test/TEST_struct/smgbase1d.saved.tioga
@@ -0,0 +1,8 @@
+# Output file: smgbase1d.out.0
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgbase1d.out.1
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
diff --git a/src/test/TEST_struct/smgbase2d.saved.tioga b/src/test/TEST_struct/smgbase2d.saved.tioga
new file mode 100644
index 000000000..fcde9fd3e
--- /dev/null
+++ b/src/test/TEST_struct/smgbase2d.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: smgbase2d.out.0
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.1
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.2
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.3
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
+# Output file: smgbase2d.out.4
+Iterations = 5
+Final Relative Residual Norm = 2.468039e-07
+
diff --git a/src/test/TEST_struct/smgbase3d.saved.tioga b/src/test/TEST_struct/smgbase3d.saved.tioga
new file mode 100644
index 000000000..c697ff445
--- /dev/null
+++ b/src/test/TEST_struct/smgbase3d.saved.tioga
@@ -0,0 +1,24 @@
+# Output file: smgbase3d.out.0
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.1
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.2
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.3
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.4
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
+# Output file: smgbase3d.out.5
+Iterations = 4
+Final Relative Residual Norm = 8.971901e-07
+
diff --git a/src/test/TEST_struct/smgtest1d.saved.tioga b/src/test/TEST_struct/smgtest1d.saved.tioga
new file mode 100644
index 000000000..fdf7e64d3
--- /dev/null
+++ b/src/test/TEST_struct/smgtest1d.saved.tioga
@@ -0,0 +1,12 @@
+# Output file: smgtest1d.out.0
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgtest1d.out.1
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
+# Output file: smgtest1d.out.2
+Iterations = 1
+Final Relative Residual Norm = 0.000000e+00
+
diff --git a/src/test/TEST_struct/smgvcycle.saved.tioga b/src/test/TEST_struct/smgvcycle.saved.tioga
new file mode 100644
index 000000000..0e5dfa131
--- /dev/null
+++ b/src/test/TEST_struct/smgvcycle.saved.tioga
@@ -0,0 +1,4 @@
+# Output file: smgvcycle.out.0
+Iterations = 7
+Final Relative Residual Norm = 3.621850e-07
+
diff --git a/src/test/TEST_struct/solvers.saved.tioga b/src/test/TEST_struct/solvers.saved.tioga
new file mode 100644
index 000000000..9def633b4
--- /dev/null
+++ b/src/test/TEST_struct/solvers.saved.tioga
@@ -0,0 +1,20 @@
+# Output file: solvers.out.0
+Iterations = 4
+Final Relative Residual Norm = 7.846564e-07
+
+# Output file: solvers.out.1
+Iterations = 8
+Final Relative Residual Norm = 5.298596e-07
+
+# Output file: solvers.out.2
+Iterations = 20
+Final Relative Residual Norm = 6.913376e-07
+
+# Output file: solvers.out.3
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
+# Output file: solvers.out.4
+Iterations = 20
+Final Relative Residual Norm = 5.962015e-07
+
diff --git a/src/test/TEST_struct/vcpfmgRedBlackGS.saved.tioga b/src/test/TEST_struct/vcpfmgRedBlackGS.saved.tioga
new file mode 100644
index 000000000..b288a3b41
--- /dev/null
+++ b/src/test/TEST_struct/vcpfmgRedBlackGS.saved.tioga
@@ -0,0 +1,48 @@
+# Output file: vcpfmgRedBlackGS.out.0
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.1
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.2
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.3
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.4
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.5
+Iterations = 5
+Final Relative Residual Norm = 3.344527e-07
+
+# Output file: vcpfmgRedBlackGS.out.6
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.7
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.8
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.9
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.10
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
+# Output file: vcpfmgRedBlackGS.out.11
+Iterations = 10
+Final Relative Residual Norm = 5.540991e-07
+
diff --git a/src/test/TEST_struct/vdpfmgRedBlackGS.saved.tioga b/src/test/TEST_struct/vdpfmgRedBlackGS.saved.tioga
new file mode 100644
index 000000000..944a73081
--- /dev/null
+++ b/src/test/TEST_struct/vdpfmgRedBlackGS.saved.tioga
@@ -0,0 +1,48 @@
+# Output file: vdpfmgRedBlackGS.out.0
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.1
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.2
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.3
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.4
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.5
+Iterations = 5
+Final Relative Residual Norm = 1.616480e-07
+
+# Output file: vdpfmgRedBlackGS.out.6
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.7
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.8
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.9
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.10
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
+# Output file: vdpfmgRedBlackGS.out.11
+Iterations = 9
+Final Relative Residual Norm = 8.392336e-07
+
diff --git a/src/test/runtest.sh b/src/test/runtest.sh
index 786cbf438..8969a80f9 100755
--- a/src/test/runtest.sh
+++ b/src/test/runtest.sh
@@ -71,6 +71,8 @@ function usage
 # generate default command based on the first 4 characters of the platform name
 function MpirunString
 {
+   NumArgs1=$#
+
    case $HOST in
       *bgl*)
          BatchMode=1
@@ -100,40 +102,41 @@ function MpirunString
          shift
          if [ $NumThreads -gt 0 ] ; then
             export OMP_NUM_THREADS=$NumThreads
-            RunString="srun -p pdebug -c $NumThreads -n$*"
+            RunString="srun -p pdebug -c $NumThreads -n$1"
          else
-            RunString="srun -p pdebug -n$*"
+            RunString="srun -p pdebug -n$1"
          fi
          ;;
       surface*)
          shift
-         RunString="srun -n$*"
+         RunString="srun -n$1"
          ;;
       pascal*)
          shift
-         RunString="srun -n$*"
+         RunString="srun -n$1"
          ;;
       rzansel*)
          shift
-         RunString="lrun -T$*"
+         RunString="lrun -T$1"
          ;;
       ray*)
          shift
-         #RunString="mpirun -n $*"
-         RunString="lrun -n$*"
+         RunString="lrun -n$1"
          ;;
       lassen*)
          shift
-         #RunString="mpirun -n $*"
-         RunString="lrun -n$*"
+         RunString="lrun -n$1"
          ;;
-      redwood*)
+      tioga*)
          shift
-         RunString="srun -n$*"
+         RunString="srun -n$1"
+         if [ "$mpibind" = "mpibind" ] ; then
+            mpibind="--mpibind=on"
+         fi
          ;;
       node*)
          shift
-         RunString="srun -n$*"
+         RunString="srun -n$1"
          ;;
       *)
          shift
@@ -141,11 +144,15 @@ function MpirunString
             export OMP_NUM_THREADS=$NumThreads
          fi
          RunString="$RunPrefix $1"
-         shift
          ;;
    esac
 
-   RunString="$RunString $script $mpibind $Valgrind $*"
+   NumArgs2=$(($#+1))
+   if [ "$NumArgs1" -eq "$NumArgs2" ] ; then
+      shift
+      RunString="$RunString $script $mpibind $Valgrind $*"
+      #echo $RunString
+   fi
 }
 
 # determine the "number of nodes" desired by dividing the "number of processes"
diff --git a/src/utilities/_hypre_utilities.h b/src/utilities/_hypre_utilities.h
index f528ecef5..3f11740c2 100644
--- a/src/utilities/_hypre_utilities.h
+++ b/src/utilities/_hypre_utilities.h
@@ -134,7 +134,7 @@ void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, c
 #define hypre_device_assert(EX) assert(EX)
 #elif defined(HYPRE_USING_HIP)
 /* FIXME: Currently, asserts in device kernels in HIP do not behave well */
-#define hypre_device_assert(EX)
+#define hypre_device_assert(EX) do { if (0) { static_cast<void> (EX); } } while (0)
 #endif
 #else /* #ifdef HYPRE_DEBUG */
 /* this is to silence compiler's unused variable warnings */
diff --git a/src/utilities/error.h b/src/utilities/error.h
index b5cd57055..c4693c630 100644
--- a/src/utilities/error.h
+++ b/src/utilities/error.h
@@ -35,7 +35,7 @@ void hypre_error_handler(const char *filename, HYPRE_Int line, HYPRE_Int ierr, c
 #define hypre_device_assert(EX) assert(EX)
 #elif defined(HYPRE_USING_HIP)
 /* FIXME: Currently, asserts in device kernels in HIP do not behave well */
-#define hypre_device_assert(EX)
+#define hypre_device_assert(EX) do { if (0) { static_cast<void> (EX); } } while (0)
 #endif
 #else /* #ifdef HYPRE_DEBUG */
 /* this is to silence compiler's unused variable warnings */