Output method, unique equation values

Made the rest of the output function similar to the new method for consistency.
Changed how values that are specific to each calculator are passed to the actual
calculations file for determining energy needs.