diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk index bee4bd3c..a62c2816 100644 --- a/rules/build_electricity.smk +++ b/rules/build_electricity.smk @@ -262,8 +262,8 @@ rule build_monthly_prices: co2_price_raw="data/validation/emission-spot-primary-market-auction-report-2019-data.xls", fuel_price_raw="data/validation/energy-price-trends-xlsx-5619002.xlsx", output: - co2_price="data/validation/CO2_price_2019.csv", - fuel_price="data/validation/monthly_fuel_price.csv", + co2_price=RESOURCES + "co2_price.csv", + fuel_price=RESOURCES + "monthly_fuel_price.csv", log: LOGS + "build_monthly_prices.log", threads: 1 @@ -350,7 +350,7 @@ rule add_electricity: hydro_capacities=ancient("data/bundle/hydro_capacities.csv"), geth_hydro_capacities="data/geth2015_hydro_capacities.csv", unit_commitment="data/unit_commitment.csv", - fuel_price="data/validation/monthly_fuel_price.csv", + fuel_price=RESOURCES + "monthly_fuel_price.csv", load=RESOURCES + "load.csv", nuts3_shapes=RESOURCES + "nuts3_shapes.geojson", output: @@ -478,7 +478,7 @@ rule prepare_network: input: RESOURCES + "networks/elec_s{simpl}_{clusters}_ec.nc", tech_costs=COSTS, - co2_price="data/validation/CO2_price_2019.csv", + co2_price=RESOURCES + "co2_price.csv", output: RESOURCES + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", log: