@@ -1702,7 +1702,7 @@ def add_egs_data(data):
1702
1702
"""
1703
1703
parameters = ["CO2 intensity" , "lifetime" , "efficiency residential heat" , "efficiency electricity" , "FOM" ]
1704
1704
techs = ["geothermal" ]
1705
- multi_i = pd .MultiIndex .from_product ([techs , parameters ])
1705
+ multi_i = pd .MultiIndex .from_product ([techs , parameters ], names = [ "technology" , "parameter" ] )
1706
1706
geoth_df = pd .DataFrame (index = multi_i , columns = data .columns )
1707
1707
years = [col for col in data .columns if isinstance (col , int )]
1708
1708
@@ -1855,7 +1855,7 @@ def add_SMR_data(data):
1855
1855
"""
1856
1856
parameters = ["FOM" , "investment" , "lifetime" , "efficiency" ]
1857
1857
techs = ["SMR" , "SMR CC" ]
1858
- multi_i = pd .MultiIndex .from_product ([techs , parameters ])
1858
+ multi_i = pd .MultiIndex .from_product ([techs , parameters ], names = [ "technology" , "parameter" ] )
1859
1859
SMR_df = pd .DataFrame (index = multi_i , columns = data .columns )
1860
1860
1861
1861
# efficiencies per unit in LHV (stays constant 2019 to 2050)
@@ -1912,6 +1912,7 @@ def add_mean_solar_rooftop(data):
1912
1912
rooftop ["source" ] = "Calculated. See 'further description'."
1913
1913
rooftop ["further description" ] = "Mixed investment costs based on average of 50% 'solar-rooftop commercial' and 50% 'solar-rooftop residential'"
1914
1914
# add to data
1915
+ rooftop .index .names = data .index .names
1915
1916
data = pd .concat ([data , rooftop ])
1916
1917
# add solar assuming 50% utility and 50% rooftop
1917
1918
solar = (data .loc [["solar-rooftop" , "solar-utility" ]][years ]).astype (float ).groupby (level = 1 ).mean ()
@@ -1921,6 +1922,7 @@ def add_mean_solar_rooftop(data):
1921
1922
solar ["further description" ] = "Mixed investment costs based on average of 50% 'solar-rooftop' and 50% 'solar-utility'"
1922
1923
# set multi index
1923
1924
solar = pd .concat ([solar ], keys = ["solar" ])
1925
+ solar .index .names = data .index .names
1924
1926
return pd .concat ([data , solar ])
1925
1927
1926
1928
0 commit comments