Skip to content

Commit 3a794ec

Browse files
alxsmithalxsmith
authored
Merge pull request #421 from switchbox-data/420-bug_fix-read-fixed-charge-from-outputs
420 bug fix read fixed charge from outputs
2 parents 1a7f682 + f22ef3f commit 3a794ec

17 files changed

Lines changed: 418 additions & 107 deletions

‎rate_design/hp_rates/Justfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ run-scenario run_num *extra_args:
799799
2>&1 | tee -a "${log_file}"
800800

801801
run-1:
802-
just run-scenario 1
802+
just run-scenario 1 --billing-kwh
803803

804804
run-2:
805805
just run-scenario 2
@@ -810,7 +810,7 @@ run-3:
810810
run1_dir=$(bash "{{ latest_output }}" "{{ path_scenario_config }}" 1)
811811
echo ">> run-3: resolved run-1 output → ${run1_dir}" >&2
812812
just copy-calibrated-tariff-from-run "${run1_dir}"
813-
just run-scenario 3
813+
just run-scenario 3 --billing-kwh
814814

815815
run-4:
816816
#!/usr/bin/env bash

‎rate_design/hp_rates/ri/config/rev_requirement/rie_hp_vs_nonhp_rate_case_test_year.yaml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
utility: rie
22
group_col: has_hp
3-
source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ri/rie/ri_20260402_r1-20/20260402_223839_ri_rie_run1_up00_precalc__default
3+
source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ri/rie/ri_20260506_r1-20_rate_case_test_year/20260506_200911_ri_rie_run1_up00_precalc__default
44
test_year_customer_count: 419347.83
55
resstock_kwh_scale_factor: 0.9568112362177266
66
total_delivery_revenue_requirement: 446463143.03
@@ -9,87 +9,87 @@ subclass_revenue_requirements:
99
delivery:
1010
percustomer:
1111
non-hp: 436885880.2404837
12-
hp: 9577262.789516184
12+
hp: 9577262.789516188
1313
epmc:
1414
non-hp: 434515334.6203291
1515
hp: 11947808.409670874
1616
volumetric:
17-
non-hp: 426841475.3170371
18-
hp: 19621667.712962832
17+
non-hp: 426841475.317037
18+
hp: 19621667.712962836
1919
passthrough:
2020
non-hp: 426800066.435006
21-
hp: 19663076.594995
21+
hp: 19663076.594995003
2222
supply:
2323
passthrough:
24-
non-hp: 366578028.43801546
25-
hp: 19696316.17198357
24+
non-hp: 366578028.4380151
25+
hp: 19696316.171983574
2626
percustomer:
27-
non-hp: 369725777.80151623
28-
hp: 16548566.808484416
27+
non-hp: 369725777.80151576
28+
hp: 16548566.808484424
2929
volumetric:
30-
non-hp: 366354615.71021116
31-
hp: 19919728.899788845
30+
non-hp: 366354615.71021163
31+
hp: 19919728.89978885
3232
heating_type_breakdown:
3333
percustomer:
3434
delivered_fuels:
3535
delivery: 149942899.31739938
36-
supply: 127082454.77054024
37-
total: 277025354.0879396
36+
supply: 127082454.7705403
37+
total: 277025354.0879397
3838
electrical_resistance:
39-
delivery: 36210225.127592206
40-
supply: 60377144.74097414
41-
total: 96587369.86856635
39+
delivery: 36210225.12759223
40+
supply: 60377144.74097409
41+
total: 96587369.86856632
4242
heat_pump:
4343
delivery: 9577262.789516184
44-
supply: 16548566.808484416
45-
total: 26125829.5980006
44+
supply: 16548566.808484424
45+
total: 26125829.59800061
4646
natgas:
47-
delivery: 241842033.78749675
48-
supply: 174895121.5592146
47+
delivery: 241842033.78749686
48+
supply: 174895121.55921447
4949
total: 416737155.34671134
5050
other:
5151
delivery: 8890722.007995397
52-
supply: 7371056.7307867985
53-
total: 16261778.738782195
52+
supply: 7371056.730786795
53+
total: 16261778.738782192
5454
epmc:
5555
delivered_fuels:
56-
delivery: 170936843.43761766
57-
supply: 113525977.94750535
58-
total: 284462821.385123
56+
delivery: 170936843.4376176
57+
supply: 113525977.94750547
58+
total: 284462821.3851231
5959
electrical_resistance:
60-
delivery: 28889917.895002723
61-
supply: 107204508.5259001
62-
total: 136094426.42090282
60+
delivery: 28889917.895002715
61+
supply: 107204508.52590013
62+
total: 136094426.42090285
6363
heat_pump:
6464
delivery: 11947808.409670874
6565
supply: 27832821.532902047
6666
total: 39780629.94257292
6767
natgas:
68-
delivery: 224553650.45898542
69-
supply: 131389267.1563451
70-
total: 355942917.6153305
68+
delivery: 224553650.45898536
69+
supply: 131389267.15634522
70+
total: 355942917.6153306
7171
other:
7272
delivery: 10134922.82872325
7373
supply: 6321769.447347404
7474
total: 16456692.276070654
7575
volumetric:
7676
delivered_fuels:
77-
delivery: 155333732.0140826
78-
supply: 128891757.65768296
77+
delivery: 155333732.01408258
78+
supply: 128891757.65768299
7979
total: 284225489.67176557
8080
electrical_resistance:
8181
delivery: 68401845.75371705
82-
supply: 71181485.26085101
83-
total: 139583331.01456806
82+
supply: 71181485.26085104
83+
total: 139583331.0145681
8484
heat_pump:
85-
delivery: 19621667.712962832
86-
supply: 19919728.899788853
87-
total: 39541396.612751685
85+
delivery: 19621667.712962836
86+
supply: 19919728.89978884
87+
total: 39541396.61275168
8888
natgas:
8989
delivery: 194074662.32342032
90-
supply: 158863156.19060853
91-
total: 352937818.51402885
90+
supply: 158863156.1906084
91+
total: 352937818.5140287
9292
other:
93-
delivery: 9031235.22581713
94-
supply: 7418216.601068623
93+
delivery: 9031235.225817133
94+
supply: 7418216.6010686215
9595
total: 16449451.826885754

