Skip to content

Commit e8b2ed2

Browse files
jpvelezcursoragent
jpvelez
and
cursoragent
committed
chore(ny,ri): update Justfiles to std_name, regenerate NY utility stats
- Use coned, nimo, nyseg in map-electric-tariff and map-gas-tariff - Add map-electric-rie-default / map-gas-rie-default for RI - Regenerate ny_electric_utility_stats.csv with utility_code column Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 7dba3ef commit e8b2ed2

3 files changed

Lines changed: 59 additions & 52 deletions

File tree

‎rate_design/ny/hp_rates/data/Justfile‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ fetch-ny-utility-stats:
1010
@echo "Wrote {{data_dir_ny}}/ny_electric_utility_stats.csv"
1111

1212
# Usage: just map-electric-tariff [electric_utility] [SB_scenario_type] [SB_scenario_year] [upgrade_id] [output_dir]
13-
# Example: just map-electric-tariff Coned default 1 00 ./rate_design/ny/hp_rates/data/tariff_map
13+
# Example: just map-electric-tariff coned default 1 00 ./rate_design/ny/hp_rates/data/tariff_map
14+
# electric_utility: std_name (e.g. coned, nyseg, nimo)
1415
map-electric-tariff electric_utility SB_scenario_type SB_scenario_year upgrade_id output_dir:
1516
uv run python {{project_root}}/utils/electric_tariff_mapper.py \
1617
--metadata_path "{{path_s3_resstock_metadata}}" \
@@ -24,34 +25,34 @@ map-electric-tariff electric_utility SB_scenario_type SB_scenario_year upgrade_i
2425
# Some useful enumerations:
2526

2627
map-electric-coned-default:
27-
just map-electric-tariff Coned default 1 00 {{tariff_map_dir_ny}}
28+
just map-electric-tariff coned default 1 00 {{tariff_map_dir_ny}}
2829

2930
map-electric-coned-seasonal:
30-
just map-electric-tariff Coned seasonal 1 00 {{tariff_map_dir_ny}}
31+
just map-electric-tariff coned seasonal 1 00 {{tariff_map_dir_ny}}
3132

32-
map-celectric-oned-class-specific-seasonal:
33-
just map-electric-tariff Coned class_specific_seasonal 1 00 {{tariff_map_dir_ny}}
33+
map-electric-coned-class-specific-seasonal:
34+
just map-electric-tariff coned class_specific_seasonal 1 00 {{tariff_map_dir_ny}}
3435

3536
map-electric-national-grid-default:
36-
just map-electric-tariff "National Grid" default 1 00 {{tariff_map_dir_ny}}
37+
just map-electric-tariff nimo default 1 00 {{tariff_map_dir_ny}}
3738

3839
map-electric-national-grid-seasonal:
39-
just map-electric-tariff "National Grid" seasonal 1 00 {{tariff_map_dir_ny}}
40+
just map-electric-tariff nimo seasonal 1 00 {{tariff_map_dir_ny}}
4041

4142
map-electric-national-grid-class-specific-seasonal:
42-
just map-electric-tariff "National Grid" class_specific_seasonal 1 00 {{tariff_map_dir_ny}}
43+
just map-electric-tariff nimo class_specific_seasonal 1 00 {{tariff_map_dir_ny}}
4344

4445
map-electric-nyseg-default:
45-
just map-electric-tariff NYSEG default 1 00 {{tariff_map_dir_ny}}
46+
just map-electric-tariff nyseg default 1 00 {{tariff_map_dir_ny}}
4647

4748
map-electric-nyseg-seasonal:
48-
just map-electric-tariff NYSEG seasonal 1 00 {{tariff_map_dir_ny}}
49+
just map-electric-tariff nyseg seasonal 1 00 {{tariff_map_dir_ny}}
4950

5051
map-electric-nyseg-class-specific-seasonal:
51-
just map-electric-tariff NYSEG class_specific_seasonal 1 00 {{tariff_map_dir_ny}}
52+
just map-electric-tariff nyseg class_specific_seasonal 1 00 {{tariff_map_dir_ny}}
5253

