Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete carrier set #653

Merged
merged 29 commits into from
Jun 29, 2023
Merged

Complete carrier set #653

merged 29 commits into from
Jun 29, 2023

Conversation

virio-andreyana
Copy link
Collaborator

@virio-andreyana virio-andreyana commented Apr 25, 2023

Closes #633

Changes proposed in this Pull Request

add the function add_missing_carrier in add_electricity in order to ensure complete set of carriers mentioned in issue #633 . The function is copied in

  • add_extra_components.py
  • add_existing_baseyear.py
  • add_extra_component.py
  • prepare_sector_network.py

Checklist

  • I tested my contribution locally and it seems to work fine.
  • Code and workflow changes are sufficiently documented.
  • Changes in configuration options are also documented in doc/configtables/*.csv.
  • A release note doc/release_notes.rst is added.

virio-andreyana and others added 7 commits April 24, 2023 05:05
Note: 
- battery charger and battery discharger has no nice name nor plot_color
- H2 electrolysis is similar to H2 Electrolysis in the tech_color
- H2 fuel cell is similar to H2 Fuel cell in the tech_color
- H2 pipeline do have have nice name and tech_color, but the addition of it depends on the link being true in config
add_missing_carrier() are applied on python script where new components are added. The function runs ideally after all of the new components are added and before add_nice_carrier_names()
@virio-andreyana virio-andreyana marked this pull request as draft April 25, 2023 22:46
@virio-andreyana virio-andreyana marked this pull request as ready for review April 27, 2023 07:23
Copy link
Contributor

@FabianHofmann FabianHofmann left a comment

Choose a reason for hiding this comment

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

Great, thanks @virio-andreyana. Did we say we want to add the carrier colors and nice names in this PR as well?

scripts/add_electricity.py Outdated Show resolved Hide resolved
Co-authored-by: Fabian Hofmann <fab.hof@gmx.de>
@virio-andreyana
Copy link
Collaborator Author

virio-andreyana commented Apr 27, 2023

Great, thanks @virio-andreyana. Did we say we want to add the carrier colors and nice names in this PR as well?

we can:

  1. embed the function add_nice_carrier_names(n, config) within add_missing_carrier(n)
  2. always run add_nice_carrier_names after add_missing_carrier
  3. merge add_nice_carrier_names with add_missing_carrier to become add_missing_carrier_with_nice_names(n, config)

The third choice looks cleaner, I.ll do that

@FabianHofmann
Copy link
Contributor

Hey @virio-andreyana

little things remaining:

WARNING:add_electricity:tech_colors for carriers ['DC', 'H2 electrolysis', 'H2 fuel cell'] not defined in config.
WARNING:add_electricity:tech_colors for carriers ['residential rural oil boiler', 'services rural oil boiler', 'residential urban decentral oil boiler', 'urban central oil boiler', 'services urban decentral oil boiler'] not defined in config.

and could you add a release note?

@virio-andreyana
Copy link
Collaborator Author

virio-andreyana commented May 5, 2023

release note

@FabianHofmann, in the release_notes.rst should I put the changes in PyPSA-Eur 0.8.0 (18th March 2023) or in a newer version?

@FabianHofmann
Copy link
Contributor

FabianHofmann commented May 5, 2023

release note

@FabianHofmann, in the release_notes.rst should I put the changes in PyPSA-Eur 0.8.0 (18th March 2023) or in a newer version?

in "Upcoming Release" https://github.com/PyPSA/pypsa-eur/blob/master/doc/release_notes.rst

@FabianHofmann
Copy link
Contributor

great thanks @virio-andreyana

Copy link
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 good. Just two points I noticed.

scripts/add_extra_components.py Show resolved Hide resolved
scripts/add_extra_components.py Outdated Show resolved Hide resolved
scripts/add_electricity.py Outdated Show resolved Hide resolved
scripts/add_electricity.py Outdated Show resolved Hide resolved
scripts/add_extra_components.py Outdated Show resolved Hide resolved
@FabianHofmann FabianHofmann enabled auto-merge June 29, 2023 14:11
@FabianHofmann FabianHofmann merged commit 89ffa87 into master Jun 29, 2023
@FabianHofmann FabianHofmann deleted the complete-carrier-set branch June 29, 2023 16:13
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.

Ensure complete set of carriers
3 participants