Skip to content

Commit cdf4c8f

Browse files
committed
minor deprecations
1 parent 92787a4 commit cdf4c8f

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

config/plotting.default.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
plotting:
77
map:
88
boundaries: [-11, 30, 34, 71]
9-
color_geomap:
9+
geomap_colors:
1010
ocean: white
1111
land: white
1212
projection:

scripts/pypsa-de/additional_functionality.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ def add_capacity_limits(n, investment_year, limits_capacity, sense="maximum"):
2828
)
2929

3030
valid_components = (
31-
(c.df.index.str[:2] == ct)
32-
& (c.df.carrier.str[: len(carrier)] == carrier)
33-
& ~c.df.carrier.str.contains("thermal")
31+
(c.static.index.str[:2] == ct)
32+
& (c.static.carrier.str[: len(carrier)] == carrier)
33+
& ~c.static.carrier.str.contains("thermal")
3434
) # exclude solar thermal
3535

36-
existing_index = c.df.index[
37-
valid_components & ~c.df[attr + "_nom_extendable"]
36+
existing_index = c.static.index[
37+
valid_components & ~c.static[attr + "_nom_extendable"]
3838
]
39-
extendable_index = c.df.index[
40-
valid_components & c.df[attr + "_nom_extendable"]
39+
extendable_index = c.static.index[
40+
valid_components & c.static[attr + "_nom_extendable"]
4141
]
4242

43-
existing_capacity = c.df.loc[existing_index, attr + "_nom"].sum()
43+
existing_capacity = c.static.loc[existing_index, attr + "_nom"].sum()
4444

4545
logger.info(
4646
f"Existing {c.name} {carrier} capacity in {ct}: {existing_capacity} {units}"

scripts/pypsa-de/plot_hydrogen_network_incl_kernnetz.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ def plot_h2_map(n, regions):
227227
geomap=True,
228228
bus_sizes=bus_sizes,
229229
bus_colors=bus_colors,
230-
link_colors=color_h2_pipe,
231-
link_widths=link_widths_total,
230+
link_color=color_h2_pipe,
231+
link_width=link_widths_total,
232232
branch_components=["Link"],
233233
ax=ax,
234234
**map_opts,
@@ -237,8 +237,8 @@ def plot_h2_map(n, regions):
237237
n.plot.map(
238238
geomap=True,
239239
bus_sizes=0,
240-
link_colors=color_retrofit,
241-
link_widths=link_widths_retro,
240+
link_color=color_retrofit,
241+
link_width=link_widths_retro,
242242
branch_components=["Link"],
243243
ax=ax,
244244
**map_opts,
@@ -247,8 +247,8 @@ def plot_h2_map(n, regions):
247247
n.plot.map(
248248
geomap=True,
249249
bus_sizes=0,
250-
link_colors=color_kern,
251-
link_widths=link_widths_kern,
250+
link_color=color_kern,
251+
link_width=link_widths_kern,
252252
branch_components=["Link"],
253253
ax=ax,
254254
**map_opts,

0 commit comments

Comments
 (0)