Wave and floating solar updates #1883

lmezilis · 2025-11-05T11:11:07Z

Closes # (if applicable).

Changes proposed in this Pull Request

Checklist

I tested my contribution locally and it works as intended.
Code and workflow changes are sufficiently documented.
Changed dependencies are added to envs/environment.yaml.
Changes in configuration options are added in config/config.default.yaml.
Changes in configuration options are documented in doc/configtables/*.csv.
Sources of newly added data are documented in doc/data_sources.rst.
A release note doc/release_notes.rst is added.

lmezilis · 2025-11-05T11:17:56Z

Changes in configuration options are added in config/config.electricity.yaml.

fneum · 2025-11-05T12:41:03Z

Great, could you try and resolve the merge conflicts so that we can have a look? Generally, keeping the diff as small as possible will help us review.

Fix minor issues

Merge pull request PyPSA#2 from lmezilis/wave-updates

for more information, see https://pre-commit.ci

lmezilis · 2025-11-07T10:55:59Z

Can you let me know if the conflicts are resolved? Apologies for delays, but I am a bit new to github and its procedures.

lkstrp · 2025-11-07T13:40:11Z

@lmezilis They are, but you need to resolve the pre-commit checks now. See the failed check above or run it locally as described in the docs: https://pypsa-eur.readthedocs.io/en/latest/contributing.html

…mrel into wave-updates

* doc: Automatically update DAGs in documentation * doc: Update release notes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * I find working with the CI always tricky * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * some adjustments --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: lkstrp <lkstrp@pm.me>

for more information, see https://pre-commit.ci

lmezilis · 2025-11-10T14:10:12Z

@lkstrp Ok, I think I completed that, please let me know if I missed anything.

…into wave-updates

fneum

Looks mostly good. Some more cleaning up and dataset handling required before this can be merged. This will also require an update of pixi.toml as this feature depends on a new atlite version:

PyPSA/atlite#475

fneum · 2025-12-29T11:04:32Z

config/test/config.electricity.yaml

Keep the changes to an absolute minimum here and try not to change any unrelated config settings. Only changes from config.default.yaml should be listed here.

fneum · 2025-12-29T11:05:16Z

scripts/add_electricity.py

            add_missing_carriers(n, c.df.carrier)

    carrier_i = n.carriers.index
+    print(n.carriers.index)


Suggested change

print(n.carriers.index)

no print statements please

fneum · 2025-12-29T11:06:41Z

scripts/plot_summary.py

        "onshore wind",
        "offshore wind",
-        "offshore wind (AC)",
+        "offshore wind",


Why this change? Now offshore wind is duplicated.

fneum · 2025-12-29T11:06:59Z

scripts/plot_summary.py

        "solar rooftop",
        "solar",
-        "building retrofitting",
+        "floating solarbuilding retrofitting",


Suggested change

"floating solarbuilding retrofitting",

"floating solar",

"building retrofitting",

fneum · 2025-12-29T11:07:59Z

.gitignore

 /scripts/old
 /scripts/create_scenarios.py
 /config/create_scenarios.py
+# /envs/win-64.lock.yaml


Suggested change

# /envs/win-64.lock.yaml

fneum · 2025-12-29T11:09:03Z

scripts/solve_network.py

    lhs = p_nom.groupby(ext_carrier_i).sum()
    rhs = mincaps[lhs.indexes["carrier"]].rename_axis("carrier")
    n.model.add_constraints(lhs >= rhs, name="bau_mincaps")
+    logger.info("BAU is done.")


Suggested change

logger.info("BAU is done.")

not necessary

fneum · 2025-12-29T11:10:47Z

scripts/prepare_sector_network.py

+    for connection in ["farshore", "nearshore", "shallow"]:
+        tech = "wave-" + connection
+        landfall_length = landfall_lengths.get(tech, 0.0)
+        if tech not in n.generators.carrier.values:
+            continue
+        profile = snakemake.input["profile_wave-" + connection]
+        with xr.open_dataset(profile) as ds:
+            # if-statement for compatibility with old profiles
+            if "year" in ds.indexes:
+                ds = ds.sel(year=ds.year.min(), drop=True)
+
+            distance = ds["average_distance"].to_pandas()
+            submarine_cost = costs.at[tech + "-connection-submarine", "fixed"]
+            underground_cost = costs.at[tech + "-connection-underground", "fixed"]
+            connection_cost = line_length_factor * (
+                distance * submarine_cost + landfall_length * underground_cost
+            )
+
+            capital_cost = (
+                costs.at["wave", "fixed"]
+                + costs.at[tech + "-station", "fixed"]
+                + connection_cost
+            )
+
+            logger.info(
+                f"Added connection cost of {connection_cost.min():0.0f}-{connection_cost.max():0.0f} Eur/MW/a to {tech}"
+            )
+
+            n.generators.loc[n.generators.carrier == tech, "capital_cost"] = (
+                capital_cost.rename(index=lambda node: node + " " + tech)
+            )


This code is very similar to the offshore wind handling above. Are you sure this can not be integrated rather than duplicated here? DRY coding principles.

fneum · 2025-12-29T11:11:29Z

scripts/plot_summary.py

For plotting, also colours and nice names must be added to plotting.default.yaml.

fneum · 2025-12-29T11:12:45Z

scripts/add_electricity.py

-                        + costs.at[car + "-station", "capital_cost"]
-                        + connection_cost
-                    )
+            if car == "offsolar":


The code in this block contains a lot of duplications per carrier. Are you sure this can not be integrated rather than duplicated here? DRY coding principles.

fneum · 2025-12-29T11:23:23Z

rules/build_electricity.smk

        wdpa_marine="data/WDPA_WDOECM_marine.gpkg",
        gebco=lambda w: (
-            "data/bundle/gebco/GEBCO_2014_2D.nc"
+            "data/bundle/gebco/GEBCO_2023_2D.nc"


This change in dataset still needs to be properly handled. See https://pypsa-eur.readthedocs.io/en/latest/data_sources.html.

In particulary, data/versions.py must be adapted:

pypsa-eur/data/versions.csv

Lines 60 to 61 in 73fb005

"gebco","primary","2014","['latest', 'supported']","https://www.bodc.ac.uk/data/open_download/gebco/GEBCO_30SEC/zip/","The dataset will be cut for the required regions after download"

"gebco","archive","2014","['latest', 'supported']","https://zenodo.org/records/16810417/files/GEBCO_2014_2D.nc","Earlier part of databundle"

Additionally, the retrieval rule (download) must be updated correspondingly.

Could you also explain why the update is necessary? Is it because the resolution was upgraded from 30 to 15 arc-seconds? Does it have any impact?

Could we also directly update to the 2025 version while we are at it? https://www.gebco.net/data-products-gridded-bathymetry-data/gebco2025-grid

Note, that the archive version should have a spatially reduced scope to Europe. It is unnecessary to download the full 4 GB of global bathymetry for a European model. For the required total bounds, see the current GEBCO archived data.

lmezilis added 4 commits October 16, 2025 12:28

Initial commit of updated pypsa-eur-mrel

93b0944

working environment, update config, and git

ef68650

name and color corrections

ec35396

Fix minor issues

a61a41b

lmezilis closed this Nov 5, 2025

lmezilis reopened this Nov 5, 2025

lmezilis and others added 5 commits November 5, 2025 14:23

fix space

d0f2d44

Merge pull request PyPSA#2 from lmezilis/wave-updates

1d44f5e

Fix minor issues

Merge pull request PyPSA#3 from lmezilis/main

6ffd548

Merge pull request PyPSA#2 from lmezilis/wave-updates

Merge branch 'master' into wave-updates

bc7f291

[pre-commit.ci] auto fixes from pre-commit.com hooks

18dfe63

for more information, see https://pre-commit.ci

Merge branch 'master' into wave-updates

c5efabe

lmezilis and others added 9 commits November 10, 2025 11:20

Merge remote-tracking branch 'upstream/master' into wave-updates

37f4a49

Merge branch 'wave-updates' of https://github.com/lmezilis/pypsa-eur-…

2edb89e

…mrel into wave-updates

fix add_electricity costs

fa64f72

update branch

51160e7

Merge remote-tracking branch 'origin/wave-updates' into wave-updates

bc13c09

[pre-commit.ci] auto fixes from pre-commit.com hooks

2e68c83

for more information, see https://pre-commit.ci

fix imports

afcfe5d

[pre-commit.ci] auto fixes from pre-commit.com hooks

a1d9014

for more information, see https://pre-commit.ci

lmezilis and others added 3 commits November 25, 2025 13:51

swich to 'converter'

f4e8369

Merge branch 'wave-updates' of https://github.com/lmezilis/pypsa-eur …

9780427

…into wave-updates

Merge branch 'master' into wave-updates

5dddb45

fneum requested changes Dec 29, 2025

View reviewed changes

	"floating solarbuilding retrofitting",
	"floating solar",
	"building retrofitting",

	"gebco","primary","2014","['latest', 'supported']","https://www.bodc.ac.uk/data/open_download/gebco/GEBCO_30SEC/zip/","The dataset will be cut for the required regions after download"
	"gebco","archive","2014","['latest', 'supported']","https://zenodo.org/records/16810417/files/GEBCO_2014_2D.nc","Earlier part of databundle"

Wave and floating solar updates #1883

Are you sure you want to change the base?

Wave and floating solar updates #1883

Uh oh!

Conversation

lmezilis commented Nov 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes proposed in this Pull Request

Checklist

Uh oh!

lmezilis commented Nov 5, 2025

Uh oh!

fneum commented Nov 5, 2025

Uh oh!

lmezilis commented Nov 7, 2025

Uh oh!

lkstrp commented Nov 7, 2025

Uh oh!

lmezilis commented Nov 10, 2025

Uh oh!

fneum left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lmezilis commented Nov 5, 2025 •

edited

Loading