5354
# Usage: just map-gas-tariff [electric_utility] [upgrade_id] [output_dir]
54-
# Example: just map-gas-tariff NYSEG 00 ./rate_design/ny/hp_rates/data/tariff_map
55+
# Example: just map-gas-tariff nyseg 00 ./rate_design/ny/hp_rates/data/tariff_map
5556
map-gas-tariff electric_utility upgrade_id output_dir:
5657
uv run python {{project_root}}/utils/gas_tariff_mapper.py \
5758
--metadata_path "{{path_s3_resstock_metadata}}" \
@@ -63,28 +64,28 @@ map-gas-tariff electric_utility upgrade_id output_dir:
6364
# Some useful enumerations:
6465

6566
map-gas-coned-default:
66-
just map-gas-tariff Coned 00 {{tariff_map_dir_ny}}
67+
just map-gas-tariff coned 00 {{tariff_map_dir_ny}}
6768

6869
map-gas-coned-seasonal:
69-
just map-gas-tariff Coned 00 {{tariff_map_dir_ny}}
70+
just map-gas-tariff coned 00 {{tariff_map_dir_ny}}
7071

7172
map-gas-coned-class-specific-seasonal:
72-
just map-gas-tariff Coned 00 {{tariff_map_dir_ny}}
73+
just map-gas-tariff coned 00 {{tariff_map_dir_ny}}
7374

7475
map-gas-national-grid-default:
75-
just map-gas-tariff "National Grid" 00 {{tariff_map_dir_ny}}
76+
just map-gas-tariff nimo 00 {{tariff_map_dir_ny}}
7677

7778
map-gas-national-grid-seasonal:
78-
just map-gas-tariff "National Grid" 00 {{tariff_map_dir_ny}}
79+
just map-gas-tariff nimo 00 {{tariff_map_dir_ny}}
7980

8081
map-gas-national-grid-class-specific-seasonal:
81-
just map-gas-tariff "National Grid" 00 {{tariff_map_dir_ny}}
82+
just map-gas-tariff nimo 00 {{tariff_map_dir_ny}}
8283

8384
map-gas-nyseg-default:
84-
just map-gas-tariff NYSEG 00 {{tariff_map_dir_ny}}
85+
just map-gas-tariff nyseg 00 {{tariff_map_dir_ny}}
8586

8687
map-gas-nyseg-seasonal:
87-
just map-gas-tariff NYSEG 00 {{tariff_map_dir_ny}}
88+
just map-gas-tariff nyseg 00 {{tariff_map_dir_ny}}
8889

8990
map-gas-nyseg-class-specific-seasonal:
90-
just map-gas-tariff NYSEG 00 {{tariff_map_dir_ny}}
91+
just map-gas-tariff nyseg 00 {{tariff_map_dir_ny}}

