diff --git a/data/costs.csv b/data/costs.csv index 62204c53..330cc3bb 100644 --- a/data/costs.csv +++ b/data/costs.csv @@ -16,8 +16,7 @@ lignite,2030,lifetime,40,years,IEA2010 geothermal,2030,lifetime,40,years,IEA2010 biomass,2030,lifetime,30,years,ECF2010 in DIW DataDoc http://hdl.handle.net/10419/80348 oil,2030,lifetime,30,years,ECF2010 in DIW DataDoc http://hdl.handle.net/10419/80348 -onwind,2030,investment,1110,EUR/kWel,DEA https://ens.dk/en/our-services/projections-and-models/technology-data -onwind-landcosts,2030,investment,200,EUR/kWel,Land costs and compensation payments conservatively estimated based on DEA https://ens.dk/en/our-services/projections-and-models/technology-data +onwind,2030,investment,1040,EUR/kWel,DEA https://ens.dk/en/our-services/projections-and-models/technology-data offwind,2030,investment,1640,EUR/kWel,DEA https://ens.dk/en/our-services/projections-and-models/technology-data offwind-ac-station,2030,investment,250,EUR/kWel,DEA https://ens.dk/en/our-services/projections-and-models/technology-data offwind-ac-connection-submarine,2030,investment,2685,EUR/MW/km,DEA https://ens.dk/en/our-services/projections-and-models/technology-data diff --git a/scripts/add_electricity.py b/scripts/add_electricity.py index 573bc29f..7a32e628 100755 --- a/scripts/add_electricity.py +++ b/scripts/add_electricity.py @@ -294,9 +294,6 @@ def attach_wind_and_solar(n, costs): connection_cost) logger.info("Added connection cost of {:0.0f}-{:0.0f} Eur/MW/a to {}" .format(connection_cost.min(), connection_cost.max(), tech)) - elif suptech == 'onwind': - capital_cost = (costs.at['onwind', 'capital_cost'] + - costs.at['onwind-landcosts', 'capital_cost']) else: capital_cost = costs.at[tech, 'capital_cost']