Merge branch 'master' of github.com:PyPSA/pypsa-eur
This commit is contained in:
commit
bbc31f42d9
@ -91,7 +91,7 @@ None.
|
|||||||
|
|
||||||
**Outputs**
|
**Outputs**
|
||||||
|
|
||||||
- ``data/load_raw.csv``
|
- ``resources/load_raw.csv``
|
||||||
|
|
||||||
|
|
||||||
Rule ``retrieve_cost_data``
|
Rule ``retrieve_cost_data``
|
||||||
|
@ -24,7 +24,7 @@ rule build_electricity_demand:
|
|||||||
countries=config["countries"],
|
countries=config["countries"],
|
||||||
load=config["load"],
|
load=config["load"],
|
||||||
input:
|
input:
|
||||||
ancient("data/load_raw.csv"),
|
ancient(RESOURCES + "load_raw.csv"),
|
||||||
output:
|
output:
|
||||||
RESOURCES + "load.csv",
|
RESOURCES + "load.csv",
|
||||||
log:
|
log:
|
||||||
@ -226,7 +226,7 @@ rule build_renewable_profiles:
|
|||||||
),
|
),
|
||||||
ship_density=lambda w: (
|
ship_density=lambda w: (
|
||||||
RESOURCES + "shipdensity_raster.tif"
|
RESOURCES + "shipdensity_raster.tif"
|
||||||
if "ship_threshold" in config["renewable"][w.technology].keys()
|
if config["renewable"][w.technology].get("ship_threshold", False)
|
||||||
else []
|
else []
|
||||||
),
|
),
|
||||||
country_shapes=RESOURCES + "country_shapes.geojson",
|
country_shapes=RESOURCES + "country_shapes.geojson",
|
||||||
|
@ -195,7 +195,7 @@ if config["enable"]["retrieve"]:
|
|||||||
static=True,
|
static=True,
|
||||||
),
|
),
|
||||||
output:
|
output:
|
||||||
"data/load_raw.csv",
|
RESOURCES + "load_raw.csv",
|
||||||
log:
|
log:
|
||||||
LOGS + "retrieve_electricity_demand.log",
|
LOGS + "retrieve_electricity_demand.log",
|
||||||
resources:
|
resources:
|
||||||
|
@ -31,7 +31,7 @@ Relevant Settings
|
|||||||
Inputs
|
Inputs
|
||||||
------
|
------
|
||||||
|
|
||||||
- ``data/load_raw.csv``:
|
- ``resources/load_raw.csv``:
|
||||||
|
|
||||||
Outputs
|
Outputs
|
||||||
-------
|
-------
|
||||||
|
@ -251,7 +251,7 @@ if __name__ == "__main__":
|
|||||||
snakemake.input.corine, codes=codes, buffer=buffer, crs=3035
|
snakemake.input.corine, codes=codes, buffer=buffer, crs=3035
|
||||||
)
|
)
|
||||||
|
|
||||||
if "ship_threshold" in params:
|
if params.get("ship_threshold"):
|
||||||
shipping_threshold = (
|
shipping_threshold = (
|
||||||
params["ship_threshold"] * 8760 * 6
|
params["ship_threshold"] * 8760 * 6
|
||||||
) # approximation because 6 years of data which is hourly collected
|
) # approximation because 6 years of data which is hourly collected
|
||||||
|
Loading…
Reference in New Issue
Block a user