diff --git a/.gitmodules b/.gitmodules
index 4f0b16cf..8312d6da 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,19 +4,20 @@
 	branch = ats5
 [submodule "umt"]
 	path = umt
-	url = https://github.com/LLNL/UMT.git
+	url = git@github.com:LLNL/UMT.git
 [submodule "trilinos"]
 	path = trilinos
-	url = https://github.com/trilinos/Trilinos.git
+	url = git@github.com:trilinos/Trilinos.git
 [submodule "sparta"]
 	path = sparta
-	url = https://github.com/sparta/sparta.git
+	url = git@github.com:sparta/sparta.git
 [submodule "parthenon"]
 	path = parthenon
-	url = https://github.com/parthenon-hpc-lab/parthenon.git
-[submodule "spatter"]
-	path = spatter
-	url = git@github.com:lanl/spatter.git
+	url = git@github.com:parthenon-hpc-lab/parthenon.git
 [submodule "utils/pavilion"]
 	path = utils/pavilion
 	url = git@github.com:hpc/pavilion2.git
+[submodule "microbenchmarks/spatter"]
+	path = microbenchmarks/spatter
+	url = git@github.com:lanl/spatter.git
+	branch = main
diff --git a/doc/sphinx/03_vibe/do_cpu_throughput.sh b/doc/sphinx/03_vibe/do_cpu_throughput.sh
index ff855283..6dee173c 100755
--- a/doc/sphinx/03_vibe/do_cpu_throughput.sh
+++ b/doc/sphinx/03_vibe/do_cpu_throughput.sh
@@ -22,7 +22,7 @@ count=${NP}
 
 #BEGIN Do not change the following for official benchmarking 
 NXB=16
-NLIM=10
+NLIM=250
 NLVL=3
 #END
 
@@ -33,7 +33,7 @@ TIMING_FILE_NAME="cpu_throughput.csv"
 EXEC=./burgers-benchmark # executable
 INP=../../../benchmarks/burgers/burgers.pin
 
-HEADER="No. Cores, Actual"
+HEADER="No. Cores, Size, Actual"
 echo "Saving timing to ${TIMING_FILE_NAME}"
 echo "${HEADER}"
 echo "${HEADER}" > ${TIMING_FILE_NAME}
@@ -46,14 +46,14 @@ for NX in 32 64 96 128 160 192; do
 	outfile=$(printf "strong-scale-%d-%d.out" ${NX} ${count})
 	errfile=$(printf "strong-scale-%d-%d.err" ${NX} ${count})
 	echo "saving to output file ${outfile}"
-	ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
-	CMD="srun --cpu-bind=ldoms -n ${NP} -c ${NT} -o ${outfile} -e ${errfile} ${ARGS}"
+	ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx2=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
+	CMD="srun -n ${NP} --hint=nomultithread -o ${outfile} -e ${errfile} ${ARGS}"
 	echo ${CMD}
 	${CMD}
 	wait
 	zc=$(grep 'zone-cycles/wallsecond = ' ${outfile} | cut -d '=' -f 2 | xargs)
 	echo ${zc}
-	OUTSTR="${count}, ${zc}"
+	OUTSTR="${count},${NX},${zc}"
 	echo "${OUTSTR}"
 	echo "${OUTSTR}" >> ${TIMING_FILE_NAME}
 	i=$((${i} + 1))
diff --git a/doc/sphinx/03_vibe/do_gpu_throughput.sh b/doc/sphinx/03_vibe/do_gpu_throughput.sh
index cfad025c..14046730 100755
--- a/doc/sphinx/03_vibe/do_gpu_throughput.sh
+++ b/doc/sphinx/03_vibe/do_gpu_throughput.sh
@@ -24,7 +24,7 @@ for NX in 32 64 96 128 160 192; do
     echo "Mesh base size = ${NX}"
     outfile=$(printf "gpu-throughput-%d.out" ${NX})
     echo "saving to output file ${outfile}"
-    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
+    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx2=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
     CMD="${ARGS} | tee ${outfile}"
     echo ${CMD}
     ${ARGS} | tee ${outfile}
diff --git a/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh b/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh
index 01f45348..90462f76 100755
--- a/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh
+++ b/doc/sphinx/03_vibe/do_strong_scaling_cpu.sh
@@ -40,7 +40,7 @@ for count in  8 32 56 88 112; do
     outfile=$(printf "strong-scale-%d.out" ${count})
     errfile=$(printf "strong-scale-%d.err" ${count})
     echo "saving to output file ${outfile}"
