remove variables from pacpmw calculation which are already in fcsht calc

[clmould]

Description

Closes #1874

Checklist

I confirm that I have completed the following checks:

• I have justified any large differences in the regression tests caused by this pull request in the comments.
• I have added new tests where appropriate for the changes I have made.
• If I have had to change any existing unit or integration tests, I have justified this change in the pull request comments.
• If I have made documentation changes, I have checked they render correctly.
• I have added documentation for my change, if appropriate.

[mkovari]

The stellarator regression test has not converged. Any ideas?

Also the regression test results have been truncated due to their large size, so I can't see the summary at the end.

[mkovari]

Minor changes to two variables as expected. No change in the power balance - the changes only affect the power that is used to calculate the costs.