refactory energy calculation #185
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
han16nah
requested changes
Jun 23, 2024
| @@ -3,5 +3,5 @@ | |||
| 1,liquid_gas,kg,14.1 | |||
| 2,coal,kg,6.0 | |||
| 3,pellet,kg,5.4 | |||
| 4,woodchips,kg,5.2 | |||
| 4,wood chips,kg,5.2 | |||
There was a problem hiding this comment.
I would keep it as one word - or alternatively "wood_chips" (similar to "liquid_gas"
| @@ -122,8 +122,9 @@ def get(self, fuel_type, unit): | |||
| :return: | |||
| :rtype: | |||
| """ | |||
| print(f'fuel_type == "{fuel_type.value}" & unit == "{unit}"') | |||
There was a problem hiding this comment.
shall this print statement be kept here?
| consumption_kwh = consumption | ||
|
|
||
| # co2 equivalents for heating and electricity refer to a consumption of 1 TJ | ||
| # so consumption needs to be converted to TJ |
There was a problem hiding this comment.
These comments can be removed as we are not converting to TJ anymore
|
|
||
| # co2 equivalents for heating and electricity refer to a consumption of 1 TJ | ||
| # so consumption needs to be converted to TJ | ||
| return consumption * params.energy_share / co2e |
There was a problem hiding this comment.
should be multiplication not division! (I think we had this fixed somewhere before already?)
and comments can be removed, as we are not converting to TJ anymore (with the new emission factors)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.