JDBetteridge/refactor arch #692

Job	Run time
pytest-mpi (3.10)	52m 14s
pytest-mpi (pytest-mpi-docker-gcc-arm)	1m 56s
pytest-mpi (pytest-mpi-docker-gcc)	2m 15s
pytest-mpi (pytest-mpi-docker-icx)	2m 15s
pytest-mpi (3.11)	51m 57s
	1h 50m 37s

Provide feedback