Removed hard coded location variables from heat 1dopt pswr
Removed hard coded location variables from heat 2dopt pswr
Merged 1d and 1d pswr heat opt functions