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

Merge branch 'master' into fneum/line-rating

Browse Source
This commit is contained in:
Fabian Hofmann 2023-07-24 10:49:15 +02:00 committed by GitHub
commit f0057614b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@ -80,8 +80,6 @@ jobs:
- name: Test snakemake workflow - name: Test snakemake workflow
run: | run: |
conda activate pypsa-eur
conda list
snakemake -call solve_elec_networks --configfile config/test/config.electricity.yaml --rerun-triggers=mtime snakemake -call solve_elec_networks --configfile config/test/config.electricity.yaml --rerun-triggers=mtime
snakemake -call all --configfile config/test/config.overnight.yaml --rerun-triggers=mtime snakemake -call all --configfile config/test/config.overnight.yaml --rerun-triggers=mtime
snakemake -call all --configfile config/test/config.myopic.yaml --rerun-triggers=mtime snakemake -call all --configfile config/test/config.myopic.yaml --rerun-triggers=mtime

16
scripts/solve_network.py
View File

@ -280,13 +280,13 @@ def add_EQ_constraints(n, o, scaling=1e-1):
float_regex = "[0-9]*\.?[0-9]+" float_regex = "[0-9]*\.?[0-9]+"
level = float(re.findall(float_regex, o)[0]) level = float(re.findall(float_regex, o)[0])
if o[-1] == "c": if o[-1] == "c":
ggrouper = n.generators.bus.map(n.buses.country).to_xarray() ggrouper = n.generators.bus.map(n.buses.country)
lgrouper = n.loads.bus.map(n.buses.country).to_xarray() lgrouper = n.loads.bus.map(n.buses.country)
sgrouper = n.storage_units.bus.map(n.buses.country).to_xarray() sgrouper = n.storage_units.bus.map(n.buses.country)
else: else:
ggrouper = n.generators.bus.to_xarray() ggrouper = n.generators.bus
lgrouper = n.loads.bus.to_xarray() lgrouper = n.loads.bus
sgrouper = n.storage_units.bus.to_xarray() sgrouper = n.storage_units.bus
load = ( load = (
n.snapshot_weightings.generators n.snapshot_weightings.generators
@ n.loads_t.p_set.groupby(lgrouper, axis=1).sum() @ n.loads_t.p_set.groupby(lgrouper, axis=1).sum()
@ -300,7 +300,7 @@ def add_EQ_constraints(n, o, scaling=1e-1):
p = n.model["Generator-p"] p = n.model["Generator-p"]
lhs_gen = ( lhs_gen = (
(p * (n.snapshot_weightings.generators * scaling)) (p * (n.snapshot_weightings.generators * scaling))
.groupby(ggrouper) .groupby(ggrouper.to_xarray())
.sum() .sum()
.sum("snapshot") .sum("snapshot")
) )
@ -309,7 +309,7 @@ def add_EQ_constraints(n, o, scaling=1e-1):
spillage = n.model["StorageUnit-spill"] spillage = n.model["StorageUnit-spill"]
lhs_spill = ( lhs_spill = (
(spillage * (-n.snapshot_weightings.stores * scaling)) (spillage * (-n.snapshot_weightings.stores * scaling))
.groupby(sgrouper) .groupby(sgrouper.to_xarray())
.sum() .sum()
.sum("snapshot") .sum("snapshot")
) )