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

Merge branch 'validation' of github.com:PyPSA/pypsa-eur into validation

Browse Source
This commit is contained in:
chrstphtrs 2023-04-26 19:00:48 +02:00
commit b4d2569d3d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/solve_network.py
View File

@ -169,7 +169,7 @@ def prepare_network(n, solve_opts=None, config=None):
"Generator", "Generator",
buses_i, buses_i,
" load", " load",
bus=n.buses.index, bus=buses_i,
carrier="load", carrier="load",
sign=1e-3, # Adjust sign to measure p and p_nom in kW instead of MW sign=1e-3, # Adjust sign to measure p and p_nom in kW instead of MW
marginal_cost=load_shedding, # Eur/kWh marginal_cost=load_shedding, # Eur/kWh
@ -633,7 +633,6 @@ def solve_network(n, config, opts="", **kwargs):
solver_name=solver_name, solver_name=solver_name,
extra_functionality=extra_functionality, extra_functionality=extra_functionality,
linearized_unit_commitment=linearized_unit_commitment, linearized_unit_commitment=linearized_unit_commitment,
linearized_unit_commitment=linearized_unit_commitment,
**solver_options, **solver_options,
**kwargs, **kwargs,
) )
@ -659,19 +658,20 @@ def solve_network(n, config, opts="", **kwargs):
return n return n
# %%
if __name__ == "__main__": if __name__ == "__main__":
if "snakemake" not in globals(): if "snakemake" not in globals():
from _helpers import mock_snakemake from _helpers import mock_snakemake
snakemake = mock_snakemake( snakemake = mock_snakemake(
"solve_sector_network", "solve_network",
configfiles="test/config.overnight.yaml", # configfiles="test/config.overnight.yaml",
simpl="", simpl="",
opts="", opts="",
clusters="5", clusters="37",
ll="v1.5", ll="v1.0",
sector_opts="CO2L0-24H-T-H-B-I-A-solar+p3-dist1", sector_opts="",
planning_horizons="2030", planning_horizons="2020",
) )
configure_logging(snakemake) configure_logging(snakemake)
if "sector_opts" in snakemake.wildcards.keys(): if "sector_opts" in snakemake.wildcards.keys():