From 9d3c90655aff354fc999cf5cc34e149a55f29c42 Mon Sep 17 00:00:00 2001 From: Bill Becker Date: Mon, 23 Sep 2024 14:43:48 -0600 Subject: [PATCH] Change net_capital_costs_without_macrs to initial_capital_costs_after_incentives_without_macrs to be consistent --- CHANGELOG.md | 4 +++- src/results/proforma.jl | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19f761ba4..99a3175aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,9 @@ Classify the change according to the following categories: ## Develop 08-09-2024 ### Added -- Financial output **net_capital_costs_without_macrs** which has "net year one" CapEx after incentives except for MACRS, which helps with users defining their own "simple payback period" +- Added new file `src/core/ASHP.jl` with new technology **ASHP**, which uses electricity as input and provides heating and/or cooling as output; load balancing and technology-specific constraints have been updated and added accordingly +- In `src/core/existing_chiller.jl`, Added new atttribute **retire_in_optimal** to the **ExistingChiller** struct +- Financial output **initial_capital_costs_after_incentives_without_macrs** which has "net year one" CapEx after incentives except for MACRS, which helps with users defining their own "simple payback period" ### Changed - Improve the full test suite reporting with a verbose summary table, and update the structure to reflect long-term open-source solver usage. - Removed MacOS from the runner list and just run with Windows OS, since MacOS commonly freezes and gets cancelled. We have not seen Windows OS pass while other OS's fail. diff --git a/src/results/proforma.jl b/src/results/proforma.jl index 67567dbda..65ba456f5 100644 --- a/src/results/proforma.jl +++ b/src/results/proforma.jl @@ -33,7 +33,7 @@ return Dict( "offtaker_discounted_annual_free_cashflows" => Float64[], "offtaker_discounted_annual_free_cashflows_bau" => Float64[], "developer_annual_free_cashflows" => Float64[], - "net_capital_costs_without_macrs" => 0.0 # Initial capital costs after ibi, cbi, and ITC incentives + "initial_capital_costs_after_incentives_without_macrs" => 0.0 # Initial capital costs after ibi, cbi, and ITC incentives ) """ function proforma_results(p::REoptInputs, d::Dict) @@ -47,7 +47,7 @@ function proforma_results(p::REoptInputs, d::Dict) "offtaker_discounted_annual_free_cashflows" => Float64[], "offtaker_discounted_annual_free_cashflows_bau" => Float64[], "developer_annual_free_cashflows" => Float64[], - "net_capital_costs_without_macrs" => 0.0 + "initial_capital_costs_after_incentives_without_macrs" => 0.0 ) years = p.s.financial.analysis_years escalate_elec(val) = [-1 * val * (1 + p.s.financial.elec_cost_escalation_rate_fraction)^yr for yr in 1:years] @@ -224,7 +224,7 @@ function proforma_results(p::REoptInputs, d::Dict) total_cash_incentives = m.total_pbi * (1 - tax_rate_fraction) free_cashflow_without_year_zero = m.total_depreciation * tax_rate_fraction + total_cash_incentives + operating_expenses_after_tax free_cashflow_without_year_zero[1] += m.federal_itc - r["net_capital_costs_without_macrs"] = d["Financial"]["initial_capital_costs"] - m.total_ibi_and_cbi - m.federal_itc + r["initial_capital_costs_after_incentives_without_macrs"] = d["Financial"]["initial_capital_costs"] - m.total_ibi_and_cbi - m.federal_itc free_cashflow = append!([(-1 * d["Financial"]["initial_capital_costs"]) + m.total_ibi_and_cbi], free_cashflow_without_year_zero) # At this point the logic branches based on third-party ownership or not - see comments