Skip to content

Commit 4f1f191

Browse files
JulianGeisJulianGeis
committed
revert comments, fix currency year allocation
1 parent c621c5e commit 4f1f191

File tree

1 file changed

+67
-63
lines changed

1 file changed

+67
-63
lines changed

‎scripts/compile_cost_assumptions.py

+67-63
Original file line numberDiff line numberDiff line change
@@ -65,70 +65,70 @@
6565
}
6666

6767
# [DEA-sheet-names]
68-
sheet_names = {'onwind': '20 Onshore turbines', # 2015dc
69-
'offwind': '21 Offshore turbines', # 2020dc
70-
'solar-utility': '22 Utility-scale PV', #2020dc
71-
'solar-utility single-axis tracking': '22 Utility-scale PV tracker', # 2020
72-
'solar-rooftop residential': '22 Rooftop PV residential', # 2020
73-
'solar-rooftop commercial': '22 Rooftop PV commercial', # 2020
74-
'OCGT': '52 OCGT - Natural gas', # 2015dc
75-
'CCGT': '05 Gas turb. CC, steam extract.', # 2015dc
76-
'oil': '50 Diesel engine farm', # 2015dc
77-
'biomass CHP': '09c Straw, Large, 40 degree', # 2015
78-
'biomass EOP': '09c Straw, Large, 40 degree', # 2015
79-
'biomass HOP': '09c Straw HOP', # 2015
80-
'central coal CHP': '01 Coal CHP', # 2015
81-
'central gas CHP': '04 Gas turb. simple cycle, L', # 2015
82-
'central gas CHP CC': '04 Gas turb. simple cycle, L', # 2015
83-
'central solid biomass CHP': '09a Wood Chips, Large 50 degree', # 2015
84-
'central solid biomass CHP CC': '09a Wood Chips, Large 50 degree', # 2015
85-
'central solid biomass CHP powerboost CC': '09a Wood Chips, Large 50 degree', # 2015
68+
sheet_names = {'onwind': '20 Onshore turbines',
69+
'offwind': '21 Offshore turbines',
70+
'solar-utility': '22 Utility-scale PV',
71+
'solar-utility single-axis tracking': '22 Utility-scale PV tracker',
72+
'solar-rooftop residential': '22 Rooftop PV residential',
73+
'solar-rooftop commercial': '22 Rooftop PV commercial',
74+
'OCGT': '52 OCGT - Natural gas',
75+
'CCGT': '05 Gas turb. CC, steam extract.',
76+
'oil': '50 Diesel engine farm',
77+
'biomass CHP': '09c Straw, Large, 40 degree',
78+
'biomass EOP': '09c Straw, Large, 40 degree',
79+
'biomass HOP': '09c Straw HOP',
80+
'central coal CHP': '01 Coal CHP',
81+
'central gas CHP': '04 Gas turb. simple cycle, L',
82+
'central gas CHP CC': '04 Gas turb. simple cycle, L',
83+
'central solid biomass CHP': '09a Wood Chips, Large 50 degree',
84+
'central solid biomass CHP CC': '09a Wood Chips, Large 50 degree',
85+
'central solid biomass CHP powerboost CC': '09a Wood Chips, Large 50 degree',
8686
# 'solid biomass power': '09a Wood Chips extract. plant',
8787
# 'solid biomass power CC': '09a Wood Chips extract. plant',
88-
'central air-sourced heat pump': '40 Comp. hp, airsource 3 MW', # 2015
89-
'central ground-sourced heat pump': '40 Absorption heat pump, DH', # 2015
90-
'central resistive heater': '41 Electric Boilers', # 2015
91-
'central gas boiler': '44 Natural Gas DH Only', # 2015
92-
'decentral gas boiler': '202 Natural gas boiler', # 2015
93-
'direct firing gas': '312.a Direct firing Natural Gas', # 2019dc
94-
'direct firing gas CC': '312.a Direct firing Natural Gas', # 2019dc
95-
'direct firing solid fuels': '312.b Direct firing Sold Fuels', # 2019dc
96-
'direct firing solid fuels CC': '312.b Direct firing Sold Fuels', # 2019dc
97-
'decentral ground-sourced heat pump': '207.7 Ground source existing', # 2015
98-
'decentral air-sourced heat pump': '207.3 Air to water existing', # 2015dc
88+
'central air-sourced heat pump': '40 Comp. hp, airsource 3 MW',
89+
'central ground-sourced heat pump': '40 Absorption heat pump, DH',
90+
'central resistive heater': '41 Electric Boilers',
91+
'central gas boiler': '44 Natural Gas DH Only',
92+
'decentral gas boiler': '202 Natural gas boiler',
93+
'direct firing gas': '312.a Direct firing Natural Gas',
94+
'direct firing gas CC': '312.a Direct firing Natural Gas',
95+
'direct firing solid fuels': '312.b Direct firing Sold Fuels',
96+
'direct firing solid fuels CC': '312.b Direct firing Sold Fuels',
97+
'decentral ground-sourced heat pump': '207.7 Ground source existing',
98+
'decentral air-sourced heat pump': '207.3 Air to water existing',
9999
# 'decentral resistive heater': '216 Electric heating',
100-
'central water tank storage': '140 PTES seasonal', # 2015
100+
'central water tank storage': '140 PTES seasonal',
101101
# 'decentral water tank storage': '142 Small scale hot water tank',
102-
'fuel cell': '12 LT-PEMFC CHP', # 2015
103-
'hydrogen storage underground': '151c Hydrogen Storage - Caverns', # 2015dc
104-
'hydrogen storage tank type 1 including compressor': '151a Hydrogen Storage - Tanks', # 2015dc
105-
'micro CHP': '219 LT-PEMFC mCHP - natural gas', # 2015dc
106-
'biogas' : '81 Biogas, Basic plant, small', # 2020dc
107-
'biogas CC' : '81 Biogas, Basic plant, small', # 2020dc
108-
'biogas upgrading': '82 Upgrading 3,000 Nm3 per h', # 2020dc
109-
'battery': '180 Lithium Ion Battery', # 2015
110-
'industrial heat pump medium temperature': '302.a High temp. hp Up to 125 C', # 2019dcd
111-
'industrial heat pump high temperature': '302.b High temp. hp Up to 150', # 2019dc
112-
'electric boiler steam': '310.1 Electric boiler steam ', # 2019dc
113-
'gas boiler steam': '311.1c Steam boiler Gas', # 2019dc
114-
'solid biomass boiler steam': '311.1e Steam boiler Wood', # 2019dc
115-
'solid biomass boiler steam CC': '311.1e Steam boiler Wood', # 2019dc
116-
'biomass boiler': '204 Biomass boiler, automatic', # <2018
117-
'electrolysis': '86 AEC 100 MW', # 2020dc
118-
'direct air capture': '403.a Direct air capture', # 2020dc
119-
'biomass CHP capture': '401.a Post comb - small CHP', # 2020dc
120-
'cement capture': '401.c Post comb - Cement kiln', # 2020dc
121-
'BioSNG': '84 Gasif. CFB, Bio-SNG', # 2020dc
122-
'BtL': '85 Gasif. Ent. Flow FT, liq fu ', # 2020dc
123-
'biomass-to-methanol': '97 Methanol from biomass gasif.', # 2020dc
124-
'biogas plus hydrogen': '99 SNG from methan. of biogas', # 2020dc
125-
'methanolisation': '98 Methanol from hydrogen', # 2020dc
126-
'Fischer-Tropsch': '102 Hydrogen to Jet', # 2020dc
127-
'central hydrogen CHP': '12 LT-PEMFC CHP', # 2015
128-
'Haber-Bosch': '103 Hydrogen to Ammonia', # 2015dc
129-
'air separation unit': '103 Hydrogen to Ammonia', # 2015dc
130-
'waste CHP': '08 WtE CHP, Large, 50 degree', # 2015
131-
'waste CHP CC': '08 WtE CHP, Large, 50 degree', # 2015
102+
'fuel cell': '12 LT-PEMFC CHP',
103+
'hydrogen storage underground': '151c Hydrogen Storage - Caverns',
104+
'hydrogen storage tank type 1 including compressor': '151a Hydrogen Storage - Tanks',
105+
'micro CHP': '219 LT-PEMFC mCHP - natural gas',
106+
'biogas' : '81 Biogas, Basic plant, small',
107+
'biogas CC' : '81 Biogas, Basic plant, small',
108+
'biogas upgrading': '82 Upgrading 3,000 Nm3 per h',
109+
'battery': '180 Lithium Ion Battery',
110+
'industrial heat pump medium temperature': '302.a High temp. hp Up to 125 C',
111+
'industrial heat pump high temperature': '302.b High temp. hp Up to 150',
112+
'electric boiler steam': '310.1 Electric boiler steam ',
113+
'gas boiler steam': '311.1c Steam boiler Gas',
114+
'solid biomass boiler steam': '311.1e Steam boiler Wood',
115+
'solid biomass boiler steam CC': '311.1e Steam boiler Wood',
116+
'biomass boiler': '204 Biomass boiler, automatic',
117+
'electrolysis': '86 AEC 100 MW',
118+
'direct air capture': '403.a Direct air capture',
119+
'biomass CHP capture': '401.a Post comb - small CHP',
120+
'cement capture': '401.c Post comb - Cement kiln',
121+
'BioSNG': '84 Gasif. CFB, Bio-SNG',
122+
'BtL': '85 Gasif. Ent. Flow FT, liq fu ',
123+
'biomass-to-methanol': '97 Methanol from biomass gasif.',
124+
'biogas plus hydrogen': '99 SNG from methan. of biogas',
125+
'methanolisation': '98 Methanol from hydrogen',
126+
'Fischer-Tropsch': '102 Hydrogen to Jet',
127+
'central hydrogen CHP': '12 LT-PEMFC CHP',
128+
'Haber-Bosch': '103 Hydrogen to Ammonia',
129+
'air separation unit': '103 Hydrogen to Ammonia',
130+
'waste CHP': '08 WtE CHP, Large, 50 degree',
131+
'waste CHP CC': '08 WtE CHP, Large, 50 degree',
132132
# 'electricity distribution rural': '101 2 el distri Rural',
133133
# 'electricity distribution urban': '101 4 el distri city',
134134
# 'gas distribution rural': '102 7 gas Rural',
@@ -2210,9 +2210,13 @@ def prepare_inflation_rate(fn):
22102210
data = add_carbon_capture(data, tech_data)
22112211

22122212
# adjust for inflation
2213-
data["currency_year"] = [2015 if x not in (cost_year_2020 or cost_year_2019) else 2019 if x in cost_year_2019 else 2020 for x in
2214-
data.index.get_level_values(0)]
2215-
2213+
for x in data.index.get_level_values("technology"):
2214+
if x in cost_year_2020:
2215+
data.at[x, "currency_year"] = 2020
2216+
elif x in cost_year_2019:
2217+
data.at[x, "currency_year"] = 2019
2218+
else:
2219+
data.at[x, "currency_year"] = 2015
22162220

22172221
# %% (2) -- get data from other sources which need formatting -----------------
22182222
# (a) ---------- get old pypsa costs ---------------------------------------

0 commit comments

Comments
 (0)