Skip to content

Wave and floating solar updates#1883

Open
lmezilis wants to merge 35 commits intoPyPSA:masterfrom
lmezilis:wave-updates
Open

Wave and floating solar updates#1883
lmezilis wants to merge 35 commits intoPyPSA:masterfrom
lmezilis:wave-updates

Conversation

@lmezilis
Copy link
Copy Markdown

@lmezilis lmezilis commented Nov 5, 2025

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 lmezilis closed this Nov 5, 2025
@lmezilis lmezilis reopened this Nov 5, 2025
@lmezilis
Copy link
Copy Markdown
Author

lmezilis commented Nov 5, 2025

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

@fneum
Copy link
Copy Markdown
Member

fneum commented Nov 5, 2025

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.

@lmezilis
Copy link
Copy Markdown
Author

lmezilis commented Nov 7, 2025

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
Copy link
Copy Markdown
Member

lkstrp commented Nov 7, 2025

@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

lmezilis and others added 9 commits November 10, 2025 11:20
* 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>
@lmezilis
Copy link
Copy Markdown
Author

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

Copy link
Copy Markdown
Member

@fneum fneum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment thread config/test/config.electricity.yaml
Comment thread scripts/add_electricity.py Outdated
Comment thread scripts/plot_summary.py Outdated
Comment thread scripts/plot_summary.py Outdated
Comment thread .gitignore Outdated
Comment thread scripts/solve_network.py Outdated
Comment thread scripts/prepare_sector_network.py Outdated
Comment thread scripts/plot_summary.py
Comment thread scripts/add_electricity.py Outdated
Comment thread rules/build_electricity.smk Outdated
Comment thread scripts/add_electricity.py
@lmezilis lmezilis requested a review from fneum February 3, 2026 10:20
@lmezilis
Copy link
Copy Markdown
Author

@fneum Hi Fabian, I have tried to resolve the integration (ubuntu or macos) but I cannot tell what is wrong with it. I tried to update the merge just in case that is the problem but please take a look if you have time.

I decided to keep very basic changes on the config.electricity.yaml file, as it seems that it is only used for testing. Do you want me to pass all renewable changes to the config.default.yaml? I can do that as the last step of this merge. Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants