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

Merge pull request #971 from koen-vg/fix-sanitize-locations

Browse Source 
Only sanitize locations when there are buses with a location
This commit is contained in:
Fabian Neumann 2024-03-19 08:26:24 +01:00 committed by GitHub
commit db4219f4d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/add_electricity.py
View File

@ -184,12 +184,13 @@ def sanitize_carriers(n, config):
def sanitize_locations(n): def sanitize_locations(n):
n.buses["x"] = n.buses.x.where(n.buses.x != 0, n.buses.location.map(n.buses.x)) if "location" in n.buses.columns:
n.buses["y"] = n.buses.y.where(n.buses.y != 0, n.buses.location.map(n.buses.y)) n.buses["x"] = n.buses.x.where(n.buses.x != 0, n.buses.location.map(n.buses.x))
n.buses["country"] = n.buses.country.where( n.buses["y"] = n.buses.y.where(n.buses.y != 0, n.buses.location.map(n.buses.y))
n.buses.country.ne("") & n.buses.country.notnull(), n.buses["country"] = n.buses.country.where(
n.buses.location.map(n.buses.country), n.buses.country.ne("") & n.buses.country.notnull(),
) n.buses.location.map(n.buses.country),
)
def add_co2_emissions(n, costs, carriers): def add_co2_emissions(n, costs, carriers):