More modifications to test31.1 to work better on a Cray