Merge remote-tracking branch 'origin/main'

# Conflicts:
#	main-codes/CMM-PV-20242511.py
This commit is contained in:
Zahra-K-Moraveji 2024-12-03 12:28:43 -05:00
commit 725d6d1e48

View File

@ -180,7 +180,7 @@ def calculate_pv_system_metrics(
lcoe_export = ( lcoe_export = (
total_discounted_net_metering_income / discounted_total_building_export if discounted_total_building_export > 0 else 0) total_discounted_net_metering_income / discounted_total_building_export if discounted_total_building_export > 0 else 0)
# lcoe of the whole system compining various transactions # lcoe of the whole system combining various transactions
lcoe_system = ( lcoe_system = (
(discounted_total_self_consumption / total_transaction) * lcoe_pv + (discounted_total_self_consumption / total_transaction) * lcoe_pv +
(discounted_total_grid_purchase / total_transaction) * grid_current_tariff - (discounted_total_grid_purchase / total_transaction) * grid_current_tariff -