Merge pull request #374 from zoltanmaric/344-missing-retreive-snakemake-keys-fn
Remove usages of `retrieve_snakemake_keys`
This commit is contained in:
commit
137e8dbed6
@ -40,7 +40,7 @@ Description
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
from _helpers import configure_logging, retrieve_snakemake_keys
|
from _helpers import configure_logging
|
||||||
|
|
||||||
import atlite
|
import atlite
|
||||||
import geopandas as gpd
|
import geopandas as gpd
|
||||||
@ -73,20 +73,17 @@ if __name__ == "__main__":
|
|||||||
snakemake = mock_snakemake('build_natura_raster')
|
snakemake = mock_snakemake('build_natura_raster')
|
||||||
configure_logging(snakemake)
|
configure_logging(snakemake)
|
||||||
|
|
||||||
paths, config, wildcards, logs, out = retrieve_snakemake_keys(snakemake)
|
cutouts = snakemake.input.cutouts
|
||||||
|
|
||||||
cutouts = paths.cutouts
|
|
||||||
xs, Xs, ys, Ys = zip(*(determine_cutout_xXyY(cutout) for cutout in cutouts))
|
xs, Xs, ys, Ys = zip(*(determine_cutout_xXyY(cutout) for cutout in cutouts))
|
||||||
bounds = transform_bounds(4326, 3035, min(xs), min(ys), max(Xs), max(Ys))
|
bounds = transform_bounds(4326, 3035, min(xs), min(ys), max(Xs), max(Ys))
|
||||||
transform, out_shape = get_transform_and_shape(bounds, res=100)
|
transform, out_shape = get_transform_and_shape(bounds, res=100)
|
||||||
|
|
||||||
# adjusted boundaries
|
# adjusted boundaries
|
||||||
shapes = gpd.read_file(paths.natura).to_crs(3035)
|
shapes = gpd.read_file(snakemake.input.natura).to_crs(3035)
|
||||||
raster = ~geometry_mask(shapes.geometry, out_shape[::-1], transform)
|
raster = ~geometry_mask(shapes.geometry, out_shape[::-1], transform)
|
||||||
raster = raster.astype(rio.uint8)
|
raster = raster.astype(rio.uint8)
|
||||||
|
|
||||||
with rio.open(out[0], 'w', driver='GTiff', dtype=rio.uint8,
|
with rio.open(snakemake.output[0], 'w', driver='GTiff', dtype=rio.uint8,
|
||||||
count=1, transform=transform, crs=3035, compress='lzw',
|
count=1, transform=transform, crs=3035, compress='lzw',
|
||||||
width=raster.shape[1], height=raster.shape[0]) as dst:
|
width=raster.shape[1], height=raster.shape[0]) as dst:
|
||||||
dst.write(raster, indexes=1)
|
dst.write(raster, indexes=1)
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ Description
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
import logging
|
import logging
|
||||||
from _helpers import configure_logging, retrieve_snakemake_keys
|
from _helpers import configure_logging
|
||||||
|
|
||||||
import pypsa
|
import pypsa
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
@ -53,13 +53,11 @@ if __name__ == "__main__":
|
|||||||
clusts= '5,full', country= 'all')
|
clusts= '5,full', country= 'all')
|
||||||
configure_logging(snakemake)
|
configure_logging(snakemake)
|
||||||
|
|
||||||
paths, config, wildcards, logs, out = retrieve_snakemake_keys(snakemake)
|
|
||||||
|
|
||||||
plot_kwds = dict(drawstyle="steps-post")
|
plot_kwds = dict(drawstyle="steps-post")
|
||||||
|
|
||||||
clusters = wildcards.clusts.split(',')
|
clusters = snakemake.wildcards.clusts.split(',')
|
||||||
techs = wildcards.techs.split(',')
|
techs = snakemake.wildcards.techs.split(',')
|
||||||
country = wildcards.country
|
country = snakemake.wildcards.country
|
||||||
if country == 'all':
|
if country == 'all':
|
||||||
country = None
|
country = None
|
||||||
else:
|
else:
|
||||||
@ -68,7 +66,7 @@ if __name__ == "__main__":
|
|||||||
fig, axes = plt.subplots(1, len(techs))
|
fig, axes = plt.subplots(1, len(techs))
|
||||||
|
|
||||||
for j, cluster in enumerate(clusters):
|
for j, cluster in enumerate(clusters):
|
||||||
net = pypsa.Network(paths[j])
|
net = pypsa.Network(snakemake.input[j])
|
||||||
|
|
||||||
for i, tech in enumerate(techs):
|
for i, tech in enumerate(techs):
|
||||||
cum_p_nom_max(net, tech, country).plot(x="p_max_pu", y="cum_p_nom_max",
|
cum_p_nom_max(net, tech, country).plot(x="p_max_pu", y="cum_p_nom_max",
|
||||||
@ -81,4 +79,4 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
plt.legend(title="Cluster level")
|
plt.legend(title="Cluster level")
|
||||||
|
|
||||||
fig.savefig(out[0], transparent=True, bbox_inches='tight')
|
fig.savefig(snakemake.output[0], transparent=True, bbox_inches='tight')
|
||||||
|
@ -37,7 +37,7 @@ Description
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
from _helpers import configure_logging, retrieve_snakemake_keys
|
from _helpers import configure_logging
|
||||||
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
|
|
||||||
@ -63,8 +63,6 @@ if __name__ == "__main__":
|
|||||||
snakemake = mock_snakemake('prepare_links_p_nom', simpl='', network='elec')
|
snakemake = mock_snakemake('prepare_links_p_nom', simpl='', network='elec')
|
||||||
configure_logging(snakemake)
|
configure_logging(snakemake)
|
||||||
|
|
||||||
paths, config, wildcards, logs, out = retrieve_snakemake_keys(snakemake)
|
|
||||||
|
|
||||||
links_p_nom = pd.read_html('https://en.wikipedia.org/wiki/List_of_HVDC_projects', header=0, match="SwePol")[0]
|
links_p_nom = pd.read_html('https://en.wikipedia.org/wiki/List_of_HVDC_projects', header=0, match="SwePol")[0]
|
||||||
|
|
||||||
mw = "Power (MW)"
|
mw = "Power (MW)"
|
||||||
@ -76,4 +74,4 @@ if __name__ == "__main__":
|
|||||||
links_p_nom['x1'], links_p_nom['y1'] = extract_coordinates(links_p_nom['Converterstation 1'])
|
links_p_nom['x1'], links_p_nom['y1'] = extract_coordinates(links_p_nom['Converterstation 1'])
|
||||||
links_p_nom['x2'], links_p_nom['y2'] = extract_coordinates(links_p_nom['Converterstation 2'])
|
links_p_nom['x2'], links_p_nom['y2'] = extract_coordinates(links_p_nom['Converterstation 2'])
|
||||||
|
|
||||||
links_p_nom.dropna(subset=['x1', 'y1', 'x2', 'y2']).to_csv(out[0], index=False)
|
links_p_nom.dropna(subset=['x1', 'y1', 'x2', 'y2']).to_csv(snakemake.output[0], index=False)
|
||||||
|
Loading…
Reference in New Issue
Block a user