229
229
'Fischer-Tropsch'
230
230
]
231
231
232
- # cost_year_2019 = ['direct firing gas',
233
- # 'direct firing gas CC',
234
- # 'direct firing solid fuels',
235
- # 'direct firing solid fuels CC',
236
- # 'industrial heat pump medium temperature',
237
- # 'industrial heat pump high temperature',
238
- # 'electric boiler steam',
239
- # 'gas boiler steam',
240
- # 'solid biomass boiler steam',
241
- # 'solid biomass boiler steam CC',
242
- # ]
232
+ cost_year_2019 = ['direct firing gas' ,
233
+ 'direct firing gas CC' ,
234
+ 'direct firing solid fuels' ,
235
+ 'direct firing solid fuels CC' ,
236
+ 'industrial heat pump medium temperature' ,
237
+ 'industrial heat pump high temperature' ,
238
+ 'electric boiler steam' ,
239
+ 'gas boiler steam' ,
240
+ 'solid biomass boiler steam' ,
241
+ 'solid biomass boiler steam CC' ,
242
+ ]
243
243
244
244
245
245
# %% -------- FUNCTIONS ---------------------------------------------------
@@ -480,8 +480,8 @@ def get_data_DEA(tech, data_in, expectation=None):
480
480
df_final = df_final .ffill (axis = 1 )
481
481
482
482
df_final ["source" ] = source_dict ["DEA" ] + ", " + excel_file .replace ("inputs/" ,"" )
483
- no_drop = ["electrolysis" , "direct air capture" ,"cement capture" , "biomass CHP capture" , "BtL" , "biomass boilder steam" ]
484
- if tech in ( cost_year_2019 + cost_year_2020 ) and (not tech in no_drop ):
483
+ no_drop = ["electrolysis" , "direct air capture" ,"cement capture" , "biomass CHP capture" , "BtL" ]
484
+ if tech in cost_year_2020 and (not tech in no_drop ):
485
485
for attr in ["investment" , "Fixed O&M" ]:
486
486
to_drop = df [df .index .str .contains (attr ) &
487
487
~ df .index .str .contains ("\(\*total\)" )].index
@@ -2350,8 +2350,4 @@ def prepare_inflation_rate(fn):
2350
2350
snakemake .config .get ("ndigits" , 2 ))
2351
2351
costs_tot .to_csv ([v for v in snakemake .output if str (year ) in v ][0 ])
2352
2352
2353
-
2354
- # minimum two things missing:
2355
- # ('solid biomass boiler steam', 'efficiency')
2356
- # ('BtL', 'FOM')
2357
2353
0 commit comments