Move storm track output back into valout

This needs to be done any time valout is called and requires less duplication
of code if done in valout rather than both tick and amr2.