Merge branch 'develop' into lroberts36/fix-divide-by-zero #4813

Job	Run time
CI-Rocm-HIP (hipcc, Release, hip, serial)	31m 45s
CI-Cuda-Host (g++, Release, cuda, serial)	40m 18s
CI-Cuda-Host (g++, Release, cuda, mpi)	40m 12s
CI-Cuda-Host (g++, Release, host, serial)	11m 5s
CI-Rocm-HIP (hipcc, Release, hip, mpi)	31m 25s
CI-Cuda-Host (g++, Release, host, mpi)	11m 12s
CI-Rocm-HIP (hipcc, Debug, hip, serial)	54m 16s
CI-Cuda-Host (g++, Debug, cuda, serial)	1h 10m 33s
CI-Rocm-HIP (hipcc, Debug, hip, mpi)	53m 36s
CI-Cuda-Host (g++, Debug, cuda, mpi)	1h 10m 46s
CI-Cuda-Host (g++, Debug, host, serial)	9m 57s
CI-Cuda-Host (g++, Debug, host, mpi)	10m 4s
CI-Cuda-Host (clang++-15, Release, cuda, serial)	25m 21s
CI-Cuda-Host (clang++-15, Release, cuda, mpi)	25m 5s
CI-Cuda-Host (clang++-15, Release, host, serial)	9m 20s
CI-Cuda-Host (clang++-15, Release, host, mpi)	9m 28s
CI-Cuda-Host (clang++-15, Debug, host, serial)	7m 17s
CI-Cuda-Host (clang++-15, Debug, host, mpi)	7m 13s
	8h 38m 53s

Provide feedback