‎rate_design/hp_rates/ri/config/scenarios/scenarios_rie.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,3 +583,8 @@ runs:
583583
year_dollar_conversion: 2025
584584
process_workers: 8
585585
elasticity: 0.0
586+
subclass_config:
587+
group_col: has_hp
588+
selectors:
589+
hp: 'true'
590+
non-hp: 'false'

‎rate_design/hp_rates/ri/config/tariffs/electric/rie_hp_flat.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@
640640
"energyratestructure": [
641641
[
642642
{
643-
"rate": 0.07892993501891102,
643+
"rate": 0.07892993501891103,
644644
"adj": 0.0,
645645
"unit": "kWh"
646646
}

‎rate_design/hp_rates/ri/config/tariffs/electric/rie_hp_flat_supply_calibrated.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@
640640
"energyratestructure": [
641641
[
642642
{
643-
"rate": 0.231294060102476,
643+
"rate": 0.23129406010247605,
644644
"adj": 0.0,
645645
"unit": "kWh"
646646
}

‎rate_design/hp_rates/ri/config/tariffs/electric/rie_hp_seasonal.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,14 +640,14 @@
640640
"energyratestructure": [
641641
[
642642
{
643-
"rate": 0.1346997507472661,
643+
"rate": 0.13469975074726612,
644644
"adj": 0.0,
645645
"unit": "kWh"
646646
}
647647
],
648648
[
649649
{
650-
"rate": 0.03244772363136118,
650+
"rate": 0.032447723631361225,
651651
"adj": 0.0,
652652
"unit": "kWh"
653653
}

‎rate_design/hp_rates/ri/config/tariffs/electric/rie_hp_seasonalTOU_calibrated.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,28 +640,28 @@
640640
"energyratestructure": [
641641
[
642642
{
643-
"rate": 0.05532926114120757,
643+
"rate": 0.05532926114120759,
644644
"adj": 0.0,
645645
"unit": "kWh"
646646
}
647647
],
648648
[
649649
{
650-
"rate": 0.07124330882646412,
650+
"rate": 0.07124330882646415,
651651
"adj": 0.0,
652652
"unit": "kWh"
653653
}
654654
],
655655
[
656656
{
657-
"rate": 0.05400084046575012,
657+
"rate": 0.05400084046575014,
658658
"adj": 0.0,
659659
"unit": "kWh"
660660
}
661661
],
662662
[
663663
{
664-
"rate": 0.18501767960375307,
664+
"rate": 0.18501767960375315,
665665
"adj": 0.0,
666666
"unit": "kWh"
667667
}

‎rate_design/hp_rates/ri/config/tariffs/electric/rie_hp_seasonalTOU_flex_calibrated.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,28 +640,28 @@
640640
"energyratestructure": [
641641
[
642642
{
643-
"rate": 0.05337742927235436,
643+
"rate": 0.05337742927235438,
644644
"adj": 0.0,
645645
"unit": "kWh"
646646
}
647647
],
648648
[
649649
{
650-
"rate": 0.0671968457109669,
650+
"rate": 0.06719684571096693,
651651
"adj": 0.0,
652652
"unit": "kWh"
653653
}
654654
],
655655
[
656656
{
657-
"rate": 0.0567722337740761,
657+
"rate": 0.05677223377407612,
658658
"adj": 0.0,
659659
"unit": "kWh"
660660
}
661661
],
662662
[
663663
{
664-
"rate": 0.20398718370722943,
664+
"rate": 0.2039871837072295,
665665
"adj": 0.0,
666666
"unit": "kWh"
667667
}

‎rate_design/hp_rates/ri/config/tariffs/electric/rie_hp_seasonalTOU_flex_supply_calibrated.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,28 +640,28 @@
640640
"energyratestructure": [
641641
[
642642
{
643-
"rate": 0.1656030423487901,
643+
"rate": 0.1656030423487902,
644644
"adj": 0.0,
645645
"unit": "kWh"
646646
}
647647
],
648648
[
649649
{
650-
"rate": 0.19478270952758686,
650+
"rate": 0.19478270952758694,
651651
"adj": 0.0,
652652
"unit": "kWh"
653653
}
654654
],
655655
[
656656
{
657-
"rate": 0.16059255464390043,
657+
"rate": 0.16059255464390051,
658658
"adj": 0.0,
659659
"unit": "kWh"
660660
}
661661
],
662662
[
663663
{
664-
"rate": 0.5468176485624809,
664+
"rate": 0.5468176485624813,
665665
"adj": 0.0,
666666
"unit": "kWh"
667667
}

‎rate_design/hp_rates/ri/config/tariffs/electric/rie_hp_seasonalTOU_supply_calibrated.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,28 +640,28 @@
640640
"energyratestructure": [
641641
[
642642
{
643-
"rate": 0.16243530966939967,
643+
"rate": 0.16243530966939976,
644644
"adj": 0.0,
645645
"unit": "kWh"
646646
}
647647
],
648648
[
649649
{
650-
"rate": 0.20915567445524008,
650+
"rate": 0.2091556744552402,
651651
"adj": 0.0,
652652
"unit": "kWh"
653653
}
654654
],
655655
[
656656
{
657-
"rate": 0.15853534029806723,
657+
"rate": 0.15853534029806732,
658658
"adj": 0.0,
659659
"unit": "kWh"
660660
}
661661
],
662662
[
663663
{
664-
"rate": 0.543173782929238,
664+
"rate": 0.5431737829292382,
665665
"adj": 0.0,
666666
"unit": "kWh"
667667
}

0 commit comments

Comments
 (0)