‎rate_design/ny/hp_rates/data/ny_electric_utility_stats.csv‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
utility_id_eia,utility_name,business_model,entity_type,report_date,total_sales_mwh,total_sales_revenue,commercial_sales_mwh,commercial_sales_revenue,commercial_customers,industrial_sales_mwh,industrial_sales_revenue,industrial_customers,other_sales_mwh,other_sales_revenue,other_customers,residential_sales_mwh,residential_sales_revenue,residential_customers,transportation_sales_mwh,transportation_sales_revenue,transportation_customers
2-
4226,Consolidated Edison Co-NY Inc,retail,Investor Owned,2024-01-01,52425972.0,10723693000.0,35041850.0,5565803000.0,572249.0,1303892.0,338525000.0,10498.0,0.0,0.0,0.0,13643968.0,4671811000.0,3064038.0,2436261.0,147553000.0,2.0
3-
13573,Niagara Mohawk Power Corp.,retail,Investor Owned,2024-01-01,32718092.0,2986044400.0,12576316.0,792737300.0,185072.0,8302774.0,220623000.0,1554.0,0.0,0.0,0.0,11833895.0,1972635400.0,1532294.0,5108.0,48600.0,1.0
4-
13511,New York State Elec & Gas Corp,retail,Investor Owned,2024-01-01,15231769.0,1764984600.0,5806928.0,472634400.0,127567.0,2472844.0,62332000.0,1500.0,0.0,0.0,0.0,6919839.0,1228409300.0,792300.0,32158.0,1609000.0,2.0
5-
16183,Rochester Gas & Electric Corp,retail,Investor Owned,2024-01-01,6871716.0,812878850.0,3044406.0,259093600.0,40227.0,984961.0,49085700.0,634.0,0.0,0.0,0.0,2842349.0,504699520.0,351481.0,0.0,0.0,0.0
6-
3249,Central Hudson Gas & Elec Corp,retail,Investor Owned,2024-01-01,5018039.0,787803970.0,2009494.0,239328000.0,49472.0,840758.0,31443000.0,861.0,0.0,0.0,0.0,2167787.0,517033020.0,270859.0,0.0,0.0,0.0
7-
14154,Orange & Rockland Utils Inc,retail,Investor Owned,2024-01-01,4087784.0,594447900.0,2023377.0,203018600.0,33695.0,313637.0,16500600.0,85.0,0.0,0.0,0.0,1750770.0,374928700.0,211011.0,0.0,0.0,0.0
8-
66101,FirstEnergy Pennsylvania Electric Co,retail,Investor Owned,2024-01-01,64611.0,8235400.0,30033.0,3107500.0,479.0,4022.0,530100.0,1.0,0.0,0.0,0.0,30556.0,4597800.0,3400.0,0.0,0.0,0.0
9-
14711,Pennsylvania Electric Co,retail,Investor Owned,2023-01-01,60641.0,7912700.0,28931.0,3099000.0,486.0,1214.0,177500.0,1.0,0.0,0.0,0.0,30496.0,4636200.0,3400.0,0.0,0.0,0.0
10-
6369,Fishers Island Utility Co Inc,retail,Investor Owned,2024-01-01,7079.0,2372900.0,2061.0,457600.0,113.0,0.0,0.0,0.0,0.0,0.0,0.0,5018.0,1915300.0,657.0,0.0,0.0,0.0
1+
utility_id_eia,utility_code,utility_name,business_model,entity_type,report_date,total_sales_mwh,total_sales_revenue,commercial_sales_mwh,commercial_sales_revenue,commercial_customers,industrial_sales_mwh,industrial_sales_revenue,industrial_customers,other_sales_mwh,other_sales_revenue,other_customers,residential_sales_mwh,residential_sales_revenue,residential_customers,transportation_sales_mwh,transportation_sales_revenue,transportation_customers
2+
4226,coned,Consolidated Edison Co-NY Inc,retail,Investor Owned,2024-01-01,52425972.0,10723693000.0,35041850.0,5565803000.0,572249.0,1303892.0,338525000.0,10498.0,0.0,0.0,0.0,13643968.0,4671811000.0,3064038.0,2436261.0,147553000.0,2.0
3+
13573,nimo,Niagara Mohawk Power Corp.,retail,Investor Owned,2024-01-01,32718092.0,2986044400.0,12576316.0,792737300.0,185072.0,8302774.0,220623000.0,1554.0,0.0,0.0,0.0,11833895.0,1972635400.0,1532294.0,5108.0,48600.0,1.0
4+
13511,nyseg,New York State Elec & Gas Corp,retail,Investor Owned,2024-01-01,15231769.0,1764984600.0,5806928.0,472634400.0,127567.0,2472844.0,62332000.0,1500.0,0.0,0.0,0.0,6919839.0,1228409300.0,792300.0,32158.0,1609000.0,2.0
5+
16183,rge,Rochester Gas & Electric Corp,retail,Investor Owned,2024-01-01,6871716.0,812878850.0,3044406.0,259093600.0,40227.0,984961.0,49085700.0,634.0,0.0,0.0,0.0,2842349.0,504699520.0,351481.0,0.0,0.0,0.0
6+
3249,cenhud,Central Hudson Gas & Elec Corp,retail,Investor Owned,2024-01-01,5018039.0,787803970.0,2009494.0,239328000.0,49472.0,840758.0,31443000.0,861.0,0.0,0.0,0.0,2167787.0,517033020.0,270859.0,0.0,0.0,0.0
7+
14154,or,Orange & Rockland Utils Inc,retail,Investor Owned,2024-01-01,4087784.0,594447900.0,2023377.0,203018600.0,33695.0,313637.0,16500600.0,85.0,0.0,0.0,0.0,1750770.0,374928700.0,211011.0,0.0,0.0,0.0
8+
66101,,FirstEnergy Pennsylvania Electric Co,retail,Investor Owned,2024-01-01,64611.0,8235400.0,30033.0,3107500.0,479.0,4022.0,530100.0,1.0,0.0,0.0,0.0,30556.0,4597800.0,3400.0,0.0,0.0,0.0
9+
14711,,Pennsylvania Electric Co,retail,Investor Owned,2023-01-01,60641.0,7912700.0,28931.0,3099000.0,486.0,1214.0,177500.0,1.0,0.0,0.0,0.0,30496.0,4636200.0,3400.0,0.0,0.0,0.0
10+
6369,,Fishers Island Utility Co Inc,retail,Investor Owned,2024-01-01,7079.0,2372900.0,2061.0,457600.0,113.0,0.0,0.0,0.0,0.0,0.0,0.0,5018.0,1915300.0,657.0,0.0,0.0,0.0

