Removed self-consumption from PPA revenue section of Cashflow, moved to Electricity purchase

[mjprilliman]

Parasitics in Cashflow

Description

The Cashflow tab previously had rows for PPA self-consumption and electricity purchases in separate sections. As the parasitic load costs are now always treated as an operating cost, the cashflows.lk script was reorganized to always have the parastic load cost appear under Electricity purchase.

Probably still requires changes for Send to Excel with Equations

*ssc changes already in develop

Type of change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules
• I have checked my code and corrected any misspellings

[cpaulgilman]

Looks good.

I will update send-to-Excel with equations with #694.

Default retail rates need to be updated for all technologies to a flat energy rate with no fixed or demand charges. For example, Empirical Trough / Single Owner has a default fixed monthly charge of $39.72 and tiered demand charges.