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.

Sign up for GitHub

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

Jump to bottom

fix: full run with system v2 components #147

Merged
merged 1 commit into from
Aug 30, 2023
Merged

fix: full run with system v2 components #147

merged 1 commit into from
Aug 30, 2023

Conversation

jsolaas
Copy link
Contributor

@jsolaas jsolaas commented Aug 25, 2023

Why is this pull request needed?

ecalc model with system v2 did not run

What does this pull request change?

  • Set fuel on system v2
  • Allow system v2 types in ConsumerSystemResult
  • Calculate emissions for system v2

Issues related to this change:

@jsolaas jsolaas requested a review from a team as a code owner August 25, 2023 10:21
@jsolaas jsolaas force-pushed the fix/system-v2-run branch 2 times, most recently from af06892 to 91fb95a Compare August 25, 2023 10:57
jorgenengelsen
jorgenengelsen approved these changes Aug 28, 2023
View reviewed changes
Copy link
Contributor

@jorgenengelsen jorgenengelsen left a comment

Choose a reason for hiding this comment

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

LGTM!

src/ecalc/libraries/libecalc/common/libecalc/core/ecalc.py Outdated
Calculate emissions for fuel consumers and emitters
:param variables_map:
:param consumer_results:
:return:
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we agreed to use googles doc-string format

.../snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2.json
"typ": "STREAM_DAY",
"unit": "NOK/d",
"values": [
0.0,
Copy link
Contributor

Choose a reason for hiding this comment

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

0 co2?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

0 quota for co2, 85.8 tons co2 (rate below)

@jsolaas jsolaas merged commit 2279ef4 into main Aug 30, 2023
6 checks passed
@jsolaas jsolaas deleted the fix/system-v2-run branch August 30, 2023 12:45
@github-actions github-actions bot mentioned this pull request Aug 30, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeeeJay TeeeJay TeeeJay approved these changes

@jorgenengelsen jorgenengelsen jorgenengelsen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jsolaas @TeeeJay @jorgenengelsen