From 1a82b875872cb082c751fb6a436b547e48f5ba54 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 24 Mar 2022 14:30:28 +0100 Subject: [PATCH 1/5] skip iterations if no lines are expandable --- scripts/solve_network.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index b902f525..4704d179 100755 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -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: From 12a5a5f86a1c4e59929234d6cacad1a73018de2c Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 24 Mar 2022 14:34:08 +0100 Subject: [PATCH 2/5] add release notes --- doc/release_notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 3b20fbcf..79689bf5 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -62,6 +62,8 @@ Upcoming Release * New network topology extracted from the ENTSO-E interactive map. +* Iterative solving with impedance updates is skipped if there are no expandable lines. + PyPSA-Eur 0.4.0 (22th September 2021) ===================================== From 35f8b54a460a2014954e7a8e1d7e8a2de89779c2 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 24 Mar 2022 15:51:36 +0100 Subject: [PATCH 3/5] switch to Belgium for CI and tutorial --- Snakefile | 2 +- config.tutorial.yaml | 10 +++++----- test/config.test1.yaml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Snakefile b/Snakefile index a0709043..7678a401 100644 --- a/Snakefile +++ b/Snakefile @@ -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]) diff --git a/config.tutorial.yaml b/config.tutorial.yaml index ea624727..5cade102 100755 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -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 diff --git a/test/config.test1.yaml b/test/config.test1.yaml index 2986037b..27cf739c 100755 --- a/test/config.test1.yaml +++ b/test/config.test1.yaml @@ -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 From bf8cbf507eb45f9fae7fded03033f27746ee015b Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 24 Mar 2022 15:52:01 +0100 Subject: [PATCH 4/5] switch to Belgium for CI and tutorial --- test/config.test1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config.test1.yaml b/test/config.test1.yaml index 27cf739c..a9ce1e50 100755 --- a/test/config.test1.yaml +++ b/test/config.test1.yaml @@ -16,7 +16,7 @@ scenario: clusters: [5] opts: [Co2L-24H] -countries: ['DE'] +countries: ['BE'] clustering: simplify: From d94719a33db6b1a6007f2c8104729e8bc9f52c42 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 24 Mar 2022 15:53:02 +0100 Subject: [PATCH 5/5] fix tutorial and add release notes --- config.tutorial.yaml | 2 +- doc/release_notes.rst | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config.tutorial.yaml b/config.tutorial.yaml index 5cade102..225d8f78 100755 --- a/config.tutorial.yaml +++ b/config.tutorial.yaml @@ -17,7 +17,7 @@ scenario: clusters: [5] opts: [Co2L-24H] -countries: ['DE'] +countries: ['BE'] clustering: simplify: diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 3b20fbcf..f9f9967b 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -62,6 +62,9 @@ Upcoming Release * New network topology extracted from the ENTSO-E interactive map. +* 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) ===================================== @@ -104,7 +107,7 @@ PyPSA-Eur 0.4.0 (22th September 2021) [`#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