-    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
+    ARGS="${EXEC} -i ${INP} parthenon/mesh/nx1=${NX} parthenon/mesh/nx2=${NX} parthenon/mesh/nx3=${NX} parthenon/meshblock/nx1=${NXB} parthenon/meshblock/nx2=${NXB} parthenon/meshblock/nx3=${NXB} parthenon/time/nlim=${NLIM} parthenon/mesh/numlevel=${NLVL}"
     CMD="srun -n ${count} --hint=nomultithread  -o ${outfile} -e ${errfile} ${ARGS}"
     echo ${CMD}
     ${CMD}
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst
index 6c2797c6..f58ff93c 100644
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/SPATTER.rst
@@ -39,13 +39,13 @@ Accessing the benchmark, memory access patterns, and scaling scripts [LANL-Spatt
 
    cd <path to benchmarks>
    git submodule update --init --recursive
-   cd spatter
+   cd microbenchmarks/spatter
 
 ..
 
 Set-up:
 
-The setup script will initialize your CPU configuration file (scripts/cpu_config.sh) with CTS-1 defaults and the GPU configurationo file (scripts/gpu_config.sh) with V100/A100 defaults, and will buid Spatter for CPU and GPU. See the Spatter documentation and other build scripts (scripts/build_cpu.sh and scripts/build_cuda.sh) for further instructions for building with different compilers or for GPUs.
+The setup script will initialize your CPU configuration file (scripts/cpu_config.sh) with ATS-3 defaults and the GPU configurationo file (scripts/gpu_config.sh) with V100/A100 defaults, and will buid Spatter for CPU and GPU. See the Spatter documentation and other build scripts (scripts/build_cpu.sh and scripts/build_cuda.sh) for further instructions for building with different compilers or for GPUs.
 
 The scripts/setup.sh scripts has the following options
 
@@ -53,6 +53,24 @@ The scripts/setup.sh scripts has the following options
 * g: Toggle GPU Build (default: off)
 * h: Print usage message
 
+To setup and build for only the CPU, run the following:
+
+.. code-block:: bash
+
+   bash scripts/setup.sh -c
+
+..
+
+
+Or to build only for the GPU, run:
+
+.. code-block:: bash
+
+   bash scripts/setup.sh -g
+
+..
+
+
 To setup and build for both the CPU and GPU, run the following:
 
 .. code-block:: bash
@@ -73,13 +91,15 @@ This setup script performs the following:
 
    * patterns/xrage/asteroid/spatter.json
 
+#. Extracts patterns from patterns/xrage/asteroid/spatter.json to separate JSON files located at patterns/xrage/asteroid/spatter{1-9}.json
+
 #. Generates default module files located in modules/cpu.mod and modules/gpu.mood
 
    * Contains generic module load statements for CPU and GPU dependencies
 
    * Assumes you are utilizing the module load system to configure environment. Change as needed (i.e. changes to PATH etc.) if you utilize a different system.
 
-#. Populates the configuration file (scripts/cpu_config.sh) with reasonable defaults for a CTS-1 system
+#. Populates the configuration file (scripts/cpu_config.sh) with reasonable defaults for a ATS-3 system
 
    * HOMEDIR is set to the directory this repository sits in
 
@@ -87,13 +107,13 @@ This setup script performs the following:
 
    * SPATTER is set to path of the Spatter CPU executable
 
-   * ranklist is set to sweep from 1-36 threads/ranks respectively for a CTS-1 type system
+   * ranklist is set to sweep from 1-112 ranks respectively for a ATS-3 type system
 
    * boundarylist is set to reasonable defaults for scaling experiments (specifies the maximum value of a pattern index, limiting the size of the data array)
 
    * sizelist is set to reasonable defaults for strong scaling experiments (specifies the size of the pattern to truncate at)
 
-#. Poopulates the GPU configuration file (scripts/gpu_config.sh) with reasonable defaults for single-GPU throughput experiments on a V100 or A100 system
+#. Populates the GPU configuration file (scripts/gpu_config.sh) with reasonable defaults for single-GPU throughput experiments on a V100 or A100 system
 
    * HOMEDIR is set to the directory this repository sits in
 
@@ -141,6 +161,7 @@ Running
 =======
 
 Running a Scaling Experiment
+
 This will perform a weak scaling experiment
 
 The scripts/scaling.sh script has the following options (a scripts/mpirunscaling.sh script with identical options has been provided if required to use mpirun rather than srun): 
@@ -162,309 +183,72 @@ The Application name, Problem name, and Pattern name each correspond to subdirec
 
 All Figures use solid lines for Gathers and dashed lines for Scatters.
 
-
-CTS-1
+Crossroads
 ------------
 
+These weak-scaling experiements were ran on 1, 2, 4, 8, 16, 32, 56, 64, 96, and 112 ranks with a single Crossroads node.
 
-Flag Static 2D 001
-~~~~~~~~~~~~~~~~~~
-
-Weak-scaling experiment for the 8 patterns in patterns/flag/static_2d/001.json with core-binding turned on and plotting enabled. This experiment was ran at 1, 2, 4, 8, 16, 18, 32, and 36 ranks. Results will be found in spatter.weakscaling/CTS1/flag/static_2d/001/ and Figures will be found in figures/spatter.weakscaling/CTS1/flag/static_2d/001/
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001 -n CTS1 -c -w
-
-..
-
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on CTS-1 Flag Static 2D 001 Patterns
-   :file: cts1_weak_average_001.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: cts1_weak_average_001.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Weak Scaling Performance on CTS-1 Flag Static 2D 001 Patterns
-
-   Spatter Weak Scaling Performance on CTS-1 Flag Static 2D 001 Patterns
-
-
-Flag Static 2D 001.FP
-~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.fp -n CTS1 -c -w
-
-..
-
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on CTS-1 Flag Static 2D 001 FP Patterns
-   :file: cts1_weak_average_001fp.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: cts1_weak_average_001fp.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Weak Scaling Performance on CTS-1 Flag Static 2D 001 FP Patterns
-
-   Spatter Weak Scaling Performance on CTS-1 Flag Static 2D 001 FP Patterns
-
-
-Flag Static 2D 001.NONFP
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.nonfp -n CTS1 -c -w
-
-..
-
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on CTS-1 Flag Static 2D 001 Non-FP Patterns
-   :file: cts1_weak_average_001nonfp.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: cts1_weak_average_001nonfp.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Weak Scaling Performance on CTS-1 Flag Static 2D 001 Non-FP Patterns
-
-   Spatter Weak Scaling Performance on CTS-1 Flag Static 2D 001 Non-FP Patterns
-
-
-xRAGE Asteroid
-~~~~~~~~~~~~~~
-
-Weak-scaling experiment for the x patterns in patterns/xrage/asteroid/spatter.json with core-binding turned on and plotting enabled. This experiment was ran at 1, 2, 4, 8, 16, and 18 ranks due to memory constraints. Results will be found in spatter.weakscaling/CTS1/xrage/asteroid/spatter/ and Figures will be found in figures/spatter.weakscaling/CTS1/xrage/asteroid/spatter/
-
-First, modifying the ranklist in scripts/cpu_config.sh to the following:
-
-.. code-block:: bash
-
-   ranks=( 1 2 4 8 16 18 )
-
-..
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a xrage -p asteroid -f spatter -n CTS1 -c -w
-
-..
-
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on CTS-1 xRAGE Asteroid Patterns
-   :file: cts1_weak_average_asteroid.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: cts1_weak_average_asteroid.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Weak Scaling Performance on CTS-1 xRAGE Asteroid Patterns
-
-   Spatter Weak Scaling Performance on CTS-1 xRAGE Asteroid Patterns
-
-
-Skylake
-------------
-
-
-Flag Static 2D 001
-~~~~~~~~~~~~~~~~~~
-
-Weak-scaling experiment for the 8 patterns in patterns/flag/static_2d/001.json with core-binding turned on and plotting enabled. This experiment was ran at 1, 2, 4, 8, 16, 22, 32, and 44 ranks. Results will be found in spatter.weakscaling/Skylake/flag/static_2d/001/ and Figures will be found in figures/spatter.weakscaling/Skylake/flag/static_2d/001/
-
-First, modifying the ranklist in scripts/cpu_config.sh to the following:
-
-.. code-block:: bash
-
-   ranks=( 1 2 4 8 16 22 32 44 )
-
-..
-
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001 -n Skylake -c -w
-
-..
-
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on Skylake Flag Static 2D 001 Patterns
-   :file: skylake_weak_average_001.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: skylake_weak_average_001.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Weak Scaling Performance on Skylake Flag Static 2D 001 Patterns
-
-   Spatter Weak Scaling Performance on Skylake Flag Static 2D 001 Patterns
-
-
-Flag Static 2D 001.FP
-~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.fp -n Skylake -c -w
-
-..
-
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on Skylake Flag Static 2D 001 FP Patterns
-   :file: skylake_weak_average_001fp.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: skylake_weak_average_001fp.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Weak Scaling Performance on Skylake Flag Static 2D 001 FP Patterns
+These experiments were ran with core-binding turned on and plotting enabled.
 
-   Spatter Weak Scaling Performance on Skylake Flag Static 2D 001 FP Patterns
+xRAGE Asteroid Spatter Pattern 5
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Weak-scaling experiment for the pattern in patterns/xrage/asteroid/spatter5.json. Results will be found in spatter.weakscaling/Crossroads/xrage/asteroid/spatter5/ and Figures will be found in figures/spatter.weakscaling/Crossroads/xrage/asteroid/spatter5
 
+This pattern is a Gather with a length of 8,368,968 elements with a target vector length of 1,120,524.
 
-Flag Static 2D 001.NONFP
-~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code-block:: bash
 
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.nonfp -n Skylake -c -w
+   bash scripts/scaling.sh -a xrage -p asteroid -f spatter5 -n Crossroads -c -w
 
 ..
 
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on Skylake Flag Static 2D 001 Non-FP Patterns
-   :file: skylake_weak_average_001nonfp.csv
+.. csv-table:: Spatter Weak Scaling Performance (MB/s per Rank) for xRAGE Spatter Pattern 5 on Crossroads
+   :file: ats3_weak_average_asteroid_5.csv
    :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
+   :widths: 5, 5
    :header-rows: 1
 
-.. figure:: skylake_weak_average_001nonfp.png
+.. figure:: ats3_weak_average_asteroid_5.png
    :align: center
    :scale: 50%
-   :alt: Spatter Weak Scaling Performance on Skylake Flag Static 2D 001 Non-FP Patterns
-
-   Spatter Weak Scaling Performance on Skylake Flag Static 2D 001 Non-FP Patterns
-
-
-xRAGE Asteroid
-~~~~~~~~~~~~~~
+   :alt: Spatter Weak Scaling Performance for xRAGE Spatter Pattern 5 on Crossroads
 
-Weak-scaling experiment for the 9 patterns in patterns/xrage/asteroid/spatter.json with core-binding turned on and plotting enabled. This experiment was ran at 1, 2, 4, 8, 16, and 22 ranks due to memory constraints. Results will be found in spatter.weakscaling/Skylake/xrage/asteroid/spatter/ and Figures will be found in figures/spatter.weakscaling/Skylake/xrage/asteroid/spatter/
+   Spatter Weak Scaling Performance for xRAGE Spatter Pattern 5 on Crossroads
 
-First, modifying the ranklist in scripts/cpu_config.sh to the following:
 
-.. code-block:: bash
+xRAGE Asteroid Spatter Pattern 9
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-   ranks=( 1 2 4 8 16 22 )
+Weak-scaling experiment for the pattern in patterns/xrage/asteroid/spatter5.json. Results will be found in spatter.weakscaling/Crossroads/xrage/asteroid/spatter9/ and Figures will be found in figures/spatter.weakscaling/Crossroads/xrage/asteroid/spatter9
 
-..
+This pattern is a Scatter with a length of 6,664,304 elements with a target vector length of 2,051,100.
 
 .. code-block:: bash
 
-   bash scripts/scaling.sh -a xrage -p asteroid -f spatter -n Skylake -c -w
+   bash scripts/scaling.sh -a xrage -p asteroid -f spatter9 -n Crossroads -c -w
 
 ..
 
-.. csv-table:: Spatter Weak Scaling Performance (MB/s per rank) on Skylake xRAGE Asteroid Patterns
-   :file: skylake_weak_average_asteroid.csv
+.. csv-table:: Spatter Weak Scaling Performance (MB/s per Rank) for xRAGE Spatter Pattern 9 on Crossroads
+   :file: ats3_weak_average_asteroid_9.csv
    :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8, 8
+   :widths: 5, 5
    :header-rows: 1
 
-.. figure:: skylake_weak_average_asteroid.png
+.. figure:: ats3_weak_average_asteroid_9.png
    :align: center
    :scale: 50%
-   :alt: Spatter Weak Scaling Performance on Skylake xRAGE Asteroid Patterns
+   :alt: Spatter Weak Scaling Performance for xRAGE Spatter Pattern 9 on Crossroads
 
-   Spatter Weak Scaling Performance on Skylake xRAGE Asteroid Patterns
+   Spatter Weak Scaling Performance for xRAGE Spatter Pattern 9 on Crossroads
 
 
 V100
 ------------
 
-Strong-Scaling throughput experiment with plotting enabled. Results will be found in spatter.strongscaling/V100/flag/static_2d/001 and Figures will be found in figures/spatter.strongscaling/V100/flag/static_2d/001.
-
-
-Flag Static 2D 001
-~~~~~~~~~~~~~~~~~~
-
-Throughput experiment for the 8 patterns in patterns/flag/static_2d/001.json on a single GPU with plotting enabled. Results will be found in spatter.strongscaling/V100/flag/static_2d/001/ and Figures will be found in figures/spatter.strongscaling/V100/flag/static_2d/001/
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001 -n V100 -g -t
-
-..
-
-.. csv-table:: Spatter Throughput (MB/s) on V100 Flag Static 2D 001 Patterns
-   :file: v100_throughput_001.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: v100_throughput_001.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Throughput on V100 Flag Static 2D 001 Patterns
-
-   Spatter Throughput on V100 Flag Static 2D 001 Patterns
-
-
-Flag Static 2D 001.FP
-~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.fp -n V100 -g -t
-
-..
-
-.. csv-table:: Spatter Throughput (MB/s) on V100 Flag Static 2D 001 FP Patterns
-   :file: v100_throughput_001fp.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: v100_throughput_001fp.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Throughput on V100 Flag Static 2D 001 FP Patterns
-
-   Spatter Throughput on V100 Flag Static 2D 001 FP Patterns
-
-
-
-Flag Static 2D 001.NONFP
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.nonfp -n V100 -g -t
-
-..
-
-.. csv-table:: Spatter Throughput (MB/s) on V100 Flag Static 2D 001 Non-FP Patterns
-   :file: v100_throughput_001nonfp.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: v100_throughput_001nonfp.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Throughput on V100 Flag Static 2D 001 Non-FP Patterns
-
-   Spatter Throughput on V100 Flag Static 2D 001 Non-FP Patterns
+Strong-Scaling throughput experiments with plotting enabled.
 
 
 xRAGE Asteroid
@@ -496,87 +280,7 @@ Throughput experiment for the 9 patterns in patterns/xrage/asteroid/spatter.json
 A100
 ------------
 
-Strong-Scaling throughput experiment with plotting enabled. Results will be found in spatter.strongscaling/A100/flag/static_2d/001 and Figures will be found in figures/spatter.strongscaling/A100/flag/static_2d/001.
-
-.. code-block:: bash
-
-    cd spatter
-
-    bash scripts/scaling.sh -a flag -p static_2d -f 001 -n A100 -g -t
-
-..
-
-Flag Static 2D 001
-~~~~~~~~~~~~~~~~~~
-
-Throughput experiment for the 8 patterns in patterns/flag/static_2d/001.json on a single GPU with plotting enabled. Results will be found in spatter.strongscaling/A100/flag/static_2d/001/ and Figures will be found in figures/spatter.strongscaling/A100/flag/static_2d/001/
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001 -n A100 -g -t
-
-..
-
-.. csv-table:: Spatter Throughput (MB/s) on A100 Flag Static 2D 001 Patterns
-   :file: a100_throughput_001.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: a100_throughput_001.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Throughput on A100 Flag Static 2D 001 Patterns
-
-   Spatter Throughput ono A100 Flag Static 2D 001 Patterns
-
-
-Flag Static 2D 001.FP
-~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.fp -n A100 -g -t
-
-..
-
-.. csv-table:: Spatter Throughput (MB/s) on A100 Flag Static 2D 001 FP Patterns
-   :file: a100_throughput_001fp.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: a100_throughput_001fp.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Throughput on A100 Flag Static 2D 001 FP Patterns
-
-   Spatter Throughput on A100 Flag Static 2D 001 FP Patterns
-
-
-
-Flag Static 2D 001.NONFP
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   bash scripts/scaling.sh -a flag -p static_2d -f 001.nonfp -n A100 -g -t
-
-..
-
-.. csv-table:: Spatter Throughput (MB/s) on A100 Flag Static 2D 001 Non-FP Patterns
-   :file: a100_throughput_001nonfp.csv
-   :align: center
-   :widths: 5, 8, 8, 8, 8, 8, 8, 8, 8
-   :header-rows: 1
-
-.. figure:: a100_throughput_001nonfp.png
-   :align: center
-   :scale: 50%
-   :alt: Spatter Throughput on A100 Flag Static 2D 001 Non-FP Patterns
-
-   Spatter Throughput on A100 Flag Static 2D 001 Non-FP Patterns
-
+Strong-Scaling throughput experiment with plotting enabled.
 
 xRAGE Asteroid
 ~~~~~~~~~~~~~~
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100.gp b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100.gp
index 3976fa0b..e9ab787d 100644
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100.gp
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100.gp
@@ -1,6 +1,6 @@
 #!/usr/bin/gnuplot
 set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18'
-set output "a100_throughput_001.png"
+set output "a100_throughput_asteroid.png"
 
 set title "Spatter Throughput on A100, Flag Static 2D Patterns" font "serif,22"
 set xlabel "No. Gathers/Scatters"
@@ -25,21 +25,6 @@ do for [i=11:15] {
     set style line i linewidth 3 dashtype 2 pointsize 1.5
 }
 
-plot "a100_throughput_001.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "a100_throughput_001fp.png"
-set title "Spatter Throughput on A100, Flag Static 2D FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "a100_throughput_001fp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4
-
-set output "a100_throughput_001nonfp.png"
-set title "Spatter Throughput on A100, Flag Static 2D Non-FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "a100_throughput_001nonfp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "a100_throughput_asteroid.png"
-set title "Spatter Throughput on A100, xRAGE Asteroid Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
 plot "a100_throughput_asteroid.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13, "" using 1:10 with linespoints linestyle 14
 
 
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001.csv
deleted file mode 100644
index 76f2e13c..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Gathers/Scatters,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-512,664496.82,515524.12,515524.12,628642.68,500274.83,157538.46,157538.46,159067.96
-1024,1003421.97,819840.53,820482.03,801051.21,821124.55,157538.46,158299.51,159067.96
-2048,1062925.55,1169633.0,1170939.13,1274864.47,1151016.45,161817.28,161817.28,162217.83
-4096,1372481.68,1252031.08,1357379.93,1357379.93,1253153.23,138994.69,138700.53,137825.44
-8192,2767604.06,2360992.93,2558282.36,2541232.36,2360328.61,249186.32,251095.78,249660.96
-16384,2992725.02,2627598.45,2752619.49,2738243.25,2631720.21,250975.58,249779.91,251577.73
-32768,3125995.08,2732000.67,2917522.93,2917015.78,2736233.55,250555.8,249482.74,251155.93
-65536,2092052.51,1817732.37,1969156.88,1970949.6,1820247.01,249097.53,249720.41,250077.75
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001fp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001fp.csv
deleted file mode 100644
index 518e809f..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001fp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Gathers/Scatters,Pattern 0,Pattern 1,Pattern 2,Pattern 3
-512,692586.52,688946.15,713317.0,683556.7
-1024,1053845.22,1054905.43,1029024.57,1053845.22
-2048,1359139.35,1374280.49,1383345.63,1357379.93
-4096,1633932.22,1650650.91,1814930.41,1838800.6
-8192,1827185.44,1816109.11,2055024.07,2057544.23
-16384,1991124.53,1991124.53,2260775.66,2258341.1
-32768,2046750.7,2046126.74,2301243.47,2302032.91
-65536,1530558.41,1522364.29,1733765.6,2360494.69
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001nonfp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001nonfp.csv
deleted file mode 100644
index 8b7a8283..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/a100_throughput_001nonfp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Gathers/Scatters,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-512,512000.0,497899.34,513001.97,497899.34,509017.45,150311.93,150311.93,150311.93
-1024,750591.24,750591.24,768187.53,767625.16,749518.26,134295.08,134295.08,134847.74
-2048,1159929.18,1024000.0,999595.85,1015570.03,1158007.7,137680.68,137680.68,137392.04
-4096,1630755.82,1491043.02,1490513.14,1492103.89,1640964.07,163840.0,163227.89,163635.46
-8192,2746760.99,2556722.9,2533557.18,2352385.92,2649592.0,249898.96,249898.96,250855.49
-16384,2991657.71,2738243.25,2738690.14,2638341.78,2873795.03,249304.81,250137.42,251216.09
-32768,3125704.09,2916508.57,2919553.76,2734004.16,3051790.18,250675.59,249660.96,249839.41
-65536,1758065.22,1657049.83,1658770.19,1529686.2,1735244.94,237826.27,248683.97,250286.66
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3.gp b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3.gp
new file mode 100644
index 00000000..6491310e
--- /dev/null
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3.gp
@@ -0,0 +1,40 @@
+#!/usr/bin/gnuplot
+set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18'
+set output "ats3_weak_average_asteroid_5.png"
+
+set xlabel "No. Processing Elements"
+set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
+
+set xrange [1:128]
+set nokey
+
+set logscale x 2
+
+set grid
+show grid
+
+set datafile separator comma
+set key autotitle columnheader
+
+do for [i=1:10] {
+    set style line i linewidth 3 pointsize 1.5
+}
+
+do for [i=11:15] {
+    set style line i linewidth 3 dashtype 2 pointsize 1.5
+}
+
+
+plot "ats3_weak_average_asteroid_5.csv" using 1:2 with linespoints linestyle 1
+
+set output "ats3_weak_total_asteroid_5.png"
+set ylabel "Figure of Merit (Total Bandwidth MB/s)"
+plot "ats3_weak_total_asteroid_5.csv" using 1:2 with linespoints linestyle 1
+
+set output "ats3_weak_average_asteroid_9.png"
+set ylabel "Figure of Merit (Total Bandwidth MB/s)"
+plot "ats3_weak_average_asteroid_5.csv" using 1:2 with linespoints linestyle 1
+
+set output "ats3_weak_total_asteroid_9.png"
+set ylabel "Figure of Merit (Total Bandwidth MB/s)"
+plot "ats3_weak_total_asteroid_9.csv" using 1:2 with linespoints linestyle 1
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_average_asteroid_5.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_average_asteroid_5.csv
new file mode 100644
index 00000000..96150f60
--- /dev/null
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_average_asteroid_5.csv
@@ -0,0 +1,11 @@
+No. Cores,Average Bandwidth per Rank (MB/s)
+1,7427.1
+2,7400.44
+4,7080.54
+8,6595.21
+16,5480.66
+32,5533.13
+56,4884.83
+64,4820.64
+96,4430.0
+112,4406.79
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_average_asteroid_9.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_average_asteroid_9.csv
new file mode 100644
index 00000000..538874e3
--- /dev/null
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_average_asteroid_9.csv
@@ -0,0 +1,11 @@
+No. Cores,Average Bandwidth per Rank (MB/s)
+1,6269.91
+2,6272.86
+4,5949.62
+8,5752.77
+16,5483.2
+32,4656.94
+56,4522.95
+64,4596.41
+96,4318.55
+112,4029.54
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_total_asteroid_5.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_total_asteroid_5.csv
new file mode 100644
index 00000000..69d38835
--- /dev/null
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_total_asteroid_5.csv
@@ -0,0 +1,11 @@
+No. Cores,Total Bandwidth (MB/s)
+1,7427.1
+2,14800.88
+4,28322.15
+8,52761.66
+16,87690.61
+32,177060.04
+56,273550.7
+64,308521.28
+96,425279.73
+112,493560.15
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_total_asteroid_9.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_total_asteroid_9.csv
new file mode 100644
index 00000000..dd41745b
--- /dev/null
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/ats3_weak_total_asteroid_9.csv
@@ -0,0 +1,11 @@
+No. Cores,Total Bandwidth (MB/s)
+1,6269.91
+2,12545.72
+4,23798.47
+8,46022.17
+16,87731.14
+32,149022.03
+56,253285.3
+64,294170.33
+96,414580.69
+112,451308.1
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1.gp b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1.gp
deleted file mode 100644
index 0f2d32c1..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1.gp
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/gnuplot
-set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18'
-set output "cts1_weak_average_001.png"
-
-set title "Spatter Weak Scaling on CTS-1, Flag Static 2D Patterns" font "serif,22"
-set xlabel "No. Processing Elements"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-
-set xrange [1:64]
-set key outside
-
-set logscale x 2
-
-set grid
-show grid
-
-set datafile separator comma
-set key autotitle columnheader
-
-do for [i=1:10] {
-    set style line i linewidth 3 pointsize 1.5
-}
-
-do for [i=11:15] {
-    set style line i linewidth 3 dashtype 2 pointsize 1.5
-}
-
-plot "cts1_weak_average_001.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "cts1_weak_total_001.png"
-set title "Spatter Weak Scaling on CTS-1, Flag Static 2D Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "cts1_weak_total_001.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-
-set output "cts1_weak_average_001fp.png"
-set title "Spatter Weak Scaling on CTS-1, Flag Static 2D FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-plot "cts1_weak_average_001fp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4
-
-set output "cts1_weak_total_001fp.png"
-set title "Spatter Weak Scaling on CTS-1, Flag Static 2D FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "cts1_weak_total_001fp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4
-
-
-set output "cts1_weak_average_001nonfp.png"
-set title "Spatter Weak Scaling on CTS-1, Flag Static 2D Non-FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-plot "cts1_weak_average_001nonfp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "cts1_weak_total_001nonfp.png"
-set title "Spatter Weak Scaling on CTS-1, Flag Static 2D Non-FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "cts1_weak_total_001nonfp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-
-set output "cts1_weak_average_asteroid.png"
-set title "Spatter Weak Scaling on CTS-1, xRAGE Asteroid Patterns" font "serif,22"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-plot "cts1_weak_average_asteroid.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13, "" using 1:10 with linespoints linestyle 14
-
-set output "cts1_weak_total_asteroid.png"
-set title "Spatter Weak Scaling on CTS-1, xRAGE Asteroid Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "cts1_weak_total_asteroid.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13, "" using 1:10 with linespoints linestyle 14
-
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001.csv
deleted file mode 100644
index 32164575..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-1,5582.22,3772.29,4860.8,4881.99,3826.55,4468.9,4448.58,4474.06
-2,5576.38,3802.77,4815.3,4807.31,3803.01,4441.79,4467.11,4453.27
-4,5531.49,3711.58,4771.33,4769.15,3726.74,4409.09,4407.52,4407.33
-8,5610.09,3792.39,4844.05,4853.45,3797.78,4475.84,4471.21,4481.38
-16,5642.98,3757.05,4866.76,4865.8,3772.58,4534.15,4529.62,4529.57
-18,5291.75,3399.91,4379.98,4395.16,3346.39,4178.2,4172.68,4183.41
-32,5123.59,3318.87,4005.62,3939.75,3150.38,3818.76,3830.98,3988.88
-36,4956.31,3281.62,3839.17,3662.08,3190.6,3692.64,3795.19,3780.31
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001fp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001fp.csv
deleted file mode 100644
index d9fd82a4..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001fp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3
-1,3218.13,3185.57,3853.22,3866.29
-2,3192.89,3176.35,3846.89,3859.05
-4,3469.32,3427.08,4148.27,4147.29
-8,3765.52,3723.09,4476.91,4491.75
-16,3595.18,3481.83,4285.04,4316.58
-18,3675.12,3628.18,4500.9,4513.39
-32,3631.95,3345.44,4246.72,4138.32
-36,3605.95,3115.11,4077.14,3910.35
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001nonfp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001nonfp.csv
deleted file mode 100644
index b6c2c688..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_001nonfp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-1,5104.01,4536.49,4536.69,3560.05,4307.59,4171.44,4127.89,4142.21
-2,5576.21,4844.12,4833.82,3779.44,4594.85,4454.85,4449.23,4462.64
-4,5567.57,4800.65,4809.98,3777.95,4594.11,4431.64,4431.14,4427.78
-8,5629.25,4852.31,4840.91,3810.65,4632.51,4485.95,4477.6,4482.1
-16,5435.23,4674.4,4663.95,3628.21,4426.94,4349.05,4346.48,4344.33
-18,5431.95,4660.72,4514.86,3497.49,4301.4,4259.32,4247.54,4265.33
-32,4931.07,3558.4,3657.51,3234.87,4067.81,3874.17,3855.85,4022.93
-36,4676.58,3090.27,3448.31,3258.0,3792.35,3643.38,3827.61,3832.08
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_asteroid.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_asteroid.csv
deleted file mode 100644
index 938d0a35..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_average_asteroid.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7,Pattern 8
-1,8505.99,8516.42,8529.29,8528.91,8526.81,5841.05,5821.98,5994.99,5937.61
-2,8518.1,8499.22,8528.94,8532.8,8518.52,5808.95,5813.18,5963.5,5975.18
-4,8309.8,8357.95,8349.9,8345.8,8328.1,5791.2,5802.13,5936.11,5937.01
-8,8110.47,8087.97,8130.8,8128.2,8096.81,5510.26,5515.02,5670.44,5663.56
-16,7138.62,7101.96,7138.16,7138.22,7127.43,4902.5,4907.5,5052.69,5045.11
-18,6894.6,6785.55,6860.29,6862.91,6850.81,4898.28,4901.74,5033.6,5034.36
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001.csv
deleted file mode 100644
index 274aefb9..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-Pattern,0,1,2,3,4,5,6,7
-1,5582.22,3772.29,4860.8,4881.99,3826.55,4468.9,4448.58,4474.06
-2,11152.76,7605.53,9630.6,9614.61,7606.03,8883.58,8934.22,8906.55
-4,22125.95,14846.3,19085.31,19076.58,14906.98,17636.35,17630.08,17629.33
-8,44880.72,30339.08,38752.41,38827.6,30382.27,35806.75,35769.66,35851.07
-16,90287.7,60112.81,77868.17,77852.72,60361.27,72546.48,72473.88,72473.04
-18,95251.5,61198.37,78839.73,79112.95,60235.07,75207.56,75108.15,75301.35
-32,163955.03,106203.79,128179.98,126071.91,100812.26,122200.2,122591.48,127644.1
-36,178427.19,118138.5,138210.17,131834.98,114861.47,132934.89,136626.73,136091.29
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001fp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001fp.csv
deleted file mode 100644
index 5e7e536a..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001fp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3
-1,3218.13,3185.57,3853.22,3866.29
-2,6385.79,6352.7,7693.79,7718.09
-4,13877.3,13708.32,16593.06,16589.16
-8,30124.16,29784.71,35815.28,35933.98
-16,57522.89,55709.34,68560.58,69065.25
-18,66152.14,65307.25,81016.22,81241.03
-32,116222.54,107054.21,135894.99,132426.15
-36,129814.28,112143.92,146776.92,140772.57
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001nonfp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001nonfp.csv
deleted file mode 100644
index 6ed4d9f7..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_001nonfp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-1,5104.01,4536.49,4536.69,3560.05,4307.59,4171.44,4127.89,4142.21
-2,11152.42,9688.24,9667.63,7558.87,9189.71,8909.7,8898.45,8925.28
-4,22270.26,19202.61,19239.93,15111.81,18376.44,17726.57,17724.57,17711.11
-8,45034.01,38818.44,38727.28,30485.23,37060.1,35887.6,35820.79,35856.79
-16,86963.76,74790.33,74623.22,58051.42,70831.1,69584.75,69543.72,69509.27
-18,97775.14,83892.9,81267.44,62954.87,77425.18,76667.84,76455.72,76775.88
-32,157794.15,113868.75,117040.29,103515.93,130169.81,123973.45,123387.24,128733.67
-36,168357.03,111249.7,124139.22,117287.99,136524.74,131161.62,137793.95,137954.92
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_asteroid.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_asteroid.csv
deleted file mode 100644
index c696bab5..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/cts1_weak_total_asteroid.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7,Pattern 8
-1,8505.99,8516.42,8529.29,8528.91,8526.81,5841.05,5821.98,5994.99,5937.61
-2,17036.21,16998.44,17057.87,17065.6,17037.04,11617.91,11626.36,11926.99,11950.36
-4,33239.18,33431.79,33399.61,33383.19,33312.42,23164.8,23208.52,23744.46,23748.03
-8,64883.75,64703.72,65046.37,65025.59,64774.47,44082.1,44120.16,45363.48,45308.51
-16,114217.87,113631.35,114210.56,114211.58,114038.95,78440.03,78520.07,80842.97,80721.68
-18,124102.88,122139.85,123485.19,123532.32,123314.53,88169.08,88231.37,90604.74,90618.57
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake.gp b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake.gp
deleted file mode 100644
index b3c48f97..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake.gp
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/gnuplot
-set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18'
-set output "skylake_weak_average_001.png"
-
-set title "Spatter Weak Scaling on Skylake, Flag Static 2D Patterns" font "serif,22"
-set xlabel "No. Processing Elements"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-
-set xrange [1:64]
-set key outside
-
-set logscale x 2
-
-set grid
-show grid
-
-set datafile separator comma
-set key autotitle columnheader
-
-do for [i=1:10] {
-    set style line i linewidth 3 pointsize 1.5
-}
-
-do for [i=11:15] {
-    set style line i linewidth 3 dashtype 2 pointsize 1.5
-}
-
-
-plot "skylake_weak_average_001.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "skylake_weak_total_001.png"
-set title "Spatter Weak Scaling on Skylake, Flag Static 2D Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "skylake_weak_total_001.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-
-set output "skylake_weak_average_001fp.png"
-set title "Spatter Weak Scaling on Skylake, Flag Static 2D FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-plot "skylake_weak_average_001fp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4
-
-set output "skylake_weak_total_001fp.png"
-set title "Spatter Weak Scaling on Skylake, Flag Static 2D FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "skylake_weak_total_001fp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4
-
-
-set output "skylake_weak_average_001nonfp.png"
-set title "Spatter Weak Scaling on Skylake, Flag Static 2D Non-FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-plot "skylake_weak_average_001nonfp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "skylake_weak_total_001nonfp.png"
-set title "Spatter Weak Scaling on Skylake, Flag Static 2D Non-FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "skylake_weak_total_001nonfp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-
-set output "skylake_weak_average_asteroid.png"
-set title "Spatter Weak Scaling on Skylake, xRAGE Asteroid Patterns" font "serif,22"
-set ylabel "Figure of Merit (Avg. Bandwidth per rank MB/s)"
-plot "skylake_weak_average_asteroid.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13, "" using 1:10 with linespoints linestyle 14
-
-set output "skylake_weak_total_asteroid.png"
-set title "Spatter Weak Scaling on Skylake, xRAGE Asteroid Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "skylake_weak_total_asteroid.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13, "" using 1:10 with linespoints linestyle 14
-
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001.csv
deleted file mode 100644
index 867e95a0..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-1,7531.34,5333.83,6167.06,6153.53,5429.54,8635.42,8584.34,8477.76
-2,7674.17,5277.71,6097.19,6106.56,5399.9,8513.95,8434.4,8313.44
-4,7694.16,5458.61,6270.75,6264.13,5465.76,8488.6,8565.19,8532.62
-8,7531.33,5370.86,6169.88,6158.66,5399.71,8172.85,8160.45,8166.39
-16,7188.91,5125.98,5858.04,5858.29,5167.62,7861.86,7892.91,7900.7
-22,7204.73,5208.57,5672.86,5661.73,4920.98,7596.4,7573.19,7576.56
-32,5417.18,3824.05,3913.49,3849.77,3855.95,6146.38,5997.89,6006.95
-44,3922.43,2784.13,2715.05,2640.23,2789.96,5528.31,5122.48,4805.44
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001fp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001fp.csv
deleted file mode 100644
index 3b02b5ec..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001fp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3
-1,6086.22,6035.59,8495.24,8408.53
-2,6218.92,6037.34,8335.21,8360.78
-4,6224.51,6137.92,8557.42,8603.23
-8,6161.45,6007.17,8267.32,8265.09
-16,5883.68,5702.87,7931.96,7920.15
-22,5631.58,5344.49,7797.06,7771.06
-32,4805.41,4025.14,6118.15,6164.46
-44,3190.73,2791.63,5030.57,4777.89
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001nonfp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001nonfp.csv
deleted file mode 100644
index 6c81c644..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_001nonfp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-1,7367.2,6232.75,6245.02,5238.22,8201.42,8704.0,8492.98,8411.58
-2,7710.39,6141.35,6133.69,5354.95,8146.06,8481.75,8423.28,8511.41
-4,7616.48,6151.29,6152.9,5538.89,8027.27,8303.08,8314.41,8329.35
-8,7555.02,6168.92,6155.9,5408.3,8023.16,8208.28,8221.15,8196.91
-16,7245.97,5829.68,5825.89,5196.54,7651.76,7915.78,7906.73,7909.11
-22,6947.39,5490.36,5441.78,4923.12,7406.51,7699.24,7650.08,7705.16
-32,5486.57,4032.07,3902.23,3796.02,5893.83,6004.02,5908.9,6036.29
-44,3880.45,2647.04,2546.03,2802.28,4725.85,5330.4,5208.03,4921.7
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_asteroid.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_asteroid.csv
deleted file mode 100644
index 4ee09dbf..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_average_asteroid.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7,Pattern 8
-1,8662.8,8754.09,9020.11,9054.99,8666.54,8998.59,8965.83,8866.5,8962.74
-2,8696.25,8766.58,9004.79,8997.83,8685.01,8935.4,8957.55,8945.94,8919.17
-4,8698.83,8768.89,9019.4,9029.0,8705.56,8921.25,8959.9,8933.07,8952.92
-8,8352.42,8394.27,8634.86,8613.14,8342.7,8583.92,8599.09,8511.9,8478.92
-16,7888.18,7484.45,8232.49,8233.19,7517.52,8220.65,8302.18,8328.19,8305.77
-22,7102.42,6335.07,7084.19,7102.08,6210.44,7120.0,7078.86,7107.23,7060.94
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001.csv
deleted file mode 100644
index 3b46a947..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-1,7531.34,5333.83,6167.06,6153.53,5429.54,8635.42,8584.34,8477.76
-2,15348.34,10555.42,12194.39,12213.11,10799.79,17027.9,16868.81,16626.89
-4,30776.64,21834.46,25083.01,25056.52,21863.04,33954.38,34260.77,34130.47
-8,60250.66,42966.88,49359.01,49269.28,43197.67,65382.78,65283.62,65331.11
-16,115022.53,82015.63,93728.64,93732.63,82681.89,125789.72,126286.49,126411.23
-22,158503.98,114588.65,124802.97,124557.97,108261.47,167120.84,166610.25,166684.33
-32,173349.7,122369.59,125231.7,123192.6,123390.43,196684.15,191932.63,192222.4
-44,172587.13,122501.64,119462.36,116170.0,122758.45,243245.64,225389.08,211439.44
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001fp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001fp.csv
deleted file mode 100644
index 43fcfa33..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001fp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3
-1,6086.22,6035.59,8495.24,8408.53
-2,12437.85,12074.69,16670.42,16721.56
-4,24898.02,24551.69,34229.69,34412.9
-8,49291.58,48057.33,66138.56,66120.75
-16,94138.95,91245.87,126911.35,126722.48
-22,123894.82,117578.83,171535.24,170963.21
-32,153772.96,128804.39,195780.82,197262.78
-44,140392.26,122831.87,221345.23,210226.99
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001nonfp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001nonfp.csv
deleted file mode 100644
index 055ea7ea..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_001nonfp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-1,7367.2,6232.75,6245.02,5238.22,8201.42,8704.0,8492.98,8411.58
-2,15420.77,12282.69,12267.38,10709.9,16292.11,16963.5,16846.56,17022.81
-4,30465.91,24605.16,24611.59,22155.54,32109.1,33212.31,33257.64,33317.4
-8,60440.19,49351.38,49247.23,43266.42,64185.31,65666.23,65769.21,65575.28
-16,115935.45,93274.84,93214.21,83144.67,122428.11,126652.56,126507.64,126545.84
-22,152842.64,120788.0,119719.25,108308.67,162943.19,169383.2,168301.66,169513.53
-32,175570.31,129026.08,124871.28,121472.71,188602.47,192128.62,189084.68,193161.29
-44,170739.8,116469.67,112025.24,123300.24,207937.23,234537.54,229153.35,216554.87
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_asteroid.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_asteroid.csv
deleted file mode 100644
index 33522787..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/skylake_weak_total_asteroid.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-No. Cores,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7,Pattern 8
-1,8662.8,8754.09,9020.11,9054.99,8666.54,8998.59,8965.83,8866.5,8962.74
-2,17392.5,17533.17,18009.58,17995.65,17370.03,17870.79,17915.1,17891.87,17838.33
-4,34795.31,35075.55,36077.6,36115.98,34822.24,35684.98,35839.61,35732.27,35811.67
-8,66819.35,67154.19,69078.85,68905.12,66741.58,68671.35,68792.74,68095.21,67831.39
-16,126210.91,119751.14,131719.82,131731.11,120280.24,131530.45,132834.91,133251.08,132892.38
-22,156253.2,139371.57,155852.23,156245.7,136629.62,156639.95,155734.96,156359.14,155340.68
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100.gp b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100.gp
index 856e9d90..854e1c68 100644
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100.gp
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100.gp
@@ -1,8 +1,7 @@
 #!/usr/bin/gnuplot
 set terminal pngcairo enhanced size 1024, 768 dashed font 'Helvetica,18'
-set output "v100_throughput_001.png"
+set output "v100_throughput_asteroid.png"
 
-set title "Spatter Throughput on V100, Flag Static 2D Patterns" font "serif,22"
 set xlabel "No. Gathers/Scatters"
 set ylabel "Figure of Merit (Total Bandwidth MB/s)"
 
@@ -25,21 +24,4 @@ do for [i=11:15] {
     set style line i linewidth 3 dashtype 2 pointsize 1.5
 }
 
-plot "v100_throughput_001.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "v100_throughput_001fp.png"
-set title "Spatter Throughput on V100, Flag Static 2D FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "v100_throughput_001fp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4
-
-set output "v100_throughput_001nonfp.png"
-set title "Spatter Throughput on V100, Flag Static 2D Non-FP Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
-plot "v100_throughput_001nonfp.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13
-
-set output "v100_throughput_asteroid.png"
-set title "Spatter Throughput on V100, xRAGE Asteroid Patterns" font "serif,22"
-set ylabel "Figure of Merit (Total Bandwidth MB/s)"
 plot "v100_throughput_asteroid.csv" using 1:2 with linespoints linestyle 1, "" using 1:3 with linespoints linestyle 2, "" using 1:4 with linespoints linestyle 3, "" using 1:5 with linespoints linestyle 4, "" using 1:6 with linespoints linestyle 5, "" using 1:7 with linespoints linestyle 11, "" using 1:8 with linespoints linestyle 12, "" using 1:9 with linespoints linestyle 13, "" using 1:10 with linespoints linestyle 14
-
-
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001.csv
deleted file mode 100644
index 0e5aee8c..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Gathers/Scatters,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-512,894689.45,596459.61,814111.78,599871.84,599186.27,303407.41,303407.41,303407.41
-1024,1197004.6,900838.48,1133595.68,1132371.48,876735.77,312076.19,315076.93,315076.93
-2048,1445314.97,1206646.75,1428577.65,1428577.65,1197688.22,319736.55,319687.8,319687.8
-4096,1763053.42,1452321.28,1590558.93,1591766.2,1592370.52,322837.43,322837.43,322837.43
-8192,1932858.99,1529930.31,1816109.11,1816109.11,1708474.09,324435.65,324435.65,324047.13
-16384,2006124.09,1610870.49,1876646.07,1876646.07,1763980.32,325039.07,325039.07,325039.07
-32768,2042763.33,1663168.82,1940011.16,1940684.34,1790524.63,325341.6,325341.6,325341.6
-65536,2041023.8,1606666.7,1924765.13,1924875.58,1777953.79,325341.6,325392.09,325392.09
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001fp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001fp.csv
deleted file mode 100644
index cd018573..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001fp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Gathers/Scatters,Pattern 0,Pattern 1,Pattern 2,Pattern 3
-512,596459.61,595781.81,851116.92,853889.22
-1024,1009216.56,895453.49,1197004.6,1198372.53
-2048,1299350.72,1119077.94,1522986.19,1519675.33
-4096,1446311.74,1451316.32,1610097.48,1593580.54
-8192,1610715.8,1529651.39,1812969.07,1816109.11
-16384,1711436.92,1613038.7,1870161.17,1863513.87
-32768,1763516.66,1640482.59,1908453.72,1908128.06
-65536,1616068.55,1502425.98,1846490.91,1846490.91
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001nonfp.csv b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001nonfp.csv
deleted file mode 100644
index 8cbd94f0..00000000
--- a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/v100_throughput_001nonfp.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-No. Gathers/Scatters,Pattern 0,Pattern 1,Pattern 2,Pattern 3,Pattern 4,Pattern 5,Pattern 6,Pattern 7
-512,802891.24,593085.99,574877.18,593085.99,804122.68,268590.17,273066.67,272924.52
-1024,1194277.92,1133595.68,1129931.01,902388.98,1201117.97,315076.93,315076.93,315076.93
-2048,1440351.62,1428577.65,1426634.0,1204567.5,1445314.97,319736.55,319687.8,319687.8
-4096,1689208.18,1687848.65,1673704.72,1516927.25,1694668.29,322837.43,322837.43,322837.43
-8192,1937322.9,1815323.08,1816895.82,1703270.65,1936875.48,324435.65,324435.65,324435.65
-16384,2005884.18,1876436.12,1876436.12,1757696.75,1877275.98,324837.68,324837.68,324837.68
-32768,2042017.49,1940572.08,1939562.5,1788329.78,1936204.94,325139.83,325139.83,325139.83
-65536,1848118.14,1749585.8,1908670.69,1777859.57,1893430.67,323634.57,325341.6,325392.09
diff --git a/doc/sphinx/09_Microbenchmarks/M2_SPATTER/xrage_pattern_data.txt b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/xrage_pattern_data.txt
new file mode 100644
index 00000000..8d66aa94
--- /dev/null
+++ b/doc/sphinx/09_Microbenchmarks/M2_SPATTER/xrage_pattern_data.txt
@@ -0,0 +1,9 @@
+1: Pattern Length: 8388609 Max Pattern Value: 1120524
+2: Pattern Length: 8388608 Max Pattern Value: 111300
+3: Pattern Length: 8388608 Max Pattern Value: 1120526
+4: Pattern Length: 8388608 Max Pattern Value: 1120526
+5: Pattern Length: 8368968 Max Pattern Value: 1120524
+6: Pattern Length: 8388608 Max Pattern Value: 1120526
+7: Pattern Length: 8388608 Max Pattern Value: 1120526
+8: Pattern Length: 6664304 Max Pattern Value: 2051100
+9: Pattern Length: 6664304 Max Pattern Value: 2051100
diff --git a/microbenchmarks/spatter b/microbenchmarks/spatter
new file mode 160000
index 00000000..7513c8d8
--- /dev/null
+++ b/microbenchmarks/spatter
@@ -0,0 +1 @@
+Subproject commit 7513c8d806ac99099bdddefe03c866dca798b804
diff --git a/parthenon b/parthenon
index c75ce20f..11c53d1c 160000
--- a/parthenon
+++ b/parthenon
@@ -1 +1 @@
-Subproject commit c75ce20f938a4adaedb4425584954c3e74d56868
+Subproject commit 11c53d1cd4ada0629e06d069b70b410234ed0bde
diff --git a/sparta b/sparta
index ca0ce28f..83d5f3a9 160000
--- a/sparta
+++ b/sparta
@@ -1 +1 @@
-Subproject commit ca0ce28fd76080d8b2828db77adde14fdc382c76
+Subproject commit 83d5f3a92c5fc0b59d4d973c6b1dddc4d77a7147
diff --git a/spatter b/spatter
deleted file mode 160000
index 8398bc6c..00000000
--- a/spatter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8398bc6c8038e5c2d7d188e58cb842f05dc2185a
diff --git a/trilinos b/trilinos
index 5aaae1ad..f3ff0b54 160000
--- a/trilinos
+++ b/trilinos
@@ -1 +1 @@
-Subproject commit 5aaae1ada6fe1ce777e671a0ff84fdc4f0779406
+Subproject commit f3ff0b54c5158790295daff089ff0d286bda3c2c
diff --git a/utils/pavilion b/utils/pavilion
index f502ca86..69b2d45d 160000
--- a/utils/pavilion
+++ b/utils/pavilion
@@ -1 +1 @@
-Subproject commit f502ca86fa27f4bc894aa19232c9f1f42361e269
+Subproject commit 69b2d45d696e623127c106b50525ba65daa23d76