@@ -869,6 +869,7 @@ def get_data_DEA(
869869
870870 if tech_name == "methanolisation" :
871871 df .drop (df .loc [df .index .str .contains ("1,000 t Methanol" )].index , inplace = True )
872+ df .drop (df .loc [df .index .str .contains ("TPD" )].index , inplace = True )
872873
873874 if tech_name == "Fischer-Tropsch" :
874875 df .drop (df .loc [df .index .str .contains ("l FT Liquids" )].index , inplace = True )
@@ -964,6 +965,9 @@ def get_data_DEA(
964965 if "solid biomass power" in tech_name :
965966 df .index = df .index .str .replace ("EUR/MWeh" , "EUR/MWh" )
966967
968+ if "methanolisation" in tech_name :
969+ df .index = df .index .str .replace ("[MW-methanol/year]" , "MW_MeOH/year" )
970+
967971 if "biochar pyrolysis" in tech_name :
968972 df = biochar_pyrolysis_harmonise_dea (df )
969973
@@ -1573,6 +1577,9 @@ def clean_up_units(
15731577 technology_dataframe .unit = technology_dataframe .unit .str .replace (
15741578 "MW Methanol" , "MW_MeOH"
15751579 )
1580+ technology_dataframe .unit = technology_dataframe .unit .str .replace (
1581+ "[MW_MeOH/year]" , "MW_MeOH/year"
1582+ )
15761583 technology_dataframe .unit = technology_dataframe .unit .str .replace ("MW output" , "MW" )
15771584 technology_dataframe .unit = technology_dataframe .unit .str .replace (
15781585 "MW/year FT Liquids/year" , "MW_FT/year"
@@ -1889,10 +1896,7 @@ def order_data(years: list, technology_dataframe: pd.DataFrame) -> pd.DataFrame:
18891896 clean_df [tech_name ] = pd .DataFrame ()
18901897 switch = False
18911898 df = technology_dataframe .loc [tech_name ]
1892- if tech_name == "methanolisation" :
1893- print (df )
1894- input ('' )
1895-
1899+
18961900 # --- investment ----
18971901 investment = df [
18981902 (
@@ -1915,7 +1919,6 @@ def order_data(years: list, technology_dataframe: pd.DataFrame) -> pd.DataFrame:
19151919 | (df .unit == "EUR/MWh/year" )
19161920 | (df .unit == "EUR/MW_e, 2020" )
19171921 | (df .unit == "EUR/MW input" )
1918- | (df .unit == "EUR/MW-methanol" )
19191922 | (df .unit == "EUR/t_N2/h" ) # air separation unit
19201923 | (df .unit == "EUR/MW_biochar" )
19211924 )
0 commit comments