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

Merge branch 'master' into issue-301

Browse Source
This commit is contained in:
Fabian Neumann 2022-03-25 13:46:46 +01:00 committed by GitHub
commit 03e6764a9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Snakefile
View File

@ -160,7 +160,7 @@ if config['enable'].get('build_cutout', False):
if config['enable'].get('retrieve_cutout', True):
rule retrieve_cutout:
input: HTTP.remote("zenodo.org/record/4709858/files/{cutout}.nc", keep_local=True, static=True)
input: HTTP.remote("zenodo.org/record/6382570/files/{cutout}.nc", keep_local=True, static=True)
output: "cutouts/{cutout}.nc"
run: move(input[0], output[0])

12
config.tutorial.yaml
View File

@ -17,7 +17,7 @@ scenario:
clusters: [5]
opts: [Co2L-24H]
countries: ['DE']
countries: ['BE']
clustering:
simplify:
@ -58,7 +58,7 @@ electricity:
atlite:
nprocesses: 4
cutouts:
europe-2013-era5-tutorial:
be-03-2013-era5:
module: era5
x: [4., 15.]
y: [46., 56.]
@ -66,7 +66,7 @@ atlite:
renewable:
onwind:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: wind
turbine: Vestas_V112_3MW
@ -83,7 +83,7 @@ renewable:
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-ac:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: wind
turbine: NREL_ReferenceTurbine_5MW_offshore
@ -95,7 +95,7 @@ renewable:
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-dc:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: wind
turbine: NREL_ReferenceTurbine_5MW_offshore
@ -108,7 +108,7 @@ renewable:
potential: simple # or conservative
clip_p_max_pu: 1.e-2
solar:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: pv
panel: CSi

9
doc/release_notes.rst
View File

@ -64,6 +64,13 @@ Upcoming Release
* The unused argument ``simple_hvdc_costs`` in :mod:`add_electricity` was removed.
* Iterative solving with impedance updates is skipped if there are no expandable lines.
* Switch from Germany to Belgium for continuous integration and tutorial to save resources.
* Use updated SARAH-2 and ERA5 cutouts with slightly wider scope to east and additional variables.
PyPSA-Eur 0.4.0 (22th September 2021)
=====================================
@ -105,7 +112,7 @@ PyPSA-Eur 0.4.0 (22th September 2021)
[`#261 <https://github.com/PyPSA/pypsa-eur/pull/261>`_].
* The tutorial cutout was renamed from ``cutouts/europe-2013-era5.nc`` to
``cutouts/europe-2013-era5-tutorial.nc`` to accomodate tutorial and productive
``cutouts/be-03-2013-era5.nc`` to accomodate tutorial and productive
cutouts side-by-side.
* The flag ``keep_all_available_areas`` in the configuration for renewable

7
scripts/solve_network.py
View File

@ -254,7 +254,12 @@ def solve_network(n, config, opts='', **kwargs):
n.config = config
n.opts = opts
if cf_solving.get('skip_iterations', False):
skip_iterations = cf_solving.get('skip_iterations', False)
if not n.lines.s_nom_extendable.any():
skip_iterations = True
logger.info("No expandable lines found. Skipping iterative solving.")
if skip_iterations:
network_lopf(n, solver_name=solver_name, solver_options=solver_options,
extra_functionality=extra_functionality, **kwargs)
else:

12
test/config.test1.yaml
View File

@ -16,7 +16,7 @@ scenario:
clusters: [5]
opts: [Co2L-24H]
countries: ['DE']
countries: ['BE']
clustering:
simplify:
@ -57,7 +57,7 @@ electricity:
atlite:
nprocesses: 4
cutouts:
europe-2013-era5-tutorial:
be-03-2013-era5:
module: era5
x: [4., 15.]
y: [46., 56.]
@ -65,7 +65,7 @@ atlite:
renewable:
onwind:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: wind
turbine: Vestas_V112_3MW
@ -82,7 +82,7 @@ renewable:
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-ac:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: wind
turbine: NREL_ReferenceTurbine_5MW_offshore
@ -94,7 +94,7 @@ renewable:
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-dc:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: wind
turbine: NREL_ReferenceTurbine_5MW_offshore
@ -107,7 +107,7 @@ renewable:
potential: simple # or conservative
clip_p_max_pu: 1.e-2
solar:
cutout: europe-2013-era5-tutorial
cutout: be-03-2013-era5
resource:
method: pv
panel: CSi