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

Resolving issue #118

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Resolving issue #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6ea7de
Small change in factor
Oct 27, 2023
10f4231
resolving faulty query
Oct 30, 2023
98bbbd5
Renaming changed keys
Nov 10, 2023
b483f04
Changing test to reflect changes in battery unit
Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/conversions/assets/demand.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
factor: 1.e-6 # gquery returns value in MW
fullLoadHours:
input: # the flh are derived from a scenario and cannot be set
gquery: flh_of_transport_truck_using_hydrogen
gquery: flh_of_transport_truck_using_electricity
factor: 1
volume:
input: # cannot be set in the ETM
Expand Down
2 changes: 1 addition & 1 deletion config/conversions/assets/storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
capacity: # we call this volume in the ETM
input: # the volume is derived from a scenario and cannot be set
gquery: energy_flexibility_mv_batteries_electricity_volume
factor: 2.77778e-10 # MWh to J
factor: 3.6e-9 # MWh to J
maxChargeRate: # we call this capacity in the ETM
input: capacity_of_energy_flexibility_mv_batteries_electricity
gquery: energy_flexibility_mv_batteries_electricity_capacity
Expand Down
10 changes: 5 additions & 5 deletions config/conversions/balancing_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ industry_heating_other_paper:
- industry_other_paper_burner_coal_share
- industry_final_demand_for_other_paper_steam_hot_water_share
industry_heating_aggregated_other:
- industry_aggregated_other_industry_network_gas_share
- industry_aggregated_other_industry_network_gas_share_energetic
- industry_aggregated_other_industry_useable_heat_share
- industry_aggregated_other_industry_crude_oil_share
- industry_aggregated_other_industry_hydrogen_share
- industry_aggregated_other_industry_wood_pellets_share
- industry_aggregated_other_industry_crude_oil_share_energetic
- industry_aggregated_other_industry_hydrogen_share_energetic
- industry_aggregated_other_industry_wood_pellets_share_energetic
- industry_aggregated_other_industry_electricity_share
- industry_aggregated_other_industry_coal_share
- industry_aggregated_other_industry_coal_share_energetic
2 changes: 1 addition & 1 deletion tests/models/parsers/test_storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def test_update_battery(esh_mmvib_macro_with_storage, app, requests_mock, helper
assert first_asset.maxChargeRate == 50.e6

# TODO Check if the volume has been updated
assert first_asset.capacity == 1.e10
assert first_asset.capacity == 7.716055555555555e-10

# Check if the number of FLH has been updated
assert first_asset.fullLoadHours == 235.
Expand Down