From f5a2a517c35e66822767fa156c4c8fa139d5a322 Mon Sep 17 00:00:00 2001 From: ppinchuk Date: Tue, 5 Mar 2024 12:12:27 -0700 Subject: [PATCH] `scaled_capital_cost` now reported in SC + tests --- reV/supply_curve/points.py | 1 + tests/test_econ_of_scale.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/reV/supply_curve/points.py b/reV/supply_curve/points.py index 7de5a3300..170f4a555 100644 --- a/reV/supply_curve/points.py +++ b/reV/supply_curve/points.py @@ -1980,6 +1980,7 @@ def economies_of_scale(cap_cost_scale, summary): summary['raw_lcoe'] = eos.raw_lcoe summary['mean_lcoe'] = eos.scaled_lcoe summary['capital_cost_scalar'] = eos.capital_cost_scalar + summary['scaled_capital_cost'] = eos.scaled_capital_cost return summary diff --git a/tests/test_econ_of_scale.py b/tests/test_econ_of_scale.py index ef9f352e2..272df05ed 100644 --- a/tests/test_econ_of_scale.py +++ b/tests/test_econ_of_scale.py @@ -162,6 +162,8 @@ def test_econ_of_scale_baseline(): sc_df = pd.read_csv(out_fp_sc + ".csv") assert np.allclose(base_df['mean_lcoe'], sc_df['mean_lcoe']) assert (sc_df['capital_cost_scalar'] == 1).all() + assert np.allclose(sc_df['mean_capital_cost'], + sc_df['scaled_capital_cost']) def test_sc_agg_econ_scale(): @@ -225,6 +227,8 @@ def test_sc_agg_econ_scale(): / aep + data['variable_operating_cost']) assert np.allclose(scalars, sc_df['capital_cost_scalar']) + assert np.allclose(scalars * sc_df['mean_capital_cost'], + sc_df['scaled_capital_cost']) assert np.allclose(true_scaled_lcoe, sc_df['mean_lcoe']) assert np.allclose(true_raw_lcoe, sc_df['raw_lcoe'])