Skip to content

Commit

Permalink
some more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lisazeyen committed Jan 31, 2024
1 parent ab56beb commit 55b4ac9
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions scripts/compile_cost_assumptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ def get_data_DEA(tech, data_in, expectation=None):
'Heat input', 'Heat input', 'Electricity input', 'Eletricity input', 'Heat out',
'capture rate',
"FT Liquids Output, MWh/MWh Total Input",
" - hereof recoverable for district heating [%-points of heat loss]",
" - hereof recoverable for district heating (%-points of heat loss)",
"Bio SNG Output [% of fuel input]",
"Methanol Output",
Expand Down Expand Up @@ -1913,8 +1914,10 @@ def add_energy_storage_database(costs, data_year):
df_year = (df.year == a)
df.loc[charger_investment_filter & df_year, "value"] += agg.loc[(tech, a)]/2
df.loc[discharger_investment_filter & df_year, "value"] += agg.loc[(tech, a)]/2

df.loc[:,"technology"] = df["technology"] + "-" + df["technology_type"]

index = df.loc[df["technology_type"]!="nan"].index
df.technology_type.replace("nan", np.nan, inplace=True)
df.loc[index,"technology"] = df.loc[index, "technology"] + "-" + df.loc[index, "technology_type"]

# aggregate technology_type and unit
df = df.groupby(["technology", "unit", "year"]).agg({
Expand Down

0 comments on commit 55b4ac9

Please sign in to comment.