Add terminal year catch to scalars
Change F in last year to Fmsy
Change forecast to use Fmsy rather than F in terminal year.