Skip to content

Commit 251324b

Browse files
code cleanup
1 parent 136f5b5 commit 251324b

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

src/geophires_x/EconomicsSamCalculations.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -395,22 +395,21 @@ def _insert_blank_line_before(before_row_name: str) -> None:
395395
]
396396

397397
def backfill_lcoe_nominal() -> None:
398-
# FIXME WIP TODO adjust according to CAPEX_heat_electricity_plant_ratio
399398
pv_of_electricity_to_grid_backfilled_row_kwh = pv_of_electricity_to_grid_backfilled_kwh
400-
pv_of_annual_costs_backfilled_row_values_usd = pv_of_annual_costs_backfilled_row[
401-
1 if isinstance(pv_of_annual_costs_backfilled_row[0], str) else 0 :
399+
pv_of_annual_energy_costs_usd = [
400+
it * self.electricity_plant_frac_of_capex
401+
for it in pv_of_annual_costs_backfilled_row[
402+
1 if isinstance(pv_of_annual_costs_backfilled_row[0], str) else 0 :
403+
]
402404
]
403405

404406
lcoe_nominal_backfilled = []
405-
for _year in range(len(pv_of_annual_costs_backfilled_row_values_usd)):
407+
for _year in range(len(pv_of_annual_energy_costs_usd)):
406408
entry: float | str = 'NaN'
407409
if pv_of_electricity_to_grid_backfilled_row_kwh[_year] != 0:
408-
pv_annual_costs_usd = (
409-
pv_of_annual_energy_costs_at_year_0_usd
410-
if _year == 0
411-
else pv_of_annual_costs_backfilled_row_values_usd[_year]
412-
) # FIXME WIP technically inconsistent...
413-
entry = pv_annual_costs_usd * 100 / pv_of_electricity_to_grid_backfilled_row_kwh[_year]
410+
entry = (
411+
pv_of_annual_energy_costs_usd[_year] * 100 / pv_of_electricity_to_grid_backfilled_row_kwh[_year]
412+
)
414413

415414
lcoe_nominal_backfilled.append(entry)
416415

0 commit comments

Comments
 (0)