bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

clean-up after rebase

Browse Source
This commit is contained in:
cpschau 2024-04-11 16:42:19 +02:00
parent f2db3c6327
commit c68e3420c0
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/base_network.py
View File

@ -705,19 +705,13 @@ def _set_shapes(n, country_shapes, offshore_shapes):
offshore_shapes = gpd.read_file(offshore_shapes).rename(columns={"name": "idx"}) offshore_shapes = gpd.read_file(offshore_shapes).rename(columns={"name": "idx"})
offshore_shapes["type"] = "offshore" offshore_shapes["type"] = "offshore"
all_shapes = pd.concat([country_shapes, offshore_shapes], ignore_index=True) all_shapes = pd.concat([country_shapes, offshore_shapes], ignore_index=True)
<<<<<<< HEAD
=======
>>>>>>> dce7d57a (add AC & DC lines)
n.madd( n.madd(
"Shape", "Shape",
all_shapes.index, all_shapes.index,
geometry=all_shapes.geometry, geometry=all_shapes.geometry,
idx=all_shapes.idx, idx=all_shapes.idx,
type=all_shapes.type, type=all_shapes["type"],
) )
<<<<<<< HEAD
=======
# Write the AC and DC line shapes to the network.shapes component # Write the AC and DC line shapes to the network.shapes component
start_index = n.shapes.index.astype(int).max() + 1 start_index = n.shapes.index.astype(int).max() + 1
@ -778,7 +772,6 @@ def _set_shapes(n, country_shapes, offshore_shapes):
component="Link", component="Link",
type=n.links.carrier.values, type=n.links.carrier.values,
) )
>>>>>>> dce7d57a (add AC & DC lines)
def base_network( def base_network(