updated formula in calc_jphi
Merge branch 'master' of https://github.com/jonngwx/grad-shafranov