From a87b3eabf8277d776261ba7e3eb3ed29b6c5c1f8 Mon Sep 17 00:00:00 2001 From: olelod Date: Fri, 23 Jun 2023 08:51:45 +0200 Subject: [PATCH] refactor: change typ to rate_type for TimeSeriesRate --- .../test_component_name_json/waterinj.json | 4 +- .../waterinj.json | 4 +- .../test_app/test_json_true/test_v3.json | 94 ++--- .../test_full_json_v3.json | 94 ++--- .../utils/calculate_emission_intensity.py | 2 +- .../common/libecalc/common/utils/rates.py | 36 +- .../libecalc/core/consumers/generator_set.py | 2 +- .../common/libecalc/core/graph_result.py | 2 +- .../tests/core/consumers/test_genset.py | 6 +- .../core/consumers/test_legacy_consumer.py | 2 +- ...ll_consumer_with_time_slots_models_v3.json | 132 +++---- .../all_energy_usage_models_v3.json | 346 +++++++++--------- .../consumer_system_v2.json | 166 ++++----- .../test_multiple_installations.py | 2 +- 14 files changed, 446 insertions(+), 446 deletions(-) diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json/waterinj.json b/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json/waterinj.json index 780cbbeb23..94f6f42eac 100644 --- a/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json/waterinj.json +++ b/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json/waterinj.json @@ -3,6 +3,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -31,7 +32,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -114,6 +114,7 @@ "name": "Sea water injection pump", "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -142,7 +143,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json_stdout/waterinj.json b/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json_stdout/waterinj.json index 780cbbeb23..94f6f42eac 100644 --- a/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json_stdout/waterinj.json +++ b/src/ecalc/cli/tests/snapshots/test_app/test_component_name_json_stdout/waterinj.json @@ -3,6 +3,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -31,7 +32,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -114,6 +114,7 @@ "name": "Sea water injection pump", "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -142,7 +143,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_json_true/test_v3.json b/src/ecalc/cli/tests/snapshots/test_app/test_json_true/test_v3.json index ccdd1a6230..031b1194de 100644 --- a/src/ecalc/cli/tests/snapshots/test_app/test_json_true/test_v3.json +++ b/src/ecalc/cli/tests/snapshots/test_app/test_json_true/test_v3.json @@ -180,6 +180,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -208,7 +209,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 159248653.0, @@ -257,6 +257,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -285,7 +286,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 612.4948, @@ -303,6 +303,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -331,7 +332,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 419517.0, @@ -396,6 +396,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -424,7 +425,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 279678.0, @@ -473,6 +473,7 @@ ] }, "hydrocarbon_export_rate": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -501,7 +502,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 12500.0, @@ -552,6 +552,7 @@ }, "name": "model", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -580,7 +581,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.69, @@ -648,6 +648,7 @@ "componentType": "COMPRESSOR", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -676,7 +677,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 130000.0, @@ -942,6 +942,7 @@ "componentType": "COMPRESSOR", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -970,7 +971,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -1067,6 +1067,7 @@ "name": "Gas injection compressor", "parent": "e9057e3053eac8e2dca7909380050de9", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1095,7 +1096,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -1327,6 +1327,7 @@ "componentType": "PUMP", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1355,7 +1356,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ null, @@ -1493,6 +1493,7 @@ ], "parent": "e1c82c648513148fb53d7b9dcff878ca", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1521,7 +1522,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ null, @@ -1588,6 +1588,7 @@ "componentType": "GENERIC", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1616,7 +1617,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -1698,6 +1698,7 @@ "name": "Base production load", "parent": "fcfb9185a43e0755ef4816d2f4d1a098", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1726,7 +1727,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -1793,6 +1793,7 @@ "componentType": "GENERIC", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1821,7 +1822,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 7000.0, @@ -1921,6 +1921,7 @@ "componentType": "GENERIC", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1949,7 +1950,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -2031,6 +2031,7 @@ "name": "Sea water injection pump", "parent": "2c369e853d9f77089ab26d579918b199", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2059,7 +2060,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -2305,6 +2305,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2333,7 +2334,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 159248653.0, @@ -2382,6 +2382,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2410,7 +2411,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 612.4948, @@ -2428,6 +2428,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2456,7 +2457,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 419517.0, @@ -2521,6 +2521,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -2549,7 +2550,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 279678.0, @@ -2598,6 +2598,7 @@ ] }, "hydrocarbon_export_rate": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -2626,7 +2627,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 12500.0, @@ -2678,6 +2678,7 @@ "name": "Installation A", "parent": "c0cdc34263d4b970f2f3e6cd5c68324d", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2706,7 +2707,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.69, @@ -2807,6 +2807,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2835,7 +2836,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 81240853.0, @@ -2884,6 +2884,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2912,7 +2913,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 312.4648, @@ -2930,6 +2930,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2958,7 +2959,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 214017.0, @@ -3023,6 +3023,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -3051,7 +3052,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 142678.0, @@ -3134,6 +3134,7 @@ "name": "Generator set A", "parent": "e852d5d4b9101f154db921ece82a697c", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3162,7 +3163,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.69, @@ -3180,6 +3180,7 @@ ] }, "power_capacity_margin": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3208,7 +3209,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 77.31, @@ -3309,6 +3309,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3337,7 +3338,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 74022000.0, @@ -3386,6 +3386,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3414,7 +3415,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 284.7, @@ -3432,6 +3432,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3460,7 +3461,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 195000.0, @@ -3525,6 +3525,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -3553,7 +3554,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 130000.0, @@ -3698,6 +3698,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3726,7 +3727,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -3763,6 +3763,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3791,7 +3792,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -3905,6 +3905,7 @@ }, "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3933,7 +3934,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -4013,6 +4013,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4041,7 +4042,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -4078,6 +4078,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4106,7 +4107,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -4156,6 +4156,7 @@ }, "id": "e1c82c648513148fb53d7b9dcff878ca", "inlet_liquid_rate_m3_per_day": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4184,7 +4185,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 18000.0, @@ -4328,6 +4328,7 @@ }, "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4356,7 +4357,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -4424,6 +4424,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4452,7 +4453,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -4535,6 +4535,7 @@ "name": "Base production load", "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4563,7 +4564,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -4664,6 +4664,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4692,7 +4693,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 3985800.0, @@ -4741,6 +4741,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4769,7 +4770,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 15.33, @@ -4787,6 +4787,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4815,7 +4816,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 10500.0, @@ -4880,6 +4880,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -4908,7 +4909,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 7000.0, @@ -5010,6 +5010,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5038,7 +5039,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -5121,6 +5121,7 @@ "name": "Sea water injection pump", "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5149,7 +5150,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, diff --git a/src/ecalc/cli/tests/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json b/src/ecalc/cli/tests/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json index ccdd1a6230..031b1194de 100644 --- a/src/ecalc/cli/tests/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json +++ b/src/ecalc/cli/tests/snapshots/test_app/test_json_true_detailed_output/test_full_json_v3.json @@ -180,6 +180,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -208,7 +209,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 159248653.0, @@ -257,6 +257,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -285,7 +286,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 612.4948, @@ -303,6 +303,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -331,7 +332,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 419517.0, @@ -396,6 +396,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -424,7 +425,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 279678.0, @@ -473,6 +473,7 @@ ] }, "hydrocarbon_export_rate": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -501,7 +502,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 12500.0, @@ -552,6 +552,7 @@ }, "name": "model", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -580,7 +581,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.69, @@ -648,6 +648,7 @@ "componentType": "COMPRESSOR", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -676,7 +677,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 130000.0, @@ -942,6 +942,7 @@ "componentType": "COMPRESSOR", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -970,7 +971,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -1067,6 +1067,7 @@ "name": "Gas injection compressor", "parent": "e9057e3053eac8e2dca7909380050de9", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1095,7 +1096,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -1327,6 +1327,7 @@ "componentType": "PUMP", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1355,7 +1356,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ null, @@ -1493,6 +1493,7 @@ ], "parent": "e1c82c648513148fb53d7b9dcff878ca", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1521,7 +1522,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ null, @@ -1588,6 +1588,7 @@ "componentType": "GENERIC", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1616,7 +1617,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -1698,6 +1698,7 @@ "name": "Base production load", "parent": "fcfb9185a43e0755ef4816d2f4d1a098", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1726,7 +1727,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -1793,6 +1793,7 @@ "componentType": "GENERIC", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1821,7 +1822,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 7000.0, @@ -1921,6 +1921,7 @@ "componentType": "GENERIC", "component_level": "MODEL", "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1949,7 +1950,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -2031,6 +2031,7 @@ "name": "Sea water injection pump", "parent": "2c369e853d9f77089ab26d579918b199", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2059,7 +2060,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -2305,6 +2305,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2333,7 +2334,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 159248653.0, @@ -2382,6 +2382,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2410,7 +2411,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 612.4948, @@ -2428,6 +2428,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2456,7 +2457,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 419517.0, @@ -2521,6 +2521,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -2549,7 +2550,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 279678.0, @@ -2598,6 +2598,7 @@ ] }, "hydrocarbon_export_rate": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -2626,7 +2627,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 12500.0, @@ -2678,6 +2678,7 @@ "name": "Installation A", "parent": "c0cdc34263d4b970f2f3e6cd5c68324d", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2706,7 +2707,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.69, @@ -2807,6 +2807,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2835,7 +2836,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 81240853.0, @@ -2884,6 +2884,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2912,7 +2913,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 312.4648, @@ -2930,6 +2930,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2958,7 +2959,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 214017.0, @@ -3023,6 +3023,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -3051,7 +3052,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 142678.0, @@ -3134,6 +3134,7 @@ "name": "Generator set A", "parent": "e852d5d4b9101f154db921ece82a697c", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3162,7 +3163,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.69, @@ -3180,6 +3180,7 @@ ] }, "power_capacity_margin": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3208,7 +3209,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 77.31, @@ -3309,6 +3309,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3337,7 +3338,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 74022000.0, @@ -3386,6 +3386,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3414,7 +3415,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 284.7, @@ -3432,6 +3432,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3460,7 +3461,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 195000.0, @@ -3525,6 +3525,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -3553,7 +3554,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 130000.0, @@ -3698,6 +3698,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3726,7 +3727,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -3763,6 +3763,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3791,7 +3792,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -3905,6 +3905,7 @@ }, "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3933,7 +3934,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.89, @@ -4013,6 +4013,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4041,7 +4042,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -4078,6 +4078,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4106,7 +4107,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -4156,6 +4156,7 @@ }, "id": "e1c82c648513148fb53d7b9dcff878ca", "inlet_liquid_rate_m3_per_day": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4184,7 +4185,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 18000.0, @@ -4328,6 +4328,7 @@ }, "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4356,7 +4357,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -4424,6 +4424,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4452,7 +4453,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -4535,6 +4535,7 @@ "name": "Base production load", "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4563,7 +4564,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 11.8, @@ -4664,6 +4664,7 @@ }, "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4692,7 +4693,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 3985800.0, @@ -4741,6 +4741,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4769,7 +4770,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 15.33, @@ -4787,6 +4787,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4815,7 +4816,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 10500.0, @@ -4880,6 +4880,7 @@ } }, "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -4908,7 +4909,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 7000.0, @@ -5010,6 +5010,7 @@ "component_level": "CONSUMER", "emissions": {}, "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5038,7 +5039,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, @@ -5121,6 +5121,7 @@ "name": "Sea water injection pump", "parent": "df82601448d0dfff409ca827eb200bf7", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5149,7 +5150,6 @@ "2030-01-01 00:00:00", "2031-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.0, diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/calculate_emission_intensity.py b/src/ecalc/libraries/libecalc/common/libecalc/common/utils/calculate_emission_intensity.py index 94ef35925a..06b1f0a23c 100644 --- a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/calculate_emission_intensity.py +++ b/src/ecalc/libraries/libecalc/common/libecalc/common/utils/calculate_emission_intensity.py @@ -77,5 +77,5 @@ def compute_emission_intensity_by_yearly_buckets( timesteps=timesteps, values=[yearly_intensity[yearly_buckets.index(t.year)] for t in timesteps], unit=Unit.KG_SM3, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) diff --git a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/rates.py b/src/ecalc/libraries/libecalc/common/libecalc/common/utils/rates.py index 01735f700f..6602791613 100644 --- a/src/ecalc/libraries/libecalc/common/libecalc/common/utils/rates.py +++ b/src/ecalc/libraries/libecalc/common/libecalc/common/utils/rates.py @@ -435,7 +435,7 @@ def __truediv__(self, other: object) -> TimeSeriesRate: ) ), unit=unit, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) def to_volumes(self) -> TimeSeriesVolumes: @@ -538,7 +538,7 @@ def to_rate(self, regularity: Optional[List[float]] = None) -> TimeSeriesRate: values=average_rates, unit=self.unit.volume_to_rate(), regularity=regularity, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) @@ -584,7 +584,7 @@ class TimeSeriesRate(TimeSeries[float]): Stream day rates are not relevant for fuel consumption, tax and emissions. """ - typ: Optional[RateType] = RateType.STREAM_DAY + rate_type: Optional[RateType] = RateType.STREAM_DAY regularity: Optional[List[float]] @validator("regularity", pre=True, always=True) @@ -601,7 +601,7 @@ def __add__(self, other: TimeSeriesRate) -> TimeSeriesRate: if not self.unit == other.unit: raise ValueError(f"Mismatching units: '{self.unit}' != `{other.unit}`") - if not self.typ == other.typ: + if not self.rate_type == other.rate_type: raise ValueError( "Mismatching rate type. Currently you can not add stream day rates and calendar day rates." ) @@ -614,7 +614,7 @@ def __add__(self, other: TimeSeriesRate) -> TimeSeriesRate: values=list(elementwise_sum(self.values, other.values)), unit=self.unit, regularity=self.regularity, - typ=self.typ, + rate_type=self.rate_type, ) else: # Adding two TimeSeriesRate with different regularity -> New TimeSeriesRate with new regularity @@ -626,7 +626,7 @@ def __add__(self, other: TimeSeriesRate) -> TimeSeriesRate: values=list(elementwise_sum(self.values, other.values)), unit=self.unit, regularity=list(sum_calendar_day / sum_stream_day), - typ=self.typ, + rate_type=self.rate_type, ) else: raise TypeError( @@ -638,7 +638,7 @@ def extend(self, other: TimeSeriesRate) -> Self: # type: ignore[override] if not self.unit == other.unit: raise ValueError(f"Mismatching units: '{self.unit}' != `{other.unit}`") - if not self.typ == other.typ: + if not self.rate_type == other.rate_type: raise ValueError( "Mismatching rate type. Currently you can not extend stream/calendar day rates with calendar/stream day rates." ) @@ -648,7 +648,7 @@ def extend(self, other: TimeSeriesRate) -> Self: # type: ignore[override] values=self.values + other.values, unit=self.unit, regularity=self.regularity + other.regularity, # type: ignore - typ=self.typ, + rate_type=self.rate_type, ) def for_period(self, period: Period) -> Self: @@ -659,12 +659,12 @@ def for_period(self, period: Period) -> Self: values=self.values[start_index:end_index], regularity=self.regularity[start_index:end_index], # type: ignore unit=self.unit, - typ=self.typ, + rate_type=self.rate_type, ) def to_calendar_day(self) -> Self: """Convert rates to calendar day rates.""" - if self.typ == RateType.CALENDAR_DAY: + if self.rate_type == RateType.CALENDAR_DAY: return self calendar_day_rates = list( @@ -678,12 +678,12 @@ def to_calendar_day(self) -> Self: values=calendar_day_rates, regularity=self.regularity, # ignore: type unit=self.unit, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) def to_stream_day(self) -> Self: """Convert rates to stream day rates.""" - if self.typ == RateType.STREAM_DAY: + if self.rate_type == RateType.STREAM_DAY: return self stream_day_rates = list( @@ -697,7 +697,7 @@ def to_stream_day(self) -> Self: values=stream_day_rates, regularity=self.regularity, # ignore: type unit=self.unit, - typ=RateType.STREAM_DAY, + rate_type=RateType.STREAM_DAY, ) def to_volumes(self) -> TimeSeriesVolumes: @@ -773,7 +773,7 @@ def resample(self, freq: Frequency) -> TimeSeriesRate: # go from period volumes to average rate in period (regularity assumed to be 1 if not provided) new_time_series = calendar_day_volumes.to_rate(regularity=new_regularity) - if self.typ == RateType.CALENDAR_DAY: + if self.rate_type == RateType.CALENDAR_DAY: return new_time_series else: return new_time_series.to_stream_day() @@ -785,7 +785,7 @@ def __getitem__(self, indices: Union[slice, int, List[int], NDArray[np.float64]] values=self.values[indices], regularity=self.regularity[indices], # type: ignore unit=self.unit, - typ=self.typ, + rate_type=self.rate_type, ) elif isinstance(indices, int): return self.__class__( @@ -793,7 +793,7 @@ def __getitem__(self, indices: Union[slice, int, List[int], NDArray[np.float64]] values=[self.values[indices]], regularity=[self.regularity[indices]], # type: ignore unit=self.unit, - typ=self.typ, + rate_type=self.rate_type, ) elif isinstance(indices, (list, np.ndarray)): indices = list(indices) @@ -802,7 +802,7 @@ def __getitem__(self, indices: Union[slice, int, List[int], NDArray[np.float64]] values=[self.values[i] for i in indices], regularity=[self.regularity[i] for i in indices], # type: ignore unit=self.unit, - typ=self.typ, + rate_type=self.rate_type, ) raise ValueError( f"Unsupported indexing operation. Got '{type(indices)}', expected indices as a slice, single index or a list of indices" @@ -817,7 +817,7 @@ def __eq__(self, other: object) -> bool: and self.timesteps == other.timesteps and self.unit == other.unit and self.regularity == other.regularity - and self.typ == other.typ + and self.rate_type == other.rate_type ) def reindex(self, new_time_vector: Iterable[datetime]) -> TimeSeriesRate: diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/generator_set.py b/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/generator_set.py index 42bca4e179..07e4bd5e7e 100644 --- a/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/generator_set.py +++ b/src/ecalc/libraries/libecalc/common/libecalc/core/consumers/generator_set.py @@ -85,7 +85,7 @@ def evaluate( values=array_to_list(fuel_rate), unit=Unit.STANDARD_CUBIC_METER_PER_DAY, regularity=regularity, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ), ) diff --git a/src/ecalc/libraries/libecalc/common/libecalc/core/graph_result.py b/src/ecalc/libraries/libecalc/common/libecalc/core/graph_result.py index 8e6a389161..40837d434a 100644 --- a/src/ecalc/libraries/libecalc/common/libecalc/core/graph_result.py +++ b/src/ecalc/libraries/libecalc/common/libecalc/core/graph_result.py @@ -85,7 +85,7 @@ def _evaluate_installations(self, variables_map: dto.VariablesMap) -> List[libec values=hydrocarbon_export_rate, unit=Unit.STANDARD_CUBIC_METER_PER_DAY, regularity=regularity, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) sub_components = [ diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_genset.py b/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_genset.py index 080dfc9aa9..f36cb6d52e 100644 --- a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_genset.py +++ b/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_genset.py @@ -70,7 +70,7 @@ def test_genset_with_elconsumer_nan_results(genset_2mw_dto, fuel_dto): values=[0, 0, 0.6, 0.6, 0.0, 0.0], regularity=[1] * 6, unit=Unit.STANDARD_CUBIC_METER_PER_DAY, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) assert results.is_valid == TimeSeriesBoolean( timesteps=time_vector, @@ -103,7 +103,7 @@ def test_genset_outside_capacity(genset_2mw_dto, fuel_dto): values=[1, 2, 2, 2, 2, 2], regularity=[1] * 6, unit=Unit.STANDARD_CUBIC_METER_PER_DAY, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) assert results.is_valid == TimeSeriesBoolean( timesteps=time_vector, @@ -139,7 +139,7 @@ def test_genset_late_startup(genset_1000mw_late_startup_dto, fuel_dto): values=[0.0, 0.0, 10.0, 0.0, 0.0, 0.0], regularity=[1] * 6, unit=Unit.STANDARD_CUBIC_METER_PER_DAY, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) assert generator_set_result.is_valid == TimeSeriesBoolean( timesteps=time_vector, diff --git a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_legacy_consumer.py b/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_legacy_consumer.py index b7fa95bbd2..097d18a77d 100644 --- a/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_legacy_consumer.py +++ b/src/ecalc/libraries/libecalc/common/tests/core/consumers/test_legacy_consumer.py @@ -54,7 +54,7 @@ def test_fuel_consumer(tabulated_fuel_consumer): values=[2, 2, 2, 2, 0, 0], regularity=[1] * 6, unit=Unit.STANDARD_CUBIC_METER_PER_DAY, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, ) assert consumer_result.is_valid == TimeSeriesBoolean( timesteps=time_vector, diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json b/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json index 2098191952..b6a26a9648 100644 --- a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json +++ b/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_consumer_with_time_slots_models/test_all_consumer_with_time_slots_models_results/all_consumer_with_time_slots_models_v3.json @@ -3,6 +3,7 @@ "130f251299a59d4b36cc7ecb637e12d1": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -47,7 +48,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -121,6 +121,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -165,7 +166,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -216,6 +216,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -246,7 +247,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 5.0, @@ -299,6 +299,7 @@ }, "name": "el-consumer2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -329,7 +330,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 5.0, @@ -369,6 +369,7 @@ "2c04b611477cfbababf1eff9743c3334": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -413,7 +414,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -487,6 +487,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -531,7 +532,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -585,6 +585,7 @@ "3a6cd9ab6a28c10ad38e93b46963ed3a": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -629,7 +630,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -706,6 +706,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -728,7 +729,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -792,6 +792,7 @@ ], "name": "train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -814,7 +815,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -1639,6 +1639,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1661,7 +1662,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -1725,6 +1725,7 @@ ], "name": "train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1747,7 +1748,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -2572,6 +2572,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2598,7 +2599,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -2672,6 +2672,7 @@ ], "name": "train1_upgrade", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2698,7 +2699,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -3653,6 +3653,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3679,7 +3680,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -3753,6 +3753,7 @@ ], "name": "train2_upgrade", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3779,7 +3780,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -4736,6 +4736,7 @@ "2": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4758,7 +4759,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -4822,6 +4822,7 @@ ], "name": "train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4844,7 +4845,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -5669,6 +5669,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5691,7 +5692,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -5755,6 +5755,7 @@ ], "name": "train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5777,7 +5778,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -6602,6 +6602,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -6628,7 +6629,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -6702,6 +6702,7 @@ ], "name": "train1_upgrade", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -6728,7 +6729,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -7683,6 +7683,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7709,7 +7710,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -7783,6 +7783,7 @@ ], "name": "train2_upgrade", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7809,7 +7810,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -8812,6 +8812,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8856,7 +8857,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -8907,6 +8907,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8929,7 +8930,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -8993,6 +8993,7 @@ ], "name": "train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9015,7 +9016,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -9840,6 +9840,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9862,7 +9863,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -9926,6 +9926,7 @@ ], "name": "train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9948,7 +9949,6 @@ "2017-01-01 00:00:00", "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -10773,6 +10773,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -10799,7 +10800,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -10873,6 +10873,7 @@ ], "name": "train1_upgrade", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -10899,7 +10900,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -11854,6 +11854,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -11880,7 +11881,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -11954,6 +11954,7 @@ ], "name": "train2_upgrade", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -11980,7 +11981,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -12939,6 +12939,7 @@ "75e450e0716f5035d2ba5af0acdb0a66": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -12983,7 +12984,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 4.49989998, @@ -13083,6 +13083,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13127,7 +13128,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 4.49989998, @@ -13230,6 +13230,7 @@ "7f11ce5c79ea179a21b672ec17b87787": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13274,7 +13275,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -13348,6 +13348,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13392,7 +13393,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -13443,6 +13443,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13473,7 +13474,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 5.0, @@ -13526,6 +13526,7 @@ }, "name": "el-consumer4", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13556,7 +13557,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 5.0, @@ -13596,6 +13596,7 @@ "a8d3e56e32a9aaf28130d776d0a4f0e6": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -13640,7 +13641,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 4.34498971, @@ -13714,6 +13714,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13758,7 +13759,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.34498971, @@ -13784,6 +13784,7 @@ ] }, "power_capacity_margin": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13828,7 +13829,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 295.65501, @@ -13882,6 +13882,7 @@ "be2610ddae7a0835fe1cf4eed18dda73": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13926,7 +13927,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -14047,6 +14047,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -14091,7 +14092,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -14164,6 +14164,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -14208,7 +14209,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -14259,6 +14259,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -14289,7 +14290,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 2.45889658, @@ -14373,6 +14373,7 @@ ], "name": "el-consumer-simple-compressor-model-with-timeslots", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -14403,7 +14404,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 2.45889658, @@ -15492,6 +15492,7 @@ "dce9ee3d6802b4096b59c91642b5d6e0": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -15536,7 +15537,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 0.0, @@ -15610,6 +15610,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -15654,7 +15655,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -15680,6 +15680,7 @@ ] }, "power_capacity_margin": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -15724,7 +15725,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -15778,6 +15778,7 @@ "f935bb4a2425f11689d8b4e685bd1274": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -15822,7 +15823,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -15896,6 +15896,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -15940,7 +15941,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -15991,13 +15991,13 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2017-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 5.0 @@ -16014,13 +16014,13 @@ }, "name": "el-consumer1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2017-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 5.0 @@ -16032,6 +16032,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16048,7 +16049,6 @@ "2022-01-01 00:00:00", "2023-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 2.45889658, @@ -16097,6 +16097,7 @@ ], "name": "el-consumer1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16113,7 +16114,6 @@ "2022-01-01 00:00:00", "2023-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 2.45889658, @@ -16743,6 +16743,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16759,7 +16760,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -16791,6 +16791,7 @@ }, "name": "el-consumer1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16807,7 +16808,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -16836,6 +16836,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16880,7 +16881,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -16906,6 +16906,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16950,7 +16951,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 0.00989978, @@ -16976,6 +16976,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17020,7 +17021,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 6.79484897, @@ -17073,6 +17073,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17117,7 +17118,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -17143,6 +17143,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17187,7 +17188,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 0.00955898, @@ -17213,6 +17213,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17257,7 +17258,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 6.56093447, @@ -17310,6 +17310,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17354,7 +17355,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -17380,6 +17380,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17424,7 +17425,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 0.0, @@ -17450,6 +17450,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17494,7 +17495,6 @@ "2028-01-01 00:00:00", "2029-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json b/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json index abca4d163b..0e5d12ab63 100644 --- a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json +++ b/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_all_energy_usage_models/test_all_results/all_energy_usage_models_v3.json @@ -3,6 +3,7 @@ "0483da6ec3712906c43a86dc07ba7750": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -15,7 +16,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 20.2942165, @@ -56,6 +56,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -68,7 +69,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 20.2942165, @@ -93,6 +93,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -105,7 +106,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.3637907, @@ -124,6 +124,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -136,7 +137,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 20.2942165, @@ -175,6 +175,7 @@ ], "name": "simplified_compressor_train_predefined_variable_speed_charts_with_gerg_fluid", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -187,7 +188,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 20.2942165, @@ -969,6 +969,7 @@ "09c1b79cf6cf1ef0773a194679246a4a": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -981,7 +982,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 1000000.0, @@ -1007,6 +1007,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1019,7 +1020,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 354.217624, @@ -1029,6 +1029,7 @@ ] }, "power_capacity_margin": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1041,7 +1042,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 645.782376, @@ -1063,6 +1063,7 @@ "16cc71fd6280071169c79bac6b315727": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1075,7 +1076,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3646265, @@ -1116,6 +1116,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1128,7 +1129,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3646265, @@ -1153,6 +1153,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1165,7 +1166,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1.60702221, @@ -1184,6 +1184,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1196,7 +1197,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3646265, @@ -1235,6 +1235,7 @@ ], "name": "single_speed_compressor_train_asv_pressure_control", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1247,7 +1248,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3646265, @@ -1757,6 +1757,7 @@ "1a38d89e991650e59d64af81ba93203a": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1769,7 +1770,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 19.7079286, @@ -1810,6 +1810,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1822,7 +1823,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 19.7079286, @@ -1847,6 +1847,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1859,7 +1860,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.48988989, @@ -1878,6 +1878,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1890,7 +1891,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 19.7079286, @@ -1929,6 +1929,7 @@ ], "name": "simplified_variable_speed_compressor_train_known_stages_consumer", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -1941,7 +1942,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 19.7079286, @@ -2723,6 +2723,7 @@ "2525d41304f16da944f36a122c9b907e": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2735,7 +2736,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.0083096, @@ -2776,6 +2776,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2788,7 +2789,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.0083096, @@ -2813,6 +2813,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2825,7 +2826,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.8059809, @@ -2844,6 +2844,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2856,7 +2857,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.0083096, @@ -2895,6 +2895,7 @@ ], "name": "variable_speed_compressor_train_predefined_charts", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -2907,7 +2908,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.0083096, @@ -3689,6 +3689,7 @@ "3a6cd9ab6a28c10ad38e93b46963ed3a": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3701,7 +3702,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 107.877791, @@ -3730,6 +3730,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3742,7 +3743,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -3781,6 +3781,7 @@ ], "name": "simplified_train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -3793,7 +3794,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -4571,6 +4571,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4583,7 +4584,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -4622,6 +4622,7 @@ ], "name": "simplified_train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -4634,7 +4635,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -5428,6 +5428,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5440,7 +5441,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 107.877791, @@ -5459,6 +5459,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5471,7 +5472,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -5510,6 +5510,7 @@ ], "name": "simplified_train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -5522,7 +5523,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -6300,6 +6300,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -6312,7 +6313,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -6351,6 +6351,7 @@ ], "name": "simplified_train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -6363,7 +6364,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 51.2419508, @@ -7145,6 +7145,7 @@ "411f7ef502a8522a87e596f57650e3b6": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7157,7 +7158,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.1282001, @@ -7198,6 +7198,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7210,7 +7211,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 22.1282001, @@ -7235,6 +7235,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7247,7 +7248,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 8.13399927, @@ -7266,6 +7266,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7278,7 +7279,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.0217901, @@ -7317,6 +7317,7 @@ ], "name": "generic_from_design_point_compressor_train_consumer", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7329,7 +7330,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.0217901, @@ -7901,6 +7901,7 @@ "660efc4b0fee948b3c8ae93e48b9e3bd": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7913,7 +7914,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -7924,6 +7924,7 @@ }, "id": "660efc4b0fee948b3c8ae93e48b9e3bd", "inlet_liquid_rate_m3_per_day": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -7936,7 +7937,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 31977.0, @@ -8006,6 +8006,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8018,7 +8019,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -8037,6 +8037,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8049,7 +8050,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -8099,6 +8099,7 @@ 20.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8111,7 +8112,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -8133,6 +8133,7 @@ "6661da8a3a8ab9009bcf9d80af31ac66": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -8145,7 +8146,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 12035.2425, @@ -8186,6 +8186,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8198,7 +8199,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.0352425, @@ -8223,6 +8223,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8235,7 +8236,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -8254,6 +8254,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8266,7 +8267,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 12035.2425, @@ -8300,6 +8300,7 @@ "max_standard_rate": null, "name": "single_1d_compressor_sampled", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8312,7 +8313,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.0352425, @@ -8446,6 +8446,7 @@ "6b902f3d8a99f9b2b6a772de06365413": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8458,7 +8459,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -8484,6 +8484,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8496,7 +8497,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -8515,6 +8515,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8525,7 +8526,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1.0, @@ -8548,6 +8548,7 @@ }, "name": "late_start_consumer_evolving_type", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8558,7 +8559,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1.0, @@ -8578,6 +8578,7 @@ "75e47fc1f0b50c9faa627e944c2e6c29": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8590,7 +8591,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.51474, @@ -8616,6 +8616,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8628,7 +8629,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.51474, @@ -8647,6 +8647,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8659,7 +8660,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.51474, @@ -8685,6 +8685,7 @@ }, "name": "salt_water_injection_tabular", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8697,7 +8698,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.51474, @@ -8719,6 +8719,7 @@ "85018f936c624deebda36140d657320e": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8731,7 +8732,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -8742,6 +8742,7 @@ }, "id": "85018f936c624deebda36140d657320e", "inlet_liquid_rate_m3_per_day": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8754,7 +8755,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 31977.0, @@ -8824,6 +8824,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8836,7 +8837,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -8855,6 +8855,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8867,7 +8868,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -8917,6 +8917,7 @@ 200.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8929,7 +8930,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -8951,6 +8951,7 @@ "9373ec3ca83df3daafd79ef08aad83bf": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -8963,7 +8964,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.5450576, @@ -9004,6 +9004,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9016,7 +9017,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.5450576, @@ -9041,6 +9041,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9053,7 +9054,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1.6746971, @@ -9072,6 +9072,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9084,7 +9085,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.5450576, @@ -9123,6 +9123,7 @@ ], "name": "single_speed_compressor_train_downstream_choke_pressure_control", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9135,7 +9136,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.5450576, @@ -9645,6 +9645,7 @@ "95b05fbb1aa74c04ca2e937d43a05f6f": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -9657,7 +9658,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 10000.0, @@ -9693,6 +9693,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -9705,7 +9706,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 10000.0, @@ -9744,6 +9744,7 @@ "97c4f13fc5be30c816dba44919774c8f": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -9756,7 +9757,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 0.0, @@ -9785,13 +9785,13 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491 @@ -9815,13 +9815,13 @@ ], "name": "train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859 @@ -10425,13 +10425,13 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491 @@ -10455,13 +10455,13 @@ ], "name": "train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859 @@ -11065,13 +11065,13 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491 @@ -11095,13 +11095,13 @@ ], "name": "train3", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859 @@ -11705,6 +11705,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -11713,7 +11714,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491, @@ -11742,6 +11742,7 @@ ], "name": "train1_upgraded", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -11750,7 +11751,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859, @@ -12425,6 +12425,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -12433,7 +12434,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491, @@ -12462,6 +12462,7 @@ ], "name": "train2_upgraded", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -12470,7 +12471,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859, @@ -13161,6 +13161,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -13173,7 +13174,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -13192,13 +13192,13 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491 @@ -13222,13 +13222,13 @@ ], "name": "train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859 @@ -13832,13 +13832,13 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491 @@ -13862,13 +13862,13 @@ ], "name": "train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859 @@ -14472,13 +14472,13 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491 @@ -14502,13 +14502,13 @@ ], "name": "train3", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0 ], "timesteps": [ "2018-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859 @@ -15112,6 +15112,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -15120,7 +15121,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491, @@ -15149,6 +15149,7 @@ ], "name": "train1_upgraded", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -15157,7 +15158,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859, @@ -15832,6 +15832,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -15840,7 +15841,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 137753.491, @@ -15869,6 +15869,7 @@ ], "name": "train2_upgraded", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -15877,7 +15878,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.8850859, @@ -16556,6 +16556,7 @@ "a6047a2739f3f210157a465655cb5f47": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16568,7 +16569,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 16.1858243, @@ -16609,6 +16609,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16621,7 +16622,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 16.1858243, @@ -16646,6 +16646,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16658,7 +16659,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 12.6129669, @@ -16677,6 +16677,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16689,7 +16690,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 16.1858243, @@ -16728,6 +16728,7 @@ ], "name": "single_speed_compressor_train_downstream_choke_pressure_control_maximum_discharge_pressure", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -16740,7 +16741,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 16.1858243, @@ -17250,6 +17250,7 @@ "a9f3690992156d894330001b08856c80": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17262,7 +17263,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 68.2046767, @@ -17303,6 +17303,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17315,7 +17316,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 68.2046767, @@ -17340,6 +17340,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17352,7 +17353,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 57.7508397, @@ -17371,6 +17371,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17383,7 +17384,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 64.7944428, @@ -17417,6 +17417,7 @@ "max_standard_rate": null, "name": "variable_speed_compressor_train_multiple_input_streams_and_interstage_pressure", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -17429,7 +17430,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 64.7944428, @@ -19356,6 +19356,7 @@ "c516c0cfec912e94f1dc2a840d1828ef": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -19368,7 +19369,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 25337.3526, @@ -19397,6 +19397,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -19409,7 +19410,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 12035.2425, @@ -19443,6 +19443,7 @@ "max_standard_rate": null, "name": "sampled_train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -19455,7 +19456,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.0352425, @@ -19585,6 +19585,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -19597,7 +19598,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 12035.2425, @@ -19631,6 +19631,7 @@ "max_standard_rate": null, "name": "sampled_train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -19643,7 +19644,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.0352425, @@ -19789,6 +19789,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -19801,7 +19802,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 6.38998421, @@ -19820,6 +19820,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -19832,7 +19833,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 12035.2425, @@ -19866,6 +19866,7 @@ "max_standard_rate": null, "name": "sampled_train1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -19878,7 +19879,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.0352425, @@ -20008,6 +20008,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -20020,7 +20021,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 12035.2425, @@ -20054,6 +20054,7 @@ "max_standard_rate": null, "name": "sampled_train2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -20066,7 +20067,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.0352425, @@ -20200,6 +20200,7 @@ "ca0daca5e5588cdb5d4c28679d12fc43": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -20212,7 +20213,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 136417.167, @@ -20253,6 +20253,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -20265,7 +20266,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.6609385, @@ -20290,6 +20290,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -20302,7 +20303,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.53116559, @@ -20321,6 +20321,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -20333,7 +20334,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 136417.167, @@ -20372,6 +20372,7 @@ ], "name": "turbine_driven_compressor_train", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -20384,7 +20385,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 21.6609385, @@ -21205,6 +21205,7 @@ "cb52faa26d48a2b1eb53a125f5fad3c3": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0, @@ -21217,7 +21218,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 3035.2425, @@ -21253,6 +21253,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -21265,7 +21266,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 3035.2425, @@ -21304,6 +21304,7 @@ "d464e63df76695dda685e43c7acf2dbb": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -21316,7 +21317,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 12.8877908, @@ -21357,6 +21357,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -21369,7 +21370,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 12.8877908, @@ -21394,6 +21394,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -21406,7 +21407,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -21425,6 +21425,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -21437,7 +21438,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 12.8877908, @@ -21476,6 +21476,7 @@ ], "name": "simplified_variable_speed_compressor_train_unknown_stages_consumer", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -21488,7 +21489,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 12.8877908, @@ -22060,6 +22060,7 @@ "d750abf749618fbe4373515716ded093": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22072,7 +22073,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.31578947, @@ -22098,6 +22098,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22110,7 +22111,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.31578947, @@ -22129,6 +22129,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22141,7 +22142,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.1, @@ -22167,6 +22167,7 @@ }, "name": "deh", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22179,7 +22180,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.1, @@ -22201,6 +22201,7 @@ "dbd79a28f238ca6caaeb4e7b08aeeb80": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22213,7 +22214,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -22239,6 +22239,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22251,7 +22252,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -22270,6 +22270,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22280,7 +22281,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1.0, @@ -22303,6 +22303,7 @@ }, "name": "late_start_consumer", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22313,7 +22314,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1.0, @@ -22333,6 +22333,7 @@ "e9493e3d0f8696ed78b96bef050376c3": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22345,7 +22346,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 10.8615204, @@ -22374,6 +22374,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22386,7 +22387,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 10.3184444, @@ -22436,6 +22436,7 @@ 200.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22448,7 +22449,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 10.3184444, @@ -22466,6 +22466,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22478,7 +22479,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -22528,6 +22528,7 @@ 200.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22540,7 +22541,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -22560,6 +22560,7 @@ "2": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22572,7 +22573,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 8.6162244, @@ -22622,6 +22622,7 @@ 200.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22634,7 +22635,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 8.6162244, @@ -22652,6 +22652,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22664,7 +22665,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 8.6162244, @@ -22714,6 +22714,7 @@ 200.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22726,7 +22727,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 8.6162244, @@ -22760,6 +22760,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22772,7 +22773,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 10.8615204, @@ -22791,6 +22791,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22803,7 +22804,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 10.3184444, @@ -22853,6 +22853,7 @@ 200.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22865,7 +22866,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 10.3184444, @@ -22883,6 +22883,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22895,7 +22896,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -22945,6 +22945,7 @@ 200.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22957,7 +22958,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -22979,6 +22979,7 @@ "ec9874c7d040fe21bdac26d41ee1a9b5": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -22991,7 +22992,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3211519, @@ -23032,6 +23032,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23044,7 +23045,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3211519, @@ -23069,6 +23069,7 @@ ] }, "recirculation_loss": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23081,7 +23082,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1.5079505, @@ -23100,6 +23100,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23112,7 +23113,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3211519, @@ -23151,6 +23151,7 @@ ], "name": "single_speed_compressor_train_upstream_choke_pressure_control", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23163,7 +23164,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 15.3211519, @@ -23676,6 +23676,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23688,7 +23689,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -23698,6 +23698,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23710,7 +23711,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 2200.0, @@ -23720,6 +23720,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23732,7 +23733,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 1510000.0, @@ -23753,6 +23753,7 @@ "ch4": { "name": "ch4", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23765,7 +23766,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 3.0, @@ -23775,6 +23775,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23787,7 +23788,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 0.003, @@ -23797,6 +23797,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23809,7 +23810,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -23830,6 +23830,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23842,7 +23843,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -23852,6 +23852,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23864,7 +23865,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 26.4775335, @@ -23874,6 +23874,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23886,7 +23887,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 18173.2162, @@ -23907,6 +23907,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23919,7 +23920,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -23929,6 +23929,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23941,7 +23942,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 22.0, @@ -23951,6 +23951,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23963,7 +23964,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 15100.0, @@ -23984,6 +23984,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -23996,7 +23997,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -24006,6 +24006,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24018,7 +24019,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 0.0, @@ -24028,6 +24028,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24040,7 +24041,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -24061,6 +24061,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24073,7 +24074,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -24083,6 +24083,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24095,7 +24096,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 55.7421758, @@ -24105,6 +24105,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24117,7 +24118,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 38259.4025, @@ -24138,6 +24138,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24150,7 +24151,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -24160,6 +24160,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24172,7 +24173,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 300.117767, @@ -24182,6 +24182,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24194,7 +24195,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 205989.922, @@ -24215,6 +24215,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24227,7 +24228,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -24237,6 +24237,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24249,7 +24250,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 6.6775335, @@ -24259,6 +24259,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0, @@ -24271,7 +24272,6 @@ "2019-01-01 00:00:00", "2020-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 4583.21617, diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2.json b/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2.json index bd1e29297d..39f7bad58f 100644 --- a/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2.json +++ b/src/ecalc/libraries/libecalc/common/tests/integration/snapshots/test_consumer_system_v2/test_compressor_system_v2_results/consumer_system_v2.json @@ -3,6 +3,7 @@ "09c1b79cf6cf1ef0773a194679246a4a": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0 @@ -11,7 +12,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 0.0, @@ -31,6 +31,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -39,7 +40,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -47,6 +47,7 @@ ] }, "power_capacity_margin": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -55,7 +56,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 1000000.0, @@ -73,6 +73,7 @@ "656e1bc8df0c83c2dda044b7bd654631": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -81,7 +82,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -104,6 +104,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -112,7 +113,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -148,6 +148,7 @@ 250.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -156,7 +157,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -170,6 +170,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -178,7 +179,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -214,6 +214,7 @@ 250.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -222,7 +223,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -236,6 +236,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -244,7 +245,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -280,6 +280,7 @@ 250.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -288,7 +289,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -304,6 +304,7 @@ "2": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -312,7 +313,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -348,6 +348,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -356,7 +357,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -370,6 +370,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -378,7 +379,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -414,6 +414,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -422,7 +423,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -436,6 +436,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -444,7 +445,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -480,6 +480,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -488,7 +489,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -514,6 +514,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -522,7 +523,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -537,6 +537,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -545,7 +546,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -581,6 +581,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -589,7 +590,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -603,6 +603,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -611,7 +612,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -647,6 +647,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -655,7 +656,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -669,6 +669,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -677,7 +678,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -713,6 +713,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -721,7 +722,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -739,6 +739,7 @@ "9ecb7728acb755a3356d53ef62eac57c": { "component_result": { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -747,7 +748,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -770,6 +770,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -778,7 +779,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -814,6 +814,7 @@ 250.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -822,7 +823,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -836,6 +836,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -844,7 +845,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -880,6 +880,7 @@ 250.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -888,7 +889,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -902,6 +902,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -910,7 +911,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -946,6 +946,7 @@ 250.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -954,7 +955,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -970,6 +970,7 @@ "2": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -978,7 +979,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1014,6 +1014,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1022,7 +1023,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1036,6 +1036,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1044,7 +1045,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1080,6 +1080,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1088,7 +1089,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1102,6 +1102,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1110,7 +1111,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1146,6 +1146,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1154,7 +1155,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1180,6 +1180,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1188,7 +1189,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.0, @@ -1203,6 +1203,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1211,7 +1212,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1247,6 +1247,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1255,7 +1256,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1269,6 +1269,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1277,7 +1278,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1313,6 +1313,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1321,7 +1322,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1335,6 +1335,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1343,7 +1344,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1379,6 +1379,7 @@ 125.0 ], "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1387,7 +1388,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ NaN, @@ -1405,6 +1405,7 @@ "b16b9265fc6f9743594a2441fcc0d7c8": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0 @@ -1413,7 +1414,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 39000.0, @@ -1436,6 +1436,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1444,7 +1445,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -1470,6 +1470,7 @@ "max_standard_rate": null, "name": "compressor1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1478,7 +1479,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -1578,6 +1578,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1586,7 +1587,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -1612,6 +1612,7 @@ "max_standard_rate": null, "name": "compressor2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1620,7 +1621,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -1720,6 +1720,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1728,7 +1729,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -1754,6 +1754,7 @@ "max_standard_rate": null, "name": "compressor3", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1762,7 +1763,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -1864,6 +1864,7 @@ "2": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1872,7 +1873,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 5000.0, @@ -1898,6 +1898,7 @@ "max_standard_rate": null, "name": "compressor1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -1906,7 +1907,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 0.5, @@ -2006,6 +2006,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2014,7 +2015,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 11500.0, @@ -2040,6 +2040,7 @@ "max_standard_rate": null, "name": "compressor2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2048,7 +2049,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 2.5, @@ -2148,6 +2148,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2156,7 +2157,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 12000.0, @@ -2182,6 +2182,7 @@ "max_standard_rate": null, "name": "compressor3", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2190,7 +2191,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 3.0, @@ -2302,6 +2302,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2310,7 +2311,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 12.0, @@ -2325,6 +2325,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2333,7 +2334,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -2359,6 +2359,7 @@ "max_standard_rate": null, "name": "compressor1", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2367,7 +2368,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -2467,6 +2467,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2475,7 +2476,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -2501,6 +2501,7 @@ "max_standard_rate": null, "name": "compressor2", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2509,7 +2510,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -2609,6 +2609,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2617,7 +2618,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -2643,6 +2643,7 @@ "max_standard_rate": null, "name": "compressor3", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2651,7 +2652,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -2755,6 +2755,7 @@ "cbc0427cf665c504a8081b89cf167ee3": { "component_result": { "energy_usage": { + "rate_type": "CALENDAR_DAY", "regularity": [ 1.0, 1.0 @@ -2763,7 +2764,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "CALENDAR_DAY", "unit": "Sm3/d", "values": [ 39000.0, @@ -2786,6 +2786,7 @@ "1": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2794,7 +2795,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -2820,6 +2820,7 @@ "max_standard_rate": null, "name": "N/A", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2828,7 +2829,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -2928,6 +2928,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2936,7 +2937,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -2962,6 +2962,7 @@ "max_standard_rate": null, "name": "N/A", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -2970,7 +2971,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -3070,6 +3070,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3078,7 +3079,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -3104,6 +3104,7 @@ "max_standard_rate": null, "name": "N/A", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3112,7 +3113,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -3224,6 +3224,7 @@ ] }, "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3232,7 +3233,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 12.0, @@ -3247,6 +3247,7 @@ "models": [ { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3255,7 +3256,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -3281,6 +3281,7 @@ "max_standard_rate": null, "name": "N/A", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3289,7 +3290,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -3389,6 +3389,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3397,7 +3398,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -3423,6 +3423,7 @@ "max_standard_rate": null, "name": "N/A", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3431,7 +3432,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -3531,6 +3531,7 @@ }, { "energy_usage": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3539,7 +3540,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "Sm3/d", "values": [ 13000.0, @@ -3565,6 +3565,7 @@ "max_standard_rate": null, "name": "N/A", "power": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3573,7 +3574,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "MW", "values": [ 4.0, @@ -3680,6 +3680,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3688,7 +3689,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -3696,6 +3696,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3704,7 +3705,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 0.0, @@ -3712,6 +3712,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3720,7 +3721,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -3737,6 +3737,7 @@ "co2": { "name": "co2", "quota": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3745,7 +3746,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 0.0, @@ -3753,6 +3753,7 @@ ] }, "rate": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3761,7 +3762,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "t/d", "values": [ 85.8, @@ -3769,6 +3769,7 @@ ] }, "tax": { + "rate_type": "STREAM_DAY", "regularity": [ 1.0, 1.0 @@ -3777,7 +3778,6 @@ "2022-01-01 00:00:00", "2026-01-01 00:00:00" ], - "typ": "STREAM_DAY", "unit": "NOK/d", "values": [ 58890.0, diff --git a/src/ecalc/libraries/libecalc/common/tests/integration/test_multiple_installations.py b/src/ecalc/libraries/libecalc/common/tests/integration/test_multiple_installations.py index c94db6d230..7553bee398 100644 --- a/src/ecalc/libraries/libecalc/common/tests/integration/test_multiple_installations.py +++ b/src/ecalc/libraries/libecalc/common/tests/integration/test_multiple_installations.py @@ -42,5 +42,5 @@ def test_asset_with_multiple_installations(asset_with_two_installations): values=[150, 150, 150], unit=Unit.STANDARD_CUBIC_METER_PER_DAY, timesteps=timesteps, - typ=RateType.CALENDAR_DAY, + rate_type=RateType.CALENDAR_DAY, )