@@ -1522,7 +1522,7 @@ def carbon_flow(costs,year):
1522
1522
costs .loc [('electrobiofuels' , 'efficiency-biomass' ), 'source' ] = 'Stoichiometric calculation'
1523
1523
1524
1524
1525
- efuel_scale_factor = costs .loc [('BtL' , 'C stored' ), 'value' ][ 0 ] * costs .loc [('Fischer-Tropsch' , 'capture rate' ), 'value' ][ 0 ]
1525
+ efuel_scale_factor = costs .loc [('BtL' , 'C stored' ), 'value' ]* costs .loc [('Fischer-Tropsch' , 'capture rate' ), 'value' ]
1526
1526
1527
1527
costs .loc [('electrobiofuels' , 'efficiency-hydrogen' ), 'value' ] = costs .loc [('Fischer-Tropsch' , 'efficiency' ), 'value' ]\
1528
1528
/ efuel_scale_factor
@@ -2266,7 +2266,8 @@ def geometric_series(nominator, denominator=1, number_of_terms=1, start=1):
2266
2266
print ("old c_v and c_b values are assumed where given" )
2267
2267
to_add = costs_pypsa .loc [comp_missing ].drop ("year" , axis = 1 )
2268
2268
to_add .loc [:, "further description" ] = " from old pypsa cost assumptions"
2269
- to_add = to_add .drop ("geothermal" ) # more data on geothermal is added downstream, so old assumptions are redundant
2269
+ # more data on geothermal is added downstream, so old assumptions are redundant
2270
+ to_add = to_add .drop ("geothermal" )
2270
2271
# TODO check currency year from old pypsa cost assumptions
2271
2272
to_add ["currency_year" ] = 2015
2272
2273
costs_tot = pd .concat ([costs_tot , to_add ], sort = False )
@@ -2277,9 +2278,10 @@ def geometric_series(nominator, denominator=1, number_of_terms=1, start=1):
2277
2278
2278
2279
# adjust for inflation
2279
2280
techs = costs_tot .index .get_level_values (0 ).unique ()
2280
- costs_tot = adjust_for_inflation (data , techs , costs_tot .currency_year , years )
2281
+ costs_tot = adjust_for_inflation (costs_tot , techs , costs_tot .currency_year , [ "value" ] )
2281
2282
2282
2283
# format and sort
2283
2284
costs_tot .sort_index (inplace = True )
2284
- costs_tot .loc [:,'value' ] = round (costs_tot .value .astype (float ), snakemake .config .get ("ndigits" , 2 ))
2285
+ costs_tot .loc [:,'value' ] = round (costs_tot .value .astype (float ),
2286
+ snakemake .config .get ("ndigits" , 2 ))
2285
2287
costs_tot .to_csv ([v for v in snakemake .output if str (year ) in v ][0 ])
0 commit comments