Skip to content

Prototest manual input USA#68

Merged
finozzifa merged 46 commits into
prototype-2from
issue_59_prototest_manual_input
Jan 30, 2026
Merged

Prototest manual input USA#68
finozzifa merged 46 commits into
prototype-2from
issue_59_prototest_manual_input

Conversation

@finozzifa

@finozzifa finozzifa commented Oct 20, 2025

Copy link
Copy Markdown
Member

This pull request addresses issue #59.

Changes proposed in this Pull Request

Checklist

  • Code changes are sufficiently documented; i.e. new functions contain docstrings and further explanations may be given in doc.
  • Data source for new technologies is clearly stated.
  • Newly introduced dependencies are added to environment.yaml (if applicable).
  • A note for the release notes doc/release_notes.rst of the upcoming release is included.
  • I consent to the release of this PR's code under the GPLv3 license.

@finozzifa finozzifa changed the title Issue 59 prototest manual input Prototest manual input USA Oct 20, 2025
@euronion
euronion self-requested a review October 28, 2025 10:26
@finozzifa

Copy link
Copy Markdown
Member Author

Hi @euronion,
I would like to merge this PR only after the DEA one (PR #57) has been merged.

This is because in PR #57 I have moved one method to commons.py, which I can re-use here as well.

@euronion euronion left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't understand a few things, but most things look good!

Comment thread src/technologydata/utils/carriers.txt Outdated
Comment thread src/technologydata/utils/commons.py Outdated
Comment thread test/test_commons.py
Comment thread src/technologydata/package_data/manual_input_usa/sources.json Outdated
Comment thread src/technologydata/parsers/dea_energy_storage/dea_energy_storage.py
Comment on lines +3077 to +3079
"units": "dimensionless",
"carrier": "hydrogen / fischer_tropsch",
"heating_value": "lower_heating_value",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Are you doing some unit conversion here, or is this done automatically by pint?
In the original data this is MWh_hydrogen/MWh_fischer_tropsch. Both should be LHV, i.e. heating_value should be LHV/LHV if I remember my implementation correctly.

Comment thread src/technologydata/package_data/manual_input_usa/manual_input_usa.py Outdated
Comment thread src/technologydata/parsers/manual_input_usa/manual_input_usa.py Outdated
Comment thread src/technologydata/parsers/manual_input_usa/manual_input_usa.py Outdated
Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
finozzifa and others added 20 commits January 16, 2026 14:06
…usa.py

Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
…usa.py

Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
…usa.py

Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
@finozzifa
finozzifa merged commit dd2e4b8 into prototype-2 Jan 30, 2026
2 checks passed
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.

2 participants