diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 25db733e..423421aa 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1236,10 +1236,10 @@ def add_heat(network): bus3="co2 atmosphere", carrier="urban central gas CHP", p_nom_extendable=True, - capital_cost=costs.at['central gas CHP','fixed']*costs.at['central gas CHP','efficiency']/(1+costs.at['central gas CHP','c_v']/costs.at['central gas CHP','c_b']), + capital_cost=costs.at['central gas CHP','fixed']*costs.at['central gas CHP','efficiency'], marginal_cost=costs.at['central gas CHP','VOM'], - efficiency=costs.at['central gas CHP','efficiency']/(1+costs.at['central gas CHP','c_v']/costs.at['central gas CHP','c_b']), - efficiency2=costs.at['central gas CHP','efficiency']/(1+costs.at['central gas CHP','c_v']/costs.at['central gas CHP','c_b'])/costs.at['central gas CHP','c_b'], + efficiency=costs.at['central gas CHP','efficiency'], + efficiency2=costs.at['central gas CHP','efficiency']/costs.at['central gas CHP','c_b'], efficiency3=costs.at['gas','CO2 intensity'], lifetime=costs.at['central gas CHP','lifetime']) @@ -1252,10 +1252,10 @@ def add_heat(network): bus4="co2 stored", carrier="urban central gas CHP CCS", p_nom_extendable=True, - capital_cost=costs.at['central gas CHP CCS','fixed']*costs.at['central gas CHP CCS','efficiency']/(1+costs.at['central gas CHP CCS','c_v']/costs.at['central gas CHP CCS','c_b']), + capital_cost=costs.at['central gas CHP CCS','fixed']*costs.at['central gas CHP CCS','efficiency'], marginal_cost=costs.at['central gas CHP CCS','VOM'], - efficiency=costs.at['central gas CHP CCS','efficiency']/(1+costs.at['central gas CHP CCS','c_v']/costs.at['central gas CHP CCS','c_b']), - efficiency2=costs.at['central gas CHP CCS','efficiency']/(1+costs.at['central gas CHP CCS','c_v']/costs.at['central gas CHP CCS','c_b'])/costs.at['central gas CHP CCS','c_b'], + efficiency=costs.at['central gas CHP CCS','efficiency'], + efficiency2=costs.at['central gas CHP CCS','efficiency']/costs.at['central gas CHP CCS','c_b'], efficiency3=costs.at['gas','CO2 intensity']*(1-options["ccs_fraction"]), efficiency4=costs.at['gas','CO2 intensity']*options["ccs_fraction"], lifetime=costs.at['central gas CHP CCS','lifetime']) @@ -1456,10 +1456,10 @@ def add_biomass(network): bus2=urban_central + " urban central heat", carrier="urban central solid biomass CHP", p_nom_extendable=True, - capital_cost=costs.at['central solid biomass CHP','fixed']*costs.at['central solid biomass CHP','efficiency']/(1+costs.at['central solid biomass CHP','c_v']/costs.at['central solid biomass CHP','c_b']), + capital_cost=costs.at['central solid biomass CHP','fixed']*costs.at['central solid biomass CHP','efficiency'], marginal_cost=costs.at['central solid biomass CHP','VOM'], - efficiency=costs.at['central solid biomass CHP','efficiency']/(1+costs.at['central solid biomass CHP','c_v']/costs.at['central solid biomass CHP','c_b']), - efficiency2=costs.at['central solid biomass CHP','efficiency']/(1+costs.at['central solid biomass CHP','c_v']/costs.at['central solid biomass CHP','c_b'])/costs.at['central solid biomass CHP','c_b'], + efficiency=costs.at['central solid biomass CHP','efficiency'], + efficiency2=costs.at['central solid biomass CHP','efficiency-heat'], lifetime=costs.at['central solid biomass CHP','lifetime']) network.madd("Link", @@ -1471,10 +1471,10 @@ def add_biomass(network): bus4="co2 stored", carrier="urban central solid biomass CHP CCS", p_nom_extendable=True, - capital_cost=costs.at['central solid biomass CHP CCS','fixed']*costs.at['central solid biomass CHP CCS','efficiency']/(1+costs.at['central solid biomass CHP CCS','c_v']/costs.at['central solid biomass CHP CCS','c_b']), + capital_cost=costs.at['central solid biomass CHP CCS','fixed']*costs.at['central solid biomass CHP CCS','efficiency'], marginal_cost=costs.at['central solid biomass CHP CCS','VOM'], - efficiency=costs.at['central solid biomass CHP CCS','efficiency']/(1+costs.at['central solid biomass CHP CCS','c_v']/costs.at['central solid biomass CHP CCS','c_b']), - efficiency2=costs.at['central solid biomass CHP CCS','efficiency']/(1+costs.at['central solid biomass CHP CCS','c_v']/costs.at['central solid biomass CHP CCS','c_b'])/costs.at['central solid biomass CHP CCS','c_b'], + efficiency=costs.at['central solid biomass CHP CCS','efficiency'], + efficiency2=costs.at['central solid biomass CHP CCS','efficiency-heat'], efficiency3=-costs.at['solid biomass','CO2 intensity']*options["ccs_fraction"], efficiency4=costs.at['solid biomass','CO2 intensity']*options["ccs_fraction"], lifetime=costs.at['central solid biomass CHP CCS','lifetime'])