‎rate_design/ri/hp_rates/data/tariff_map/Justfile‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ path_s3_resstock_metadata := "s3://data.sb/nrel/resstock/res_2024_amy2018_2/meta
44
tariff_map_dir_ri := "{{project_root}}/rate_design/ri/hp_rates/data/tariff_map"
55

66
# Usage: just map-electric-tariff [electric_utility] [SB_scenario_type] [SB_scenario_year] [upgrade_id] [output_dir]
7-
# Example: just map-electric-tariff Coned default 1 00 ./rate_design/ri/hp_rates/data/tariff_map
7+
# Example: just map-electric-tariff rie default 1 00 ./rate_design/ri/hp_rates/data/tariff_map
88
map-electric-tariff electric_utility SB_scenario_type SB_scenario_year upgrade_id output_dir:
99
uv run python {{project_root}}/utils/electric_tariff_mapper.py \
1010
--metadata_path "{{path_s3_resstock_metadata}}" \
@@ -18,35 +18,38 @@ map-electric-tariff electric_utility SB_scenario_type SB_scenario_year upgrade_i
1818
# Some useful enumerations:
1919

2020
map-electric-coned-default:
21-
just map-electric-tariff Coned default 1 00 {{tariff_map_dir_ri}}
21+
just map-electric-tariff coned default 1 00 {{tariff_map_dir_ri}}
2222

2323
map-electric-coned-seasonal:
24-
just map-electric-tariff Coned seasonal 1 00 {{tariff_map_dir_ri}}
24+
just map-electric-tariff coned seasonal 1 00 {{tariff_map_dir_ri}}
2525

26-
map-celectric-oned-class-specific-seasonal:
27-
just map-electric-tariff Coned class_specific_seasonal 1 00 {{tariff_map_dir_ri}}
26+
map-electric-coned-class-specific-seasonal:
27+
just map-electric-tariff coned class_specific_seasonal 1 00 {{tariff_map_dir_ri}}
2828

2929
map-electric-national-grid-default:
30-
just map-electric-tariff "National Grid" default 1 00 {{tariff_map_dir_ri}}
30+
just map-electric-tariff nimo default 1 00 {{tariff_map_dir_ri}}
3131

3232
map-electric-national-grid-seasonal:
33-
just map-electric-tariff "National Grid" seasonal 1 00 {{tariff_map_dir_ri}}
33+
just map-electric-tariff nimo seasonal 1 00 {{tariff_map_dir_ri}}
3434

