@@ -327,8 +327,9 @@ def get_data_DEA(tech, data_in, expectation=None):
327
327
parameters = ["efficiency" , "investment" , "Fixed O&M" ,
328
328
"Variable O&M" , "production capacity for one unit" ,
329
329
"Output capacity expansion cost" ,
330
- "Hydrogen output " ,
330
+ "Hydrogen Output " ,
331
331
"Hydrogen (% total input_e (MWh / MWh))" ,
332
+ "Hydrogen [% total input_e" ,
332
333
" - hereof recoverable for district heating (%-points of heat loss)" ,
333
334
"Cb coefficient" ,
334
335
"Cv coefficient" ,
@@ -339,8 +340,8 @@ def get_data_DEA(tech, data_in, expectation=None):
339
340
'capture rate' ,
340
341
"FT Liquids Output, MWh/MWh Total Input" ,
341
342
" - hereof recoverable for district heating (%-points of heat loss)" ,
342
- "Bio SNG ( % of fuel input)" ,
343
- "Methanol Output" ,
343
+ "Bio SNG Output [ % of fuel input]" ,
344
+ "Methanol Output" ,
344
345
"District heat Output" ,
345
346
"Electricity Output" ,
346
347
"Total O&M" ]
@@ -785,7 +786,8 @@ def clean_up_units(tech_data, value_column="", source=""):
785
786
if "methanolisation" in tech_data .index :
786
787
tech_data = tech_data .sort_index ()
787
788
tech_data .loc [('methanolisation' , 'Variable O&M' ), "unit" ] = "EUR/MWh_MeOH"
788
-
789
+
790
+ tech_data .unit = tech_data .unit .str .replace ("\)" , "" )
789
791
return tech_data
790
792
791
793
@@ -942,6 +944,7 @@ def order_data(tech_data):
942
944
(df .unit == "EUR/MWh/year" ) |
943
945
(df .unit == "EUR/MW_e, 2020" ) |
944
946
(df .unit == "EUR/MW input" ) |
947
+ (df .unit == 'EUR/MW-methanol' ) |
945
948
(df .unit == "EUR/t_N2/h" )) # air separation unit
946
949
].copy ()
947
950
if len (investment )!= 1 :
@@ -962,6 +965,7 @@ def order_data(tech_data):
962
965
(df .unit == "EUR/MW_e/y, 2020" )|
963
966
(df .unit == "EUR/MW_e/y" )|
964
967
(df .unit == "EUR/MW_FT/year" )|
968
+ (df .unit == "EUR/MWh_FT" )|
965
969
(df .unit == "EUR/MW_MeOH/year" )|
966
970
(df .unit == "EUR/MW_CH4/year" )|
967
971
(df .unit == '% of specific investment/year' )|
@@ -1033,6 +1037,7 @@ def order_data(tech_data):
1033
1037
(df .unit == "MWh_MeOH/MWh_th" ) |
1034
1038
(df .unit == "MWh_e/MWh_th" ) |
1035
1039
(df .unit == "MWh_th/MWh_th" ) |
1040
+ (df .unit == 'MWh/MWh Total Input' ) |
1036
1041
df .unit .str .contains ("MWh_FT/MWh_H2" ))
1037
1042
& (~ df .index .str .contains ("name plate" ))].copy ()
1038
1043
0 commit comments