Move logic about whether to trigger a repartition into function and remove the

cputimes output file to avoid an MPI call each step. General tidyups
to remove unneccesary values and to keep APIs clean.