3535
map-electric-national-grid-class-specific-seasonal:
36-
just map-electric-tariff "National Grid" class_specific_seasonal 1 00 {{tariff_map_dir_ri}}
36+
just map-electric-tariff nimo class_specific_seasonal 1 00 {{tariff_map_dir_ri}}
3737

3838
map-electric-nyseg-default:
39-
just map-electric-tariff NYSEG default 1 00 {{tariff_map_dir_ri}}
39+
just map-electric-tariff nyseg default 1 00 {{tariff_map_dir_ri}}
4040

4141
map-electric-nyseg-seasonal:
42-
just map-electric-tariff NYSEG seasonal 1 00 {{tariff_map_dir_ri}}
42+
just map-electric-tariff nyseg seasonal 1 00 {{tariff_map_dir_ri}}
4343

4444
map-electric-nyseg-class-specific-seasonal:
45-
just map-electric-tariff NYSEG class_specific_seasonal 1 00 {{tariff_map_dir_ri}}
45+
just map-electric-tariff nyseg class_specific_seasonal 1 00 {{tariff_map_dir_ri}}
46+
47+
map-electric-rie-default:
48+
just map-electric-tariff rie default 1 00 {{tariff_map_dir_ri}}
4649

4750

4851
# Usage: just map-gas-tariff [electric_utility] [upgrade_id] [output_dir]
49-
# Example: just map-gas-tariff "National Grid" 00 ./rate_design/ri/hp_rates/data/tariff_map
52+
# Example: just map-gas-tariff rie 00 ./rate_design/ri/hp_rates/data/tariff_map
5053
map-gas-tariff electric_utility upgrade_id output_dir:
5154
uv run python {{project_root}}/utils/gas_tariff_mapper.py \
5255
--metadata_path "{{path_s3_resstock_metadata}}" \
@@ -58,28 +61,31 @@ map-gas-tariff electric_utility upgrade_id output_dir:
5861
# Some useful enumerations:
5962

6063
map-gas-coned-default:
61-
just map-gas-tariff Coned 00 {{tariff_map_dir_ri}}
64+
just map-gas-tariff coned 00 {{tariff_map_dir_ri}}
6265

6366
map-gas-coned-seasonal:
64-
just map-gas-tariff Coned 00 {{tariff_map_dir_ri}}
67+
just map-gas-tariff coned 00 {{tariff_map_dir_ri}}
6568

6669
map-gas-coned-class-specific-seasonal:
67-
just map-gas-tariff Coned 00 {{tariff_map_dir_ri}}
70+
just map-gas-tariff coned 00 {{tariff_map_dir_ri}}
6871

6972
map-gas-national-grid-default:
70-
just map-gas-tariff "National Grid" 00 {{tariff_map_dir_ri}}
73+
just map-gas-tariff nimo 00 {{tariff_map_dir_ri}}
7174

7275
map-gas-national-grid-seasonal:
73-
just map-gas-tariff "National Grid" 00 {{tariff_map_dir_ri}}
76+
just map-gas-tariff nimo 00 {{tariff_map_dir_ri}}
7477

7578
map-gas-national-grid-class-specific-seasonal:
76-
just map-gas-tariff "National Grid" 00 {{tariff_map_dir_ri}}
79+
just map-gas-tariff nimo 00 {{tariff_map_dir_ri}}
7780

7881
map-gas-nyseg-default:
79-
just map-gas-tariff NYSEG 00 {{tariff_map_dir_ri}}
82+
just map-gas-tariff nyseg 00 {{tariff_map_dir_ri}}
8083

8184
map-gas-nyseg-seasonal:
82-
just map-gas-tariff NYSEG 00 {{tariff_map_dir_ri}}
85+
just map-gas-tariff nyseg 00 {{tariff_map_dir_ri}}
8386

8487
map-gas-nyseg-class-specific-seasonal:
85-
just map-gas-tariff NYSEG 00 {{tariff_map_dir_ri}}
88+
just map-gas-tariff nyseg 00 {{tariff_map_dir_ri}}
89+
90+
map-gas-rie-default:
91+
just map-gas-tariff rie 00 {{tariff_map_dir_ri}}

0 commit comments

Comments
 (0)