DEV: functionality should be identical to rev2018. Removed the quick fiw used in the spin-up so it does not end up in the code for our simulations