diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dce9669c..dc8b3048 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,4 +6,4 @@ For questions or general discussion, please open a [discussion](https://github.c To contribute code, fork the repository, make your changes, and submit a pull request. Please review our [Developer Guide](https://reeds-model.github.io/ReEDS/developer_best_practices.html) before getting started. -**Note:** if you're considering making a change that might lead to meaningful differences in model capability, workflow, or outputs, we recommend initiating a [discussion](https://github.com/ReEDS-Model/ReEDS/discussions). \ No newline at end of file +**Note:** if you're considering making a change that might lead to meaningful differences in model capability, workflow, or outputs, we recommend initiating a [discussion](https://github.com/ReEDS-Model/ReEDS/discussions). diff --git a/b_inputs.gms b/b_inputs.gms index f1b09e54..4c2fe255 100644 --- a/b_inputs.gms +++ b/b_inputs.gms @@ -546,6 +546,7 @@ alias(cendiv,cendiv2) ; alias(rscbin,arscbin) ; alias(nercr,nercrr) ; alias(transgrp,transgrpp) ; +alias(transreg,transregg) ; alias(itlgrp,itlgrpp) ; parameter yeart(t) "numeric value for year", @@ -3540,12 +3541,12 @@ routes_transgroup(transgrp,transgrpp,r,rr)$[ $(not sameas(r,rr)) ] = yes ; -set routes_nercr(nercr,nercrr,r,rr) "collection of routes between nercrs" ; -routes_nercr(nercr,nercrr,r,rr)$[ +parameter routes_transreg(transreg,transregg,r,rr) "collection of routes between transregs" ; +routes_transreg(transreg,transregg,r,rr)$[ sum{(t,trtype), routes(r,rr,trtype,t) } - $r_nercr(r,nercr) - $r_nercr(rr,nercrr) - $(not sameas(nercr,nercrr)) + $r_transreg(r,transreg) + $r_transreg(rr,transregg) + $(not sameas(transreg,transregg)) $(not sameas(r,rr)) ] = yes ; @@ -4961,7 +4962,7 @@ $onlisting / ; $onempty -parameter firm_import_limit(nercr,allt) "--fraction-- limit on net firm imports into NERC regions" +parameter firm_import_limit(transreg,allt) "--fraction-- limit on net firm imports into FERC regions" / $offlisting $ondelim @@ -4970,11 +4971,11 @@ $offdelim $onlisting / ; -parameter peakload_nercr(nercr,allt) "--MW-- Peak exogenous demand across all weather years by NERC region" +parameter peakload_transreg(transreg,allt) "--MW-- Peak exogenous demand across all weather years by FERC region" / $offlisting $ondelim -$include inputs_case%ds%peakload_nercr.csv +$include inputs_case%ds%peakload_transreg.csv $offdelim $onlisting / ; diff --git a/c_mga.gms b/c_mga.gms index 8bf3841b..b004f9ee 100644 --- a/c_mga.gms +++ b/c_mga.gms @@ -44,15 +44,15 @@ eq_MGA_Objective$Sw_MGA.. $elseif.mgaobj %GSw_MGA_Objective% == 'rasharing' Equation eq_MGA_Objective "--MWh-- Defines RA flows for MGA" ; -Variable MGA_OBJ "--MWh-- Flows between NERC regions during stress periods" ; +Variable MGA_OBJ "--MWh-- Flows between FERC regions during stress periods" ; eq_MGA_Objective$Sw_MGA.. MGA_OBJ =e= - sum{(r,rr,h,trtype,nercr,nercrr,t) + sum{(r,rr,h,trtype,transreg,transregg,t) $[tmodel(t) $routes(r,rr,trtype,t) $routes_prm(r,rr) - $routes_nercr(nercr,nercrr,r,rr) + $routes_transreg(transreg,transregg,r,rr) $h_stress(h)], FLOW(r,rr,h,t,trtype) * hours(h) } diff --git a/c_supplymodel.gms b/c_supplymodel.gms index d0a5d102..865d5952 100644 --- a/c_supplymodel.gms +++ b/c_supplymodel.gms @@ -295,8 +295,8 @@ eq_interconnection_queues(tg,r,t) "--MW-- capacity deployment limit base eq_CAPTRAN_ITL(itlgrp,itlgrpp,t) "--MW-- combined flow capacity between ITL groups" eq_itlgrp_limit_energy(itlgrp,itlgrpp,allh,t) "--MW-- limit on combined interface energy flows for ITLs" eq_itlgrp_limit_prm(itlgrp,itlgrpp,ccseason,t) "--MW-- limit on combined interface PRM flows for ITLs" - eq_firm_transfer_limit(nercr,allh,t) "--MW-- limit net firm capacity imports into NERC regions when using stress periods" - eq_firm_transfer_limit_cc(nercr,ccseason,t) "--MW-- limit net firm capacity imports into NERC regions when using capacity credit" + eq_firm_transfer_limit(transreg,allh,t) "--MW-- limit net firm capacity imports into FERC regions when using stress periods" + eq_firm_transfer_limit_cc(transreg,ccseason,t) "--MW-- limit net firm capacity imports into FERC regions when using capacity credit" eq_offshore_no_backflow(r,rr,trtype,allh,t) "--MW-- disallow transmission flows from land to offshore zones" * storage-specific equations @@ -2171,51 +2171,51 @@ eq_itlgrp_limit_prm(itlgrp,itlgrpp,ccseason,t) * --------------------------------------------------------------------------- -* NERC regions are only allowed to import firm capacity up to their limit -eq_firm_transfer_limit(nercr,h,t) +* FERC regions are only allowed to import firm capacity up to their limit +eq_firm_transfer_limit(transreg,h,t) $[tmodel(t) $Sw_PRM_NetImportLimit $h_stress(h)].. -* max net import fraction [.] * peak demand by NERC region [MW] - firm_import_limit(nercr,t) * peakload_nercr(nercr,t) +* max net import fraction [.] * peak demand by FERC region [MW] + firm_import_limit(transreg,t) * peakload_transreg(transreg,t) =g= * net transmission imports (i.e. minus exports) accounting for losses on imports * imports [MW] - + sum{(r,rr,trtype,nercrr) - $[routes(rr,r,trtype,t)$routes_prm(rr,r)$routes_nercr(nercrr,nercr,rr,r)], + + sum{(r,rr,trtype,transregg) + $[routes(rr,r,trtype,t)$routes_prm(rr,r)$routes_transreg(transregg,transreg,rr,r)], FLOW(rr,r,h,t,trtype) * (1 - tranloss(rr,r,trtype)) } * exports [MW] - - sum{(r,rr,trtype,nercrr) - $[routes(r,rr,trtype,t)$routes_prm(r,rr)$routes_nercr(nercr,nercrr,r,rr)], + - sum{(r,rr,trtype,transregg) + $[routes(r,rr,trtype,t)$routes_prm(r,rr)$routes_transreg(transreg,transregg,r,rr)], FLOW(r,rr,h,t,trtype) } ; * --------------------------------------------------------------------------- -* NERC regions are only allowed to import firm capacity up to their limit -eq_firm_transfer_limit_cc(nercr,ccseason,t) +* FERC regions are only allowed to import firm capacity up to their limit +eq_firm_transfer_limit_cc(transreg,ccseason,t) $[tmodel(t) $Sw_PRM_NetImportLimit $Sw_PRM_CapCredit $(not Sw_PCM)].. * max net import fraction [.] * peak demand by ccseason [MW] - firm_import_limit(nercr,t) - * sum{r$r_nercr(r,nercr), peakdem_static_ccseason(r,ccseason,t) } + firm_import_limit(transreg,t) + * sum{r$r_transreg(r,transreg), peakdem_static_ccseason(r,ccseason,t) } =g= * net transmission imports (i.e. minus exports) accounting for losses on imports * imports [MW] - + sum{(r,rr,trtype,nercrr) - $[routes(rr,r,trtype,t)$routes_prm(rr,r)$routes_nercr(nercrr,nercr,rr,r)], + + sum{(r,rr,trtype,transregg) + $[routes(rr,r,trtype,t)$routes_prm(rr,r)$routes_transreg(transregg,transreg,rr,r)], PRMTRADE(rr,r,trtype,ccseason,t) * (1 - tranloss(rr,r,trtype)) } * exports [MW] - - sum{(r,rr,trtype,nercrr) - $[routes(r,rr,trtype,t)$routes_prm(r,rr)$routes_nercr(nercr,nercrr,r,rr)], + - sum{(r,rr,trtype,transregg) + $[routes(r,rr,trtype,t)$routes_prm(r,rr)$routes_transreg(transreg,transregg,r,rr)], PRMTRADE(r,rr,trtype,ccseason,t) } ; diff --git a/cases.csv b/cases.csv index 317faeb0..f3d1a497 100644 --- a/cases.csv +++ b/cases.csv @@ -259,7 +259,7 @@ GSw_PRM_CapCreditSeasons,Season definition to use for capacity credit (2season i GSw_PRM_hierarchy_level,hierarchy level within which to calculate peak demand,r; nercr; transreg; transgrp; cendiv; st; interconnect; country; usda_region,nercr, GSw_PRM_NetImportLimit,Turn on (1) or off (0) the eq_firm_transfer_limit constraint on max firm net imports (NOTE: This constraint is only applied during stress periods in ReEDS; it is not applied in PRAS),0; 1,1, GSw_PRM_NetImportLimitScen,/-delimited list of {year}_{max percent import OR 'hist' for historical percent OR 'histmax' for max historical percent across all regions} values to use in eq_firm_transfer_limit,N/A,2031_hist/2050_100, -GSw_PRM_scenario,"column of inputs/reserves/prm_annual.csv from which to draw the PRM (""nerc"" means the annual values from the 2024 NERC LTRA; ""static"" means the 2024 values from the same source); or a float (like 0.12) which gets applied as a fraction to all regions in all years (0.12 means 12%)",(static|nerc|ramp2025_20by50|^\d*\.?\d+$),0.12, +GSw_PRM_scenario,"column of inputs/reserves/prm_annual.csv from which to draw the PRM (""nerc"" means the annual values from the 2024 NERC LTRA; ""static"" means the 2026 values from the same source); or a float (like 0.12) which gets applied as a fraction to all regions in all years (0.12 means 12%)",(static|nerc|^\d*\.?\d+$),0.12, GSw_PRM_StressIncrement,How many stress periods to add per iteration,int,2, GSw_PRM_StressIterateMax,Max number of times to iterate on a given solve year to achieve GSw_PRM_StressThreshold when using stress periods (0 means don't iterate; 1 means 1 extra ReEDS run; etc),int,5, GSw_PRM_StressLoadAggMethod,How to aggregate load for stress periods within the chunks specified by GSw_HourlyChunkLengthStress (only used if GSw_HourlyChunkAggMethod=mean; otherwise GSw_HourlyChunkAggMethod is used),mean; max,max, diff --git a/docs/source/figs/docs/hierarchy.png b/docs/source/figs/docs/hierarchy.png index fb9f345b..57c89ad5 100644 --- a/docs/source/figs/docs/hierarchy.png +++ b/docs/source/figs/docs/hierarchy.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcd25f1740960b6381039e6a25e60b2247367d619c404f330b5fb00e073b26a7 -size 2266315 +oid sha256:52223405faf9e8cfaf945c0b9ac264c63a4c835c06fda35129c7bceed257f1d7 +size 2272078 diff --git a/docs/source/plotting_scripts/maps.py b/docs/source/plotting_scripts/maps.py index ec6d4f5f..3a89a52c 100644 --- a/docs/source/plotting_scripts/maps.py +++ b/docs/source/plotting_scripts/maps.py @@ -121,9 +121,11 @@ 'New_England':c['b'], }, 'nercr': { - 'WECC_CA':c['y'], - 'WECC_NW':c['b'], - 'WECC_SW':c['g'], + 'WECC_NW':cm2(8), + 'WECC_BA':cm2(9), + 'WECC_RM':cm2(10), + 'WECC_CA':cm2(10), + 'WECC_SW':cm2(11), 'SPP':c['y'], 'ERCOT':c['b'], 'MISO':c['g'], diff --git a/input_processing/hourly_load.py b/input_processing/hourly_load.py index 516a50ca..ad545bf2 100644 --- a/input_processing/hourly_load.py +++ b/input_processing/hourly_load.py @@ -737,13 +737,13 @@ def main(reeds_path, inputs_case): reeds.io.write_profile_to_h5(regional_load_hourly, 'load.h5', inputs_case) peakload.to_csv(os.path.join(inputs_case,'peakload.csv')) - ### Write peak demand by NERC region to use in firm net import constraint + ### Write peak demand by FERC region to use in firm net import constraint ( - peakload.loc['nercr'] + peakload.loc['transreg'] .stack('year') - .rename_axis(['*nercr','t']) + .rename_axis(['*transreg','t']) .rename('MW') - .to_csv(os.path.join(inputs_case,'peakload_nercr.csv')) + .to_csv(os.path.join(inputs_case,'peakload_transreg.csv')) ) if int(sw.GSw_DRShed): reeds.io.write_profile_to_h5(regional_dr_shed_hourly, 'dr_shed_hourly.h5', inputs_case) diff --git a/input_processing/transmission.py b/input_processing/transmission.py index 913ea293..eda8296f 100644 --- a/input_processing/transmission.py +++ b/input_processing/transmission.py @@ -221,10 +221,10 @@ def calculate_co2_storage_routes(dfzones, co2_storage_sites): ### --- PROCEDURE --- ### =========================================================================== -#%% Limits on PRMTRADE across nercr boundaries +#%% Limits on PRMTRADE across transreg boundaries if not int(sw.GSw_PRM_NetImportLimit): ## No limit - firm_import_limit = pd.DataFrame(columns=['*nercr','t','fraction']).set_index(['*nercr','t']) + firm_import_limit = pd.DataFrame(columns=['*transreg','t','fraction']).set_index(['*transreg','t']) else: limits = pd.Series( {int(i.split('_')[0]): i.split('_')[1] for i in sw.GSw_PRM_NetImportLimitScen.split('/')} @@ -240,12 +240,12 @@ def calculate_co2_storage_routes(dfzones, co2_storage_sites): ## calculate the historical net_firm_import fraction for each region and drop negative values peak_net_imports = pd.read_csv( os.path.join(inputs_case,'peak_net_imports.csv'), - index_col=['nercr'] + index_col=['transreg'] ) net_firm_import_frac = ( peak_net_imports.MW / peak_net_imports.MW_TotalDemand ).clip(lower=0) - nercrs = net_firm_import_frac.index + transregs = net_firm_import_frac.index _dfout = {} for key, val in limits.items(): @@ -260,14 +260,14 @@ def calculate_co2_storage_routes(dfzones, co2_storage_sites): _dfout[y] = net_firm_import_frac.clip(lower=net_firm_import_frac.max()) else: ## Input values are percentages so convert to fractions - _dfout[key] = pd.Series(index=nercrs, data=float(val) / 100) + _dfout[key] = pd.Series(index=transregs, data=float(val) / 100) firm_import_limit = ( - pd.concat(_dfout, names=('t',)).unstack('nercr') + pd.concat(_dfout, names=('t',)).unstack('transreg') ## Linear interpolation between values; flat projections before and after .reindex(allyears).interpolate('linear').bfill().ffill() .loc[solveyears] - .unstack('t').rename('fraction').rename_axis(['*nercr','t']) + .unstack('t').rename('fraction').rename_axis(['*transreg','t']) ) firm_import_limit.to_csv(os.path.join(inputs_case, 'firm_import_limit.csv')) diff --git a/inputs/reserves/peak_net_imports.csv b/inputs/reserves/peak_net_imports.csv index 9587fd38..4ec9c581 100644 --- a/inputs/reserves/peak_net_imports.csv +++ b/inputs/reserves/peak_net_imports.csv @@ -1,14 +1,12 @@ -nercr,t,MW,MW_TotalDemand -MISO,2024,16100,121933 -NPCC_NE,2024,1800,24633 -NPCC_NY,2024,5000,32280 -PJM,2024,11800,149737 -SERC_E,2024,2800,44014 -SERC_C,2024,4400,42259 -SERC_F,2024,2900,53190 -SERC_SE,2024,4800,46354 -SPP,2024,4000,53603 -ERCOT,2024,800,84325 -WECC_CA,2024,12600,57178 -WECC_NW,2024,8800,62899 -WECC_SW,2024,7300,26749 \ No newline at end of file +transreg,t,MW,MW_TotalDemand +CAISO,2024,12600,59900 +NorthernGrid,2024,8800,48200 +WestConnect,2024,7300,38700 +ERCOT,2024,800,83900 +SPP,2024,4000,54500 +MISO,2024,16100,131000 +SERTP,2024,9000,128000 +FRCC,2024,2900,51100 +PJM,2024,11800,150400 +NYISO,2024,5000,32300 +ISONE,2024,1800,25700 diff --git a/inputs/reserves/prm_annual.csv b/inputs/reserves/prm_annual.csv index 695a95ff..b6af6fcf 100644 --- a/inputs/reserves/prm_annual.csv +++ b/inputs/reserves/prm_annual.csv @@ -1,339 +1,376 @@ -*nercr,t,static,nerc,ramp2025_20by50 -MISO,2025,0.092,0.092,0.167 -MISO,2026,0.092,0.094,0.169 -MISO,2027,0.092,0.096,0.17 -MISO,2028,0.092,0.095,0.171 -MISO,2029,0.092,0.094,0.173 -MISO,2030,0.092,0.094,0.174 -MISO,2031,0.092,0.095,0.175 -MISO,2032,0.092,0.096,0.176 -MISO,2033,0.092,0.097,0.178 -MISO,2034,0.092,0.097,0.179 -MISO,2035,0.092,0.097,0.18 -MISO,2036,0.092,0.097,0.182 -MISO,2037,0.092,0.097,0.183 -MISO,2038,0.092,0.097,0.184 -MISO,2039,0.092,0.097,0.186 -MISO,2040,0.092,0.097,0.187 -MISO,2041,0.092,0.097,0.188 -MISO,2042,0.092,0.097,0.19 -MISO,2043,0.092,0.097,0.191 -MISO,2044,0.092,0.097,0.192 -MISO,2045,0.092,0.097,0.193 -MISO,2046,0.092,0.097,0.195 -MISO,2047,0.092,0.097,0.196 -MISO,2048,0.092,0.097,0.197 -MISO,2049,0.092,0.097,0.199 -MISO,2050,0.092,0.097,0.2 -NPCC_NE,2025,0.127,0.127,0.132 -NPCC_NE,2026,0.127,0.118,0.134 -NPCC_NE,2027,0.127,0.113,0.137 -NPCC_NE,2028,0.127,0.113,0.14 -NPCC_NE,2029,0.127,0.113,0.143 -NPCC_NE,2030,0.127,0.113,0.145 -NPCC_NE,2031,0.127,0.113,0.148 -NPCC_NE,2032,0.127,0.113,0.151 -NPCC_NE,2033,0.127,0.113,0.154 -NPCC_NE,2034,0.127,0.113,0.156 -NPCC_NE,2035,0.127,0.113,0.159 -NPCC_NE,2036,0.127,0.113,0.162 -NPCC_NE,2037,0.127,0.113,0.165 -NPCC_NE,2038,0.127,0.113,0.167 -NPCC_NE,2039,0.127,0.113,0.17 -NPCC_NE,2040,0.127,0.113,0.173 -NPCC_NE,2041,0.127,0.113,0.175 -NPCC_NE,2042,0.127,0.113,0.178 -NPCC_NE,2043,0.127,0.113,0.181 -NPCC_NE,2044,0.127,0.113,0.184 -NPCC_NE,2045,0.127,0.113,0.186 -NPCC_NE,2046,0.127,0.113,0.189 -NPCC_NE,2047,0.127,0.113,0.192 -NPCC_NE,2048,0.127,0.113,0.195 -NPCC_NE,2049,0.127,0.113,0.197 -NPCC_NE,2050,0.127,0.113,0.2 -NPCC_NY,2025,0.15,0.15,0.152 -NPCC_NY,2026,0.15,0.15,0.154 -NPCC_NY,2027,0.15,0.15,0.156 -NPCC_NY,2028,0.15,0.15,0.158 -NPCC_NY,2029,0.15,0.15,0.16 -NPCC_NY,2030,0.15,0.15,0.162 -NPCC_NY,2031,0.15,0.15,0.163 -NPCC_NY,2032,0.15,0.15,0.165 -NPCC_NY,2033,0.15,0.15,0.167 -NPCC_NY,2034,0.15,0.15,0.169 -NPCC_NY,2035,0.15,0.15,0.171 -NPCC_NY,2036,0.15,0.15,0.173 -NPCC_NY,2037,0.15,0.15,0.175 -NPCC_NY,2038,0.15,0.15,0.177 -NPCC_NY,2039,0.15,0.15,0.179 -NPCC_NY,2040,0.15,0.15,0.181 -NPCC_NY,2041,0.15,0.15,0.183 -NPCC_NY,2042,0.15,0.15,0.185 -NPCC_NY,2043,0.15,0.15,0.187 -NPCC_NY,2044,0.15,0.15,0.188 -NPCC_NY,2045,0.15,0.15,0.19 -NPCC_NY,2046,0.15,0.15,0.192 -NPCC_NY,2047,0.15,0.15,0.194 -NPCC_NY,2048,0.15,0.15,0.196 -NPCC_NY,2049,0.15,0.15,0.198 -NPCC_NY,2050,0.15,0.15,0.2 -PJM,2025,0.177,0.177,0.15 -PJM,2026,0.177,0.177,0.152 -PJM,2027,0.177,0.176,0.154 -PJM,2028,0.177,0.176,0.156 -PJM,2029,0.177,0.176,0.158 -PJM,2030,0.177,0.176,0.16 -PJM,2031,0.177,0.176,0.162 -PJM,2032,0.177,0.176,0.164 -PJM,2033,0.177,0.176,0.166 -PJM,2034,0.177,0.176,0.168 -PJM,2035,0.177,0.176,0.17 -PJM,2036,0.177,0.176,0.172 -PJM,2037,0.177,0.176,0.174 -PJM,2038,0.177,0.176,0.176 -PJM,2039,0.177,0.176,0.178 -PJM,2040,0.177,0.176,0.18 -PJM,2041,0.177,0.176,0.182 -PJM,2042,0.177,0.176,0.184 -PJM,2043,0.177,0.176,0.186 -PJM,2044,0.177,0.176,0.188 -PJM,2045,0.177,0.176,0.19 -PJM,2046,0.177,0.176,0.192 -PJM,2047,0.177,0.176,0.194 -PJM,2048,0.177,0.176,0.196 -PJM,2049,0.177,0.176,0.198 -PJM,2050,0.177,0.176,0.2 -SERC_E,2025,0.15,0.15,0.152 -SERC_E,2026,0.15,0.15,0.154 -SERC_E,2027,0.15,0.15,0.156 -SERC_E,2028,0.15,0.15,0.158 -SERC_E,2029,0.15,0.15,0.16 -SERC_E,2030,0.15,0.15,0.162 -SERC_E,2031,0.15,0.15,0.163 -SERC_E,2032,0.15,0.15,0.165 -SERC_E,2033,0.15,0.15,0.167 -SERC_E,2034,0.15,0.15,0.169 -SERC_E,2035,0.15,0.15,0.171 -SERC_E,2036,0.15,0.15,0.173 -SERC_E,2037,0.15,0.15,0.175 -SERC_E,2038,0.15,0.15,0.177 -SERC_E,2039,0.15,0.15,0.179 -SERC_E,2040,0.15,0.15,0.181 -SERC_E,2041,0.15,0.15,0.183 -SERC_E,2042,0.15,0.15,0.185 -SERC_E,2043,0.15,0.15,0.187 -SERC_E,2044,0.15,0.15,0.188 -SERC_E,2045,0.15,0.15,0.19 -SERC_E,2046,0.15,0.15,0.192 -SERC_E,2047,0.15,0.15,0.194 -SERC_E,2048,0.15,0.15,0.196 -SERC_E,2049,0.15,0.15,0.198 -SERC_E,2050,0.15,0.15,0.2 -SERC_C,2025,0.15,0.15,0.152 -SERC_C,2026,0.15,0.15,0.154 -SERC_C,2027,0.15,0.15,0.156 -SERC_C,2028,0.15,0.15,0.158 -SERC_C,2029,0.15,0.15,0.16 -SERC_C,2030,0.15,0.15,0.162 -SERC_C,2031,0.15,0.15,0.163 -SERC_C,2032,0.15,0.15,0.165 -SERC_C,2033,0.15,0.15,0.167 -SERC_C,2034,0.15,0.15,0.169 -SERC_C,2035,0.15,0.15,0.171 -SERC_C,2036,0.15,0.15,0.173 -SERC_C,2037,0.15,0.15,0.175 -SERC_C,2038,0.15,0.15,0.177 -SERC_C,2039,0.15,0.15,0.179 -SERC_C,2040,0.15,0.15,0.181 -SERC_C,2041,0.15,0.15,0.183 -SERC_C,2042,0.15,0.15,0.185 -SERC_C,2043,0.15,0.15,0.187 -SERC_C,2044,0.15,0.15,0.188 -SERC_C,2045,0.15,0.15,0.19 -SERC_C,2046,0.15,0.15,0.192 -SERC_C,2047,0.15,0.15,0.194 -SERC_C,2048,0.15,0.15,0.196 -SERC_C,2049,0.15,0.15,0.198 -SERC_C,2050,0.15,0.15,0.2 -SERC_F,2025,0.15,0.15,0.152 -SERC_F,2026,0.15,0.15,0.154 -SERC_F,2027,0.15,0.15,0.156 -SERC_F,2028,0.15,0.15,0.158 -SERC_F,2029,0.15,0.15,0.16 -SERC_F,2030,0.15,0.15,0.162 -SERC_F,2031,0.15,0.15,0.163 -SERC_F,2032,0.15,0.15,0.165 -SERC_F,2033,0.15,0.15,0.167 -SERC_F,2034,0.15,0.15,0.169 -SERC_F,2035,0.15,0.15,0.171 -SERC_F,2036,0.15,0.15,0.173 -SERC_F,2037,0.15,0.15,0.175 -SERC_F,2038,0.15,0.15,0.177 -SERC_F,2039,0.15,0.15,0.179 -SERC_F,2040,0.15,0.15,0.181 -SERC_F,2041,0.15,0.15,0.183 -SERC_F,2042,0.15,0.15,0.185 -SERC_F,2043,0.15,0.15,0.187 -SERC_F,2044,0.15,0.15,0.188 -SERC_F,2045,0.15,0.15,0.19 -SERC_F,2046,0.15,0.15,0.192 -SERC_F,2047,0.15,0.15,0.194 -SERC_F,2048,0.15,0.15,0.196 -SERC_F,2049,0.15,0.15,0.198 -SERC_F,2050,0.15,0.15,0.2 -SERC_SE,2025,0.15,0.15,0.152 -SERC_SE,2026,0.15,0.15,0.154 -SERC_SE,2027,0.15,0.15,0.156 -SERC_SE,2028,0.15,0.15,0.158 -SERC_SE,2029,0.15,0.15,0.16 -SERC_SE,2030,0.15,0.15,0.162 -SERC_SE,2031,0.15,0.15,0.163 -SERC_SE,2032,0.15,0.15,0.165 -SERC_SE,2033,0.15,0.15,0.167 -SERC_SE,2034,0.15,0.15,0.169 -SERC_SE,2035,0.15,0.15,0.171 -SERC_SE,2036,0.15,0.15,0.173 -SERC_SE,2037,0.15,0.15,0.175 -SERC_SE,2038,0.15,0.15,0.177 -SERC_SE,2039,0.15,0.15,0.179 -SERC_SE,2040,0.15,0.15,0.181 -SERC_SE,2041,0.15,0.15,0.183 -SERC_SE,2042,0.15,0.15,0.185 -SERC_SE,2043,0.15,0.15,0.187 -SERC_SE,2044,0.15,0.15,0.188 -SERC_SE,2045,0.15,0.15,0.19 -SERC_SE,2046,0.15,0.15,0.192 -SERC_SE,2047,0.15,0.15,0.194 -SERC_SE,2048,0.15,0.15,0.196 -SERC_SE,2049,0.15,0.15,0.198 -SERC_SE,2050,0.15,0.15,0.2 -SPP,2025,0.19,0.19,0.19 -SPP,2026,0.19,0.19,0.191 -SPP,2027,0.19,0.19,0.191 -SPP,2028,0.19,0.19,0.192 -SPP,2029,0.19,0.19,0.192 -SPP,2030,0.19,0.19,0.192 -SPP,2031,0.19,0.19,0.193 -SPP,2032,0.19,0.19,0.193 -SPP,2033,0.19,0.19,0.193 -SPP,2034,0.19,0.19,0.194 -SPP,2035,0.19,0.19,0.194 -SPP,2036,0.19,0.19,0.195 -SPP,2037,0.19,0.19,0.195 -SPP,2038,0.19,0.19,0.195 -SPP,2039,0.19,0.19,0.196 -SPP,2040,0.19,0.19,0.196 -SPP,2041,0.19,0.19,0.197 -SPP,2042,0.19,0.19,0.197 -SPP,2043,0.19,0.19,0.197 -SPP,2044,0.19,0.19,0.198 -SPP,2045,0.19,0.19,0.198 -SPP,2046,0.19,0.19,0.198 -SPP,2047,0.19,0.19,0.199 -SPP,2048,0.19,0.19,0.199 -SPP,2049,0.19,0.19,0.2 -SPP,2050,0.19,0.19,0.2 -ERCOT,2025,0.1375,0.1375,0.14 -ERCOT,2026,0.1375,0.1375,0.142 -ERCOT,2027,0.1375,0.1375,0.145 -ERCOT,2028,0.1375,0.1375,0.147 -ERCOT,2029,0.1375,0.1375,0.15 -ERCOT,2030,0.1375,0.1375,0.152 -ERCOT,2031,0.1375,0.1375,0.154 -ERCOT,2032,0.1375,0.1375,0.157 -ERCOT,2033,0.1375,0.1375,0.159 -ERCOT,2034,0.1375,0.1375,0.162 -ERCOT,2035,0.1375,0.1375,0.164 -ERCOT,2036,0.1375,0.1375,0.166 -ERCOT,2037,0.1375,0.1375,0.169 -ERCOT,2038,0.1375,0.1375,0.171 -ERCOT,2039,0.1375,0.1375,0.174 -ERCOT,2040,0.1375,0.1375,0.176 -ERCOT,2041,0.1375,0.1375,0.178 -ERCOT,2042,0.1375,0.1375,0.181 -ERCOT,2043,0.1375,0.1375,0.183 -ERCOT,2044,0.1375,0.1375,0.186 -ERCOT,2045,0.1375,0.1375,0.188 -ERCOT,2046,0.1375,0.1375,0.19 -ERCOT,2047,0.1375,0.1375,0.193 -ERCOT,2048,0.1375,0.1375,0.195 -ERCOT,2049,0.1375,0.1375,0.198 -ERCOT,2050,0.1375,0.1375,0.2 -WECC_CA,2025,0.174,0.174,0.187 -WECC_CA,2026,0.174,0.174,0.187 -WECC_CA,2027,0.174,0.164,0.188 -WECC_CA,2028,0.174,0.174,0.188 -WECC_CA,2029,0.174,0.166,0.189 -WECC_CA,2030,0.174,0.164,0.19 -WECC_CA,2031,0.174,0.161,0.19 -WECC_CA,2032,0.174,0.163,0.191 -WECC_CA,2033,0.174,0.149,0.191 -WECC_CA,2034,0.174,0.153,0.192 -WECC_CA,2035,0.174,0.153,0.192 -WECC_CA,2036,0.174,0.153,0.193 -WECC_CA,2037,0.174,0.153,0.193 -WECC_CA,2038,0.174,0.153,0.194 -WECC_CA,2039,0.174,0.153,0.194 -WECC_CA,2040,0.174,0.153,0.195 -WECC_CA,2041,0.174,0.153,0.195 -WECC_CA,2042,0.174,0.153,0.196 -WECC_CA,2043,0.174,0.153,0.196 -WECC_CA,2044,0.174,0.153,0.197 -WECC_CA,2045,0.174,0.153,0.197 -WECC_CA,2046,0.174,0.153,0.198 -WECC_CA,2047,0.174,0.153,0.198 -WECC_CA,2048,0.174,0.153,0.199 -WECC_CA,2049,0.174,0.153,0.199 -WECC_CA,2050,0.174,0.153,0.2 -WECC_NW,2025,0.163,0.163,0.189 -WECC_NW,2026,0.163,0.158,0.19 -WECC_NW,2027,0.163,0.159,0.19 -WECC_NW,2028,0.163,0.154,0.191 -WECC_NW,2029,0.163,0.147,0.191 -WECC_NW,2030,0.163,0.145,0.192 -WECC_NW,2031,0.163,0.143,0.192 -WECC_NW,2032,0.163,0.142,0.192 -WECC_NW,2033,0.163,0.144,0.193 -WECC_NW,2034,0.163,0.138,0.193 -WECC_NW,2035,0.163,0.138,0.194 -WECC_NW,2036,0.163,0.138,0.194 -WECC_NW,2037,0.163,0.138,0.195 -WECC_NW,2038,0.163,0.138,0.195 -WECC_NW,2039,0.163,0.138,0.195 -WECC_NW,2040,0.163,0.138,0.196 -WECC_NW,2041,0.163,0.138,0.196 -WECC_NW,2042,0.163,0.138,0.197 -WECC_NW,2043,0.163,0.138,0.197 -WECC_NW,2044,0.163,0.138,0.197 -WECC_NW,2045,0.163,0.138,0.198 -WECC_NW,2046,0.163,0.138,0.198 -WECC_NW,2047,0.163,0.138,0.199 -WECC_NW,2048,0.163,0.138,0.199 -WECC_NW,2049,0.163,0.138,0.2 -WECC_NW,2050,0.163,0.138,0.2 -WECC_SW,2025,0.11,0.11,0.134 -WECC_SW,2026,0.11,0.108,0.136 -WECC_SW,2027,0.11,0.12,0.139 -WECC_SW,2028,0.11,0.117,0.142 -WECC_SW,2029,0.11,0.102,0.144 -WECC_SW,2030,0.11,0.101,0.147 -WECC_SW,2031,0.11,0.099,0.15 -WECC_SW,2032,0.11,0.097,0.152 -WECC_SW,2033,0.11,0.108,0.155 -WECC_SW,2034,0.11,0.094,0.158 -WECC_SW,2035,0.11,0.094,0.16 -WECC_SW,2036,0.11,0.094,0.163 -WECC_SW,2037,0.11,0.094,0.166 -WECC_SW,2038,0.11,0.094,0.168 -WECC_SW,2039,0.11,0.094,0.171 -WECC_SW,2040,0.11,0.094,0.173 -WECC_SW,2041,0.11,0.094,0.176 -WECC_SW,2042,0.11,0.094,0.179 -WECC_SW,2043,0.11,0.094,0.181 -WECC_SW,2044,0.11,0.094,0.184 -WECC_SW,2045,0.11,0.094,0.187 -WECC_SW,2046,0.11,0.094,0.189 -WECC_SW,2047,0.11,0.094,0.192 -WECC_SW,2048,0.11,0.094,0.195 -WECC_SW,2049,0.11,0.094,0.197 -WECC_SW,2050,0.11,0.094,0.2 \ No newline at end of file +*nercr,t,static,nerc +MISO,2026,0.081,0.081 +MISO,2027,0.081,0.083 +MISO,2028,0.081,0.085 +MISO,2029,0.081,0.085 +MISO,2030,0.081,0.085 +MISO,2031,0.081,0.086 +MISO,2032,0.081,0.087 +MISO,2033,0.081,0.088 +MISO,2034,0.081,0.089 +MISO,2035,0.081,0.089 +MISO,2036,0.081,0.089 +MISO,2037,0.081,0.089 +MISO,2038,0.081,0.089 +MISO,2039,0.081,0.089 +MISO,2040,0.081,0.089 +MISO,2041,0.081,0.089 +MISO,2042,0.081,0.089 +MISO,2043,0.081,0.089 +MISO,2044,0.081,0.089 +MISO,2045,0.081,0.089 +MISO,2046,0.081,0.089 +MISO,2047,0.081,0.089 +MISO,2048,0.081,0.089 +MISO,2049,0.081,0.089 +MISO,2050,0.081,0.089 +NPCC_NE,2026,0.134,0.134 +NPCC_NE,2027,0.134,0.13 +NPCC_NE,2028,0.134,0.13 +NPCC_NE,2029,0.134,0.13 +NPCC_NE,2030,0.134,0.13 +NPCC_NE,2031,0.134,0.13 +NPCC_NE,2032,0.134,0.13 +NPCC_NE,2033,0.134,0.13 +NPCC_NE,2034,0.134,0.13 +NPCC_NE,2035,0.134,0.13 +NPCC_NE,2036,0.134,0.13 +NPCC_NE,2037,0.134,0.13 +NPCC_NE,2038,0.134,0.13 +NPCC_NE,2039,0.134,0.13 +NPCC_NE,2040,0.134,0.13 +NPCC_NE,2041,0.134,0.13 +NPCC_NE,2042,0.134,0.13 +NPCC_NE,2043,0.134,0.13 +NPCC_NE,2044,0.134,0.13 +NPCC_NE,2045,0.134,0.13 +NPCC_NE,2046,0.134,0.13 +NPCC_NE,2047,0.134,0.13 +NPCC_NE,2048,0.134,0.13 +NPCC_NE,2049,0.134,0.13 +NPCC_NE,2050,0.134,0.13 +NPCC_NY,2026,0.15,0.15 +NPCC_NY,2027,0.15,0.15 +NPCC_NY,2028,0.15,0.15 +NPCC_NY,2029,0.15,0.15 +NPCC_NY,2030,0.15,0.15 +NPCC_NY,2031,0.15,0.15 +NPCC_NY,2032,0.15,0.15 +NPCC_NY,2033,0.15,0.15 +NPCC_NY,2034,0.15,0.15 +NPCC_NY,2035,0.15,0.15 +NPCC_NY,2036,0.15,0.15 +NPCC_NY,2037,0.15,0.15 +NPCC_NY,2038,0.15,0.15 +NPCC_NY,2039,0.15,0.15 +NPCC_NY,2040,0.15,0.15 +NPCC_NY,2041,0.15,0.15 +NPCC_NY,2042,0.15,0.15 +NPCC_NY,2043,0.15,0.15 +NPCC_NY,2044,0.15,0.15 +NPCC_NY,2045,0.15,0.15 +NPCC_NY,2046,0.15,0.15 +NPCC_NY,2047,0.15,0.15 +NPCC_NY,2048,0.15,0.15 +NPCC_NY,2049,0.15,0.15 +NPCC_NY,2050,0.15,0.15 +PJM,2026,0.186,0.186 +PJM,2027,0.186,0.201 +PJM,2028,0.186,0.219 +PJM,2029,0.186,0.239 +PJM,2030,0.186,0.263 +PJM,2031,0.186,0.289 +PJM,2032,0.186,0.308 +PJM,2033,0.186,0.33 +PJM,2034,0.186,0.351 +PJM,2035,0.186,0.351 +PJM,2036,0.186,0.351 +PJM,2037,0.186,0.351 +PJM,2038,0.186,0.351 +PJM,2039,0.186,0.351 +PJM,2040,0.186,0.351 +PJM,2041,0.186,0.351 +PJM,2042,0.186,0.351 +PJM,2043,0.186,0.351 +PJM,2044,0.186,0.351 +PJM,2045,0.186,0.351 +PJM,2046,0.186,0.351 +PJM,2047,0.186,0.351 +PJM,2048,0.186,0.351 +PJM,2049,0.186,0.351 +PJM,2050,0.186,0.351 +SERC_E,2026,0.15,0.15 +SERC_E,2027,0.15,0.15 +SERC_E,2028,0.15,0.15 +SERC_E,2029,0.15,0.15 +SERC_E,2030,0.15,0.15 +SERC_E,2031,0.15,0.15 +SERC_E,2032,0.15,0.15 +SERC_E,2033,0.15,0.15 +SERC_E,2034,0.15,0.15 +SERC_E,2035,0.15,0.15 +SERC_E,2036,0.15,0.15 +SERC_E,2037,0.15,0.15 +SERC_E,2038,0.15,0.15 +SERC_E,2039,0.15,0.15 +SERC_E,2040,0.15,0.15 +SERC_E,2041,0.15,0.15 +SERC_E,2042,0.15,0.15 +SERC_E,2043,0.15,0.15 +SERC_E,2044,0.15,0.15 +SERC_E,2045,0.15,0.15 +SERC_E,2046,0.15,0.15 +SERC_E,2047,0.15,0.15 +SERC_E,2048,0.15,0.15 +SERC_E,2049,0.15,0.15 +SERC_E,2050,0.15,0.15 +SERC_C,2026,0.15,0.15 +SERC_C,2027,0.15,0.15 +SERC_C,2028,0.15,0.15 +SERC_C,2029,0.15,0.15 +SERC_C,2030,0.15,0.15 +SERC_C,2031,0.15,0.15 +SERC_C,2032,0.15,0.15 +SERC_C,2033,0.15,0.15 +SERC_C,2034,0.15,0.15 +SERC_C,2035,0.15,0.15 +SERC_C,2036,0.15,0.15 +SERC_C,2037,0.15,0.15 +SERC_C,2038,0.15,0.15 +SERC_C,2039,0.15,0.15 +SERC_C,2040,0.15,0.15 +SERC_C,2041,0.15,0.15 +SERC_C,2042,0.15,0.15 +SERC_C,2043,0.15,0.15 +SERC_C,2044,0.15,0.15 +SERC_C,2045,0.15,0.15 +SERC_C,2046,0.15,0.15 +SERC_C,2047,0.15,0.15 +SERC_C,2048,0.15,0.15 +SERC_C,2049,0.15,0.15 +SERC_C,2050,0.15,0.15 +SERC_F,2026,0.15,0.15 +SERC_F,2027,0.15,0.15 +SERC_F,2028,0.15,0.15 +SERC_F,2029,0.15,0.15 +SERC_F,2030,0.15,0.15 +SERC_F,2031,0.15,0.15 +SERC_F,2032,0.15,0.15 +SERC_F,2033,0.15,0.15 +SERC_F,2034,0.15,0.15 +SERC_F,2035,0.15,0.15 +SERC_F,2036,0.15,0.15 +SERC_F,2037,0.15,0.15 +SERC_F,2038,0.15,0.15 +SERC_F,2039,0.15,0.15 +SERC_F,2040,0.15,0.15 +SERC_F,2041,0.15,0.15 +SERC_F,2042,0.15,0.15 +SERC_F,2043,0.15,0.15 +SERC_F,2044,0.15,0.15 +SERC_F,2045,0.15,0.15 +SERC_F,2046,0.15,0.15 +SERC_F,2047,0.15,0.15 +SERC_F,2048,0.15,0.15 +SERC_F,2049,0.15,0.15 +SERC_F,2050,0.15,0.15 +SERC_SE,2026,0.15,0.15 +SERC_SE,2027,0.15,0.15 +SERC_SE,2028,0.15,0.15 +SERC_SE,2029,0.15,0.15 +SERC_SE,2030,0.15,0.15 +SERC_SE,2031,0.15,0.15 +SERC_SE,2032,0.15,0.15 +SERC_SE,2033,0.15,0.15 +SERC_SE,2034,0.15,0.15 +SERC_SE,2035,0.15,0.15 +SERC_SE,2036,0.15,0.15 +SERC_SE,2037,0.15,0.15 +SERC_SE,2038,0.15,0.15 +SERC_SE,2039,0.15,0.15 +SERC_SE,2040,0.15,0.15 +SERC_SE,2041,0.15,0.15 +SERC_SE,2042,0.15,0.15 +SERC_SE,2043,0.15,0.15 +SERC_SE,2044,0.15,0.15 +SERC_SE,2045,0.15,0.15 +SERC_SE,2046,0.15,0.15 +SERC_SE,2047,0.15,0.15 +SERC_SE,2048,0.15,0.15 +SERC_SE,2049,0.15,0.15 +SERC_SE,2050,0.15,0.15 +SPP,2026,0.19,0.19 +SPP,2027,0.19,0.19 +SPP,2028,0.19,0.19 +SPP,2029,0.19,0.19 +SPP,2030,0.19,0.19 +SPP,2031,0.19,0.19 +SPP,2032,0.19,0.19 +SPP,2033,0.19,0.19 +SPP,2034,0.19,0.19 +SPP,2035,0.19,0.19 +SPP,2036,0.19,0.19 +SPP,2037,0.19,0.19 +SPP,2038,0.19,0.19 +SPP,2039,0.19,0.19 +SPP,2040,0.19,0.19 +SPP,2041,0.19,0.19 +SPP,2042,0.19,0.19 +SPP,2043,0.19,0.19 +SPP,2044,0.19,0.19 +SPP,2045,0.19,0.19 +SPP,2046,0.19,0.19 +SPP,2047,0.19,0.19 +SPP,2048,0.19,0.19 +SPP,2049,0.19,0.19 +SPP,2050,0.19,0.19 +ERCOT,2026,0.1375,0.1375 +ERCOT,2027,0.1375,0.1375 +ERCOT,2028,0.1375,0.1375 +ERCOT,2029,0.1375,0.1375 +ERCOT,2030,0.1375,0.1375 +ERCOT,2031,0.1375,0.1375 +ERCOT,2032,0.1375,0.1375 +ERCOT,2033,0.1375,0.1375 +ERCOT,2034,0.1375,0.1375 +ERCOT,2035,0.1375,0.1375 +ERCOT,2036,0.1375,0.1375 +ERCOT,2037,0.1375,0.1375 +ERCOT,2038,0.1375,0.1375 +ERCOT,2039,0.1375,0.1375 +ERCOT,2040,0.1375,0.1375 +ERCOT,2041,0.1375,0.1375 +ERCOT,2042,0.1375,0.1375 +ERCOT,2043,0.1375,0.1375 +ERCOT,2044,0.1375,0.1375 +ERCOT,2045,0.1375,0.1375 +ERCOT,2046,0.1375,0.1375 +ERCOT,2047,0.1375,0.1375 +ERCOT,2048,0.1375,0.1375 +ERCOT,2049,0.1375,0.1375 +ERCOT,2050,0.1375,0.1375 +WECC_BA,2026,0.123,0.123 +WECC_BA,2027,0.123,0.14 +WECC_BA,2028,0.123,0.136 +WECC_BA,2029,0.123,0.124 +WECC_BA,2030,0.123,0.123 +WECC_BA,2031,0.123,0.121 +WECC_BA,2032,0.123,0.121 +WECC_BA,2033,0.123,0.125 +WECC_BA,2034,0.123,0.118 +WECC_BA,2035,0.123,0.118 +WECC_BA,2036,0.123,0.118 +WECC_BA,2037,0.123,0.118 +WECC_BA,2038,0.123,0.118 +WECC_BA,2039,0.123,0.118 +WECC_BA,2040,0.123,0.118 +WECC_BA,2041,0.123,0.118 +WECC_BA,2042,0.123,0.118 +WECC_BA,2043,0.123,0.118 +WECC_BA,2044,0.123,0.118 +WECC_BA,2045,0.123,0.118 +WECC_BA,2046,0.123,0.118 +WECC_BA,2047,0.123,0.118 +WECC_BA,2048,0.123,0.118 +WECC_BA,2049,0.123,0.118 +WECC_BA,2050,0.123,0.118 +WECC_CA,2026,0.203,0.203 +WECC_CA,2027,0.203,0.192 +WECC_CA,2028,0.203,0.193 +WECC_CA,2029,0.203,0.197 +WECC_CA,2030,0.203,0.193 +WECC_CA,2031,0.203,0.191 +WECC_CA,2032,0.203,0.189 +WECC_CA,2033,0.203,0.178 +WECC_CA,2034,0.203,0.183 +WECC_CA,2035,0.203,0.18 +WECC_CA,2036,0.203,0.18 +WECC_CA,2037,0.203,0.18 +WECC_CA,2038,0.203,0.18 +WECC_CA,2039,0.203,0.18 +WECC_CA,2040,0.203,0.18 +WECC_CA,2041,0.203,0.18 +WECC_CA,2042,0.203,0.18 +WECC_CA,2043,0.203,0.18 +WECC_CA,2044,0.203,0.18 +WECC_CA,2045,0.203,0.18 +WECC_CA,2046,0.203,0.18 +WECC_CA,2047,0.203,0.18 +WECC_CA,2048,0.203,0.18 +WECC_CA,2049,0.203,0.18 +WECC_CA,2050,0.203,0.18 +WECC_NW,2026,0.178,0.178 +WECC_NW,2027,0.178,0.174 +WECC_NW,2028,0.178,0.161 +WECC_NW,2029,0.178,0.158 +WECC_NW,2030,0.178,0.155 +WECC_NW,2031,0.178,0.153 +WECC_NW,2032,0.178,0.159 +WECC_NW,2033,0.178,0.15 +WECC_NW,2034,0.178,0.149 +WECC_NW,2035,0.178,0.148 +WECC_NW,2036,0.178,0.148 +WECC_NW,2037,0.178,0.148 +WECC_NW,2038,0.178,0.148 +WECC_NW,2039,0.178,0.148 +WECC_NW,2040,0.178,0.148 +WECC_NW,2041,0.178,0.148 +WECC_NW,2042,0.178,0.148 +WECC_NW,2043,0.178,0.148 +WECC_NW,2044,0.178,0.148 +WECC_NW,2045,0.178,0.148 +WECC_NW,2046,0.178,0.148 +WECC_NW,2047,0.178,0.148 +WECC_NW,2048,0.178,0.148 +WECC_NW,2049,0.178,0.148 +WECC_NW,2050,0.178,0.148 +WECC_RM,2026,0.178,0.178 +WECC_RM,2027,0.178,0.17 +WECC_RM,2028,0.178,0.162 +WECC_RM,2029,0.178,0.161 +WECC_RM,2030,0.178,0.157 +WECC_RM,2031,0.178,0.152 +WECC_RM,2032,0.178,0.135 +WECC_RM,2033,0.178,0.119 +WECC_RM,2034,0.178,0.141 +WECC_RM,2035,0.178,0.139 +WECC_RM,2036,0.178,0.139 +WECC_RM,2037,0.178,0.139 +WECC_RM,2038,0.178,0.139 +WECC_RM,2039,0.178,0.139 +WECC_RM,2040,0.178,0.139 +WECC_RM,2041,0.178,0.139 +WECC_RM,2042,0.178,0.139 +WECC_RM,2043,0.178,0.139 +WECC_RM,2044,0.178,0.139 +WECC_RM,2045,0.178,0.139 +WECC_RM,2046,0.178,0.139 +WECC_RM,2047,0.178,0.139 +WECC_RM,2048,0.178,0.139 +WECC_RM,2049,0.178,0.139 +WECC_RM,2050,0.178,0.139 +WECC_SW,2026,0.133,0.133 +WECC_SW,2027,0.133,0.137 +WECC_SW,2028,0.133,0.136 +WECC_SW,2029,0.133,0.126 +WECC_SW,2030,0.133,0.122 +WECC_SW,2031,0.133,0.12 +WECC_SW,2032,0.133,0.117 +WECC_SW,2033,0.133,0.123 +WECC_SW,2034,0.133,0.113 +WECC_SW,2035,0.133,0.111 +WECC_SW,2036,0.133,0.111 +WECC_SW,2037,0.133,0.111 +WECC_SW,2038,0.133,0.111 +WECC_SW,2039,0.133,0.111 +WECC_SW,2040,0.133,0.111 +WECC_SW,2041,0.133,0.111 +WECC_SW,2042,0.133,0.111 +WECC_SW,2043,0.133,0.111 +WECC_SW,2044,0.133,0.111 +WECC_SW,2045,0.133,0.111 +WECC_SW,2046,0.133,0.111 +WECC_SW,2047,0.133,0.111 +WECC_SW,2048,0.133,0.111 +WECC_SW,2049,0.133,0.111 +WECC_SW,2050,0.133,0.111 diff --git a/inputs/transmission/itl_NARIS.csv b/inputs/transmission/itl_NARIS.csv index bfebc09e..76f59748 100644 --- a/inputs/transmission/itl_NARIS.csv +++ b/inputs/transmission/itl_NARIS.csv @@ -8259,3 +8259,12 @@ f9fab923074eb0137e30884c0b7307c8,d3774dcfca90bff92d7c0a8f599f528f,2468.8,2425.9 1e6982b55fe741c6a51790b0770c3846,841c2a930bed28657683d456c34aac5b,2400.9,2488.6 1e6982b55fe741c6a51790b0770c3846,32272a4c1470b41045d52b71ff3cdeb1,161.3,99.4 1e6982b55fe741c6a51790b0770c3846,8a8a86b32305477d768f427b90f16634,15922.2,14139.2 +1967627f52fd7bce2a873f889a10b76d,50429f255f0345eb0f7c06048a3bfd71,1966.8,1747.6 +1967627f52fd7bce2a873f889a10b76d,4de1b9b5eeb78c3b47f6267e9de87200,1939.7,2156.9 +1967627f52fd7bce2a873f889a10b76d,93c60e196565e9ff1f9538d9ce09c9ea,963.7,976.5 +1967627f52fd7bce2a873f889a10b76d,f5388e5c384abbf77fd4314510e6d963,2938.0,4034.3 +1967627f52fd7bce2a873f889a10b76d,55b8e288c28c187ed6dde56c7213df9d,1880.2,1626.5 +1967627f52fd7bce2a873f889a10b76d,7c746f18fdb901f6fabe3662f1358996,1631.2,1728.9 +50429f255f0345eb0f7c06048a3bfd71,4de1b9b5eeb78c3b47f6267e9de87200,432.9,573.3 +50429f255f0345eb0f7c06048a3bfd71,f5388e5c384abbf77fd4314510e6d963,309.9,409.3 +50429f255f0345eb0f7c06048a3bfd71,a43b589f3028c19279d7dae1cbcf33ed,3152.8,2596.9 diff --git a/inputs/userinput/futurefiles.csv b/inputs/userinput/futurefiles.csv index defb65b5..43234cc9 100644 --- a/inputs/userinput/futurefiles.csv +++ b/inputs/userinput/futurefiles.csv @@ -302,7 +302,7 @@ pcm_defaults.json,.json,1,None,9999,None,9999,0,constant,None,None,new, peak_ccseason.csv,.csv,2,None,wide,"r,ccseason",1,0,linear_5,None,None,"ignore if not EFS, else apply projection",linear_10 peak_h.csv,.csv,2,None,wide,"r,h",1,0,linear_5,None,None,"ignore if not EFS, else apply projection",linear_10 peak_net_imports.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new, -peakload_nercr.csv,.csv,0,None,t,*nercr,0,0,linear_5,None,None,new, +peakload_transreg.csv,.csv,0,None,t,*transreg,0,0,linear_5,None,None,new, peakload.csv,.csv,0,None,wide,"level,region",1,0,linear_5,None,None,new, period_szn_user.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new, pipeline_cost_mult.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new, diff --git a/inputs/zones/UTcounty/hierarchy.csv b/inputs/zones/UTcounty/hierarchy.csv index e431b66a..ba898a24 100644 --- a/inputs/zones/UTcounty/hierarchy.csv +++ b/inputs/zones/UTcounty/hierarchy.csv @@ -10,26 +10,26 @@ p8,CA,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_West p9,CA,western,CAISO,CAISO,WECC_CA,CAISO p10,CA,western,CAISO,CAISO,WECC_CA,CAISO p11,CA,western,CAISO,CAISO,WECC_CA,CAISO -p12,NV,western,NorthernGrid,NorthernGrid_South,WECC_NW,Nevada_Power_Co -p13,NV,western,NorthernGrid,NorthernGrid_South,WECC_NW,Nevada_Power_Co +p12,NV,western,NorthernGrid,NorthernGrid_South,WECC_SW,Nevada_Power_Co +p13,NV,western,NorthernGrid,NorthernGrid_South,WECC_SW,Nevada_Power_Co p14,ID,western,NorthernGrid,NorthernGrid_East,WECC_NW,Avista_Corp -p15,ID,western,NorthernGrid,NorthernGrid_East,WECC_NW,Idaho_Power_Co -p16,ID,western,NorthernGrid,NorthernGrid_East,WECC_NW,Idaho_Power_Co +p15,ID,western,NorthernGrid,NorthernGrid_East,WECC_BA,Idaho_Power_Co +p16,ID,western,NorthernGrid,NorthernGrid_East,WECC_BA,Idaho_Power_Co p17,MT,western,NorthernGrid,NorthernGrid_East,WECC_NW,Northwestern_Energy p18,MT,western,NorthernGrid,NorthernGrid_East,WECC_NW,Northwestern_Energy p19,MT,western,NorthernGrid,NorthernGrid_East,WECC_NW,WAPA_Upper_Great_Plains_West p20,MT,western,NorthernGrid,NorthernGrid_East,WECC_NW,Northwestern_Energy -p21,WY,western,NorthernGrid,NorthernGrid_East,WECC_NW,PacifiCorp_East -p22,WY,western,NorthernGrid,NorthernGrid_East,WECC_NW,PacifiCorp_East -p23,WY,western,WestConnect,WestConnect_North,WECC_NW,WAPA_Rocky_Mountain_Region -p24,WY,western,WestConnect,WestConnect_North,WECC_NW,WAPA_Rocky_Mountain_Region +p21,WY,western,NorthernGrid,NorthernGrid_East,WECC_RM,PacifiCorp_East +p22,WY,western,NorthernGrid,NorthernGrid_East,WECC_RM,PacifiCorp_East +p23,WY,western,WestConnect,WestConnect_North,WECC_RM,WAPA_Rocky_Mountain_Region +p24,WY,western,WestConnect,WestConnect_North,WECC_RM,WAPA_Rocky_Mountain_Region p27,AZ,western,WestConnect,WestConnect_South,WECC_SW,WAPA_Desert_Southwest_Region z28,AZ,western,WestConnect,WestConnect_South,WECC_SW,Arizona_Public_Service_Co p29,AZ,western,WestConnect,WestConnect_South,WECC_SW,Arizona_Public_Service_Co p31,NM,western,WestConnect,WestConnect_South,WECC_SW,Public_Service_Co_of_New_Mexico -p32,SD,western,WestConnect,WestConnect_North,WECC_NW,WAPA_Rocky_Mountain_Region -p33,CO,western,WestConnect,WestConnect_North,WECC_NW,Public_Service_Co_of_Colorado -p34,CO,western,WestConnect,WestConnect_North,WECC_NW,Public_Service_Co_of_Colorado +p32,SD,western,WestConnect,WestConnect_North,WECC_RM,WAPA_Rocky_Mountain_Region +p33,CO,western,WestConnect,WestConnect_North,WECC_RM,Public_Service_Co_of_Colorado +p34,CO,western,WestConnect,WestConnect_North,WECC_RM,Public_Service_Co_of_Colorado p35,MT,eastern,SPP,SPP_North,SPP,SPP p36,ND,eastern,SPP,SPP_North,SPP,SPP p37,ND,eastern,MISO,MISO_North,MISO,MISO @@ -129,32 +129,32 @@ p131,MA,eastern,ISONE,ISONE,NPCC_NE,ISONE p132,CT,eastern,ISONE,ISONE,NPCC_NE,ISONE p133,RI,eastern,ISONE,ISONE,NPCC_NE,ISONE p134,ME,eastern,ISONE,ISONE,NPCC_NE,ISONE -p49001,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49003,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49005,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49007,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49009,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49011,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49013,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49015,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49017,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49019,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49021,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49023,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49025,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49027,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49029,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49031,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49033,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49035,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49037,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49039,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49041,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49043,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49045,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49047,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49049,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49051,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49053,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49055,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East -p49057,UT,western,NorthernGrid,NorthernGrid_South,WECC_NW,PacifiCorp_East +p49001,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49003,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49005,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49007,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49009,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49011,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49013,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49015,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49017,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49019,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49021,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49023,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49025,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49027,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49029,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49031,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49033,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49035,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49037,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49039,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49041,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49043,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49045,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49047,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49049,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49051,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49053,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49055,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East +p49057,UT,western,NorthernGrid,NorthernGrid_South,WECC_BA,PacifiCorp_East diff --git a/inputs/zones/UTcounty/hierarchy_from134.csv b/inputs/zones/UTcounty/hierarchy_from134.csv index c1b5a1a7..1284cc4f 100644 --- a/inputs/zones/UTcounty/hierarchy_from134.csv +++ b/inputs/zones/UTcounty/hierarchy_from134.csv @@ -10,29 +10,29 @@ p8,WECC_NW,NorthernGrid,NorthernGrid_South,Pacific,CA,western,USA,pacific,Califo p9,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p9 p10,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p10 p11,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p11 -p12,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 -p13,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 +p12,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 +p13,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Avista_Corp,p14 -p15,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 -p16,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 +p15,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 +p16,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 p17,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p17 p18,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p18 p19,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,WAPA_Upper_Great_Plains_West,p19 p20,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p20 -p21,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 -p22,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 -p23,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 -p24,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 -p25,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 -p26,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 +p21,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 +p22,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 +p23,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 +p24,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 +p25,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 +p26,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 p27,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,WAPA_Desert_Southwest_Region,p27 p28,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p29,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,p29 p30,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p31,WECC_SW,WestConnect,WestConnect_South,Mountain,NM,western,USA,mountain,Southwest,Public_Service_Co_of_New_Mexico,p31 -p32,WECC_NW,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 -p33,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 -p34,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 +p32,WECC_RM,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 +p33,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 +p34,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 p35,SPP,SPP,SPP_North,West_North_Central,MT,eastern,USA,mountain,Mountain,SPP,p35 p36,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,p36 p37,MISO,MISO,MISO_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,MISO,p37 diff --git a/inputs/zones/z132/hierarchy.csv b/inputs/zones/z132/hierarchy.csv index dc8e6f6d..6f5457f0 100644 --- a/inputs/zones/z132/hierarchy.csv +++ b/inputs/zones/z132/hierarchy.csv @@ -10,28 +10,28 @@ p8,WECC_NW,NorthernGrid,NorthernGrid_South,CA,western,PacifiCorp_West p9,WECC_CA,CAISO,CAISO,CA,western,CAISO p10,WECC_CA,CAISO,CAISO,CA,western,CAISO p11,WECC_CA,CAISO,CAISO,CA,western,CAISO -p12,WECC_NW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co -p13,WECC_NW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co +p12,WECC_SW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co +p13,WECC_SW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co p14,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Avista_Corp -p15,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co -p16,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co +p15,WECC_BA,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co +p16,WECC_BA,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co p17,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,Northwestern_Energy p18,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,Northwestern_Energy p19,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,WAPA_Upper_Great_Plains_West p20,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,Northwestern_Energy -p21,WECC_NW,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East -p22,WECC_NW,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East -p23,WECC_NW,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region -p24,WECC_NW,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region -p25,WECC_NW,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East -p26,WECC_NW,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East +p21,WECC_RM,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East +p22,WECC_RM,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East +p23,WECC_RM,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region +p24,WECC_RM,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region +p25,WECC_BA,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East +p26,WECC_BA,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East p27,WECC_SW,WestConnect,WestConnect_South,AZ,western,WAPA_Desert_Southwest_Region z28,WECC_SW,WestConnect,WestConnect_South,AZ,western,Arizona_Public_Service_Co p29,WECC_SW,WestConnect,WestConnect_South,AZ,western,Arizona_Public_Service_Co p31,WECC_SW,WestConnect,WestConnect_South,NM,western,Public_Service_Co_of_New_Mexico -p32,WECC_NW,WestConnect,WestConnect_North,SD,western,WAPA_Rocky_Mountain_Region -p33,WECC_NW,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado -p34,WECC_NW,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado +p32,WECC_RM,WestConnect,WestConnect_North,SD,western,WAPA_Rocky_Mountain_Region +p33,WECC_RM,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado +p34,WECC_RM,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado p35,SPP,SPP,SPP_North,MT,eastern,SPP p36,SPP,SPP,SPP_North,ND,eastern,SPP p37,MISO,MISO,MISO_North,ND,eastern,MISO diff --git a/inputs/zones/z132/hierarchy_from134.csv b/inputs/zones/z132/hierarchy_from134.csv index c1b5a1a7..1284cc4f 100644 --- a/inputs/zones/z132/hierarchy_from134.csv +++ b/inputs/zones/z132/hierarchy_from134.csv @@ -10,29 +10,29 @@ p8,WECC_NW,NorthernGrid,NorthernGrid_South,Pacific,CA,western,USA,pacific,Califo p9,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p9 p10,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p10 p11,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p11 -p12,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 -p13,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 +p12,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 +p13,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Avista_Corp,p14 -p15,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 -p16,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 +p15,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 +p16,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 p17,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p17 p18,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p18 p19,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,WAPA_Upper_Great_Plains_West,p19 p20,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p20 -p21,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 -p22,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 -p23,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 -p24,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 -p25,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 -p26,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 +p21,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 +p22,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 +p23,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 +p24,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 +p25,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 +p26,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 p27,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,WAPA_Desert_Southwest_Region,p27 p28,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p29,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,p29 p30,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p31,WECC_SW,WestConnect,WestConnect_South,Mountain,NM,western,USA,mountain,Southwest,Public_Service_Co_of_New_Mexico,p31 -p32,WECC_NW,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 -p33,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 -p34,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 +p32,WECC_RM,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 +p33,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 +p34,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 p35,SPP,SPP,SPP_North,West_North_Central,MT,eastern,USA,mountain,Mountain,SPP,p35 p36,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,p36 p37,MISO,MISO,MISO_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,MISO,p37 diff --git a/inputs/zones/z134/hierarchy.csv b/inputs/zones/z134/hierarchy.csv index 3cc8ecd3..0b7431c9 100644 --- a/inputs/zones/z134/hierarchy.csv +++ b/inputs/zones/z134/hierarchy.csv @@ -10,29 +10,29 @@ p8,WECC_NW,NorthernGrid,NorthernGrid_South,CA,western,PacifiCorp_West,p8 p9,WECC_CA,CAISO,CAISO,CA,western,CAISO,p9 p10,WECC_CA,CAISO,CAISO,CA,western,CAISO,p10 p11,WECC_CA,CAISO,CAISO,CA,western,CAISO,p11 -p12,WECC_NW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co,p12 -p13,WECC_NW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co,p13 +p12,WECC_SW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co,p12 +p13,WECC_SW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co,p13 p14,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Avista_Corp,p14 -p15,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co,p15 -p16,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co,p16 +p15,WECC_BA,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co,p15 +p16,WECC_BA,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co,p16 p17,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,Northwestern_Energy,p17 p18,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,Northwestern_Energy,p18 p19,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,WAPA_Upper_Great_Plains_West,p19 p20,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,Northwestern_Energy,p20 -p21,WECC_NW,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East,p21 -p22,WECC_NW,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East,p22 -p23,WECC_NW,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region,p23 -p24,WECC_NW,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region,p24 -p25,WECC_NW,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East,p25 -p26,WECC_NW,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East,p26 +p21,WECC_RM,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East,p21 +p22,WECC_RM,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East,p22 +p23,WECC_RM,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region,p23 +p24,WECC_RM,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region,p24 +p25,WECC_BA,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East,p25 +p26,WECC_BA,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East,p26 p27,WECC_SW,WestConnect,WestConnect_South,AZ,western,WAPA_Desert_Southwest_Region,p27 p28,WECC_SW,WestConnect,WestConnect_South,AZ,western,Arizona_Public_Service_Co,z28 p29,WECC_SW,WestConnect,WestConnect_South,AZ,western,Arizona_Public_Service_Co,p29 p30,WECC_SW,WestConnect,WestConnect_South,AZ,western,Arizona_Public_Service_Co,z28 p31,WECC_SW,WestConnect,WestConnect_South,NM,western,Public_Service_Co_of_New_Mexico,p31 -p32,WECC_NW,WestConnect,WestConnect_North,SD,western,WAPA_Rocky_Mountain_Region,p32 -p33,WECC_NW,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado,p33 -p34,WECC_NW,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado,p34 +p32,WECC_RM,WestConnect,WestConnect_North,SD,western,WAPA_Rocky_Mountain_Region,p32 +p33,WECC_RM,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado,p33 +p34,WECC_RM,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado,p34 p35,SPP,SPP,SPP_North,MT,eastern,SPP,p35 p36,SPP,SPP,SPP_North,ND,eastern,SPP,p36 p37,MISO,MISO,MISO_North,ND,eastern,MISO,p37 diff --git a/inputs/zones/z134/hierarchy_from134.csv b/inputs/zones/z134/hierarchy_from134.csv index c1b5a1a7..1284cc4f 100644 --- a/inputs/zones/z134/hierarchy_from134.csv +++ b/inputs/zones/z134/hierarchy_from134.csv @@ -10,29 +10,29 @@ p8,WECC_NW,NorthernGrid,NorthernGrid_South,Pacific,CA,western,USA,pacific,Califo p9,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p9 p10,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p10 p11,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p11 -p12,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 -p13,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 +p12,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 +p13,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Avista_Corp,p14 -p15,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 -p16,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 +p15,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 +p16,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 p17,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p17 p18,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p18 p19,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,WAPA_Upper_Great_Plains_West,p19 p20,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p20 -p21,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 -p22,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 -p23,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 -p24,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 -p25,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 -p26,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 +p21,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 +p22,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 +p23,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 +p24,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 +p25,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 +p26,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 p27,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,WAPA_Desert_Southwest_Region,p27 p28,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p29,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,p29 p30,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p31,WECC_SW,WestConnect,WestConnect_South,Mountain,NM,western,USA,mountain,Southwest,Public_Service_Co_of_New_Mexico,p31 -p32,WECC_NW,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 -p33,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 -p34,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 +p32,WECC_RM,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 +p33,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 +p34,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 p35,SPP,SPP,SPP_North,West_North_Central,MT,eastern,USA,mountain,Mountain,SPP,p35 p36,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,p36 p37,MISO,MISO,MISO_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,MISO,p37 diff --git a/inputs/zones/z3109/hierarchy.csv b/inputs/zones/z3109/hierarchy.csv index b00a5ff7..bdd45697 100644 --- a/inputs/zones/z3109/hierarchy.csv +++ b/inputs/zones/z3109/hierarchy.csv @@ -132,23 +132,23 @@ p06071,CA,western,CAISO,CAISO,WECC_CA,CAISO p06107,CA,western,CAISO,CAISO,WECC_CA,CAISO p06111,CA,western,CAISO,CAISO,WECC_CA,CAISO p06073,CA,western,CAISO,CAISO,WECC_CA,CAISO -p32001,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32005,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32007,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32009,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32011,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32013,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32015,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32017,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32019,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32021,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32023,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32027,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32029,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32031,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32033,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32510,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co -p32003,NV,western,NorthernGrid_South,NorthernGrid,WECC_NW,Nevada_Power_Co +p32001,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32005,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32007,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32009,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32011,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32013,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32015,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32017,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32019,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32021,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32023,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32027,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32029,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32031,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32033,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32510,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co +p32003,NV,western,NorthernGrid_South,NorthernGrid,WECC_SW,Nevada_Power_Co p16009,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Avista_Corp p16017,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Avista_Corp p16021,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Avista_Corp @@ -156,43 +156,43 @@ p16055,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Avista_Corp p16057,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Avista_Corp p16061,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Avista_Corp p16069,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Avista_Corp -p16001,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16003,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16013,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16015,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16023,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16025,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16027,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16035,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16037,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16039,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16045,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16047,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16049,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16053,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16059,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16063,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16067,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16073,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16075,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16079,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16085,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16087,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16005,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16007,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16011,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16019,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16029,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16031,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16033,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16041,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16043,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16051,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16065,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16071,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16077,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16081,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co -p16083,ID,western,NorthernGrid_East,NorthernGrid,WECC_NW,Idaho_Power_Co +p16001,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16003,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16013,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16015,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16023,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16025,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16027,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16035,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16037,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16039,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16045,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16047,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16049,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16053,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16059,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16063,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16067,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16073,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16075,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16079,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16085,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16087,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16005,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16007,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16011,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16019,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16029,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16031,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16033,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16041,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16043,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16051,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16065,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16071,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16077,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16081,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co +p16083,ID,western,NorthernGrid_East,NorthernGrid,WECC_BA,Idaho_Power_Co p30001,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy p30007,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy p30023,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy @@ -238,58 +238,58 @@ p30087,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy p30103,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy p30107,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy p30111,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy -p56003,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56013,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56017,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56023,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56029,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56035,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56037,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56039,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56041,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56043,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56019,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56033,WY,western,NorthernGrid_East,NorthernGrid,WECC_NW,PacifiCorp_East -p56005,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56011,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56045,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56001,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56007,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56009,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56015,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56021,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56025,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56027,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p56031,WY,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p49001,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49003,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49005,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49007,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49011,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49015,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49017,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49019,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49021,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49023,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49025,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49027,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49031,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49035,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49037,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49039,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49041,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49045,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49049,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49053,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49055,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49057,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49009,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49013,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49029,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49033,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49043,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49047,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East -p49051,UT,western,NorthernGrid_South,NorthernGrid,WECC_NW,PacifiCorp_East +p56003,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56013,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56017,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56023,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56029,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56035,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56037,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56039,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56041,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56043,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56019,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56033,WY,western,NorthernGrid_East,NorthernGrid,WECC_RM,PacifiCorp_East +p56005,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56011,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56045,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56001,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56007,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56009,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56015,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56021,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56025,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56027,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p56031,WY,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p49001,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49003,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49005,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49007,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49011,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49015,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49017,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49019,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49021,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49023,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49025,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49027,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49031,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49035,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49037,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49039,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49041,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49045,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49049,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49053,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49055,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49057,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49009,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49013,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49029,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49033,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49043,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49047,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East +p49051,UT,western,NorthernGrid_South,NorthernGrid,WECC_BA,PacifiCorp_East p04015,AZ,western,WestConnect_South,WestConnect,WECC_SW,WAPA_Desert_Southwest_Region p04003,AZ,western,WestConnect_South,WestConnect,WECC_SW,Arizona_Public_Service_Co p04005,AZ,western,WestConnect_South,WestConnect,WECC_SW,Arizona_Public_Service_Co @@ -332,75 +332,75 @@ p35055,NM,western,WestConnect_South,WestConnect,WECC_SW,Public_Service_Co_of_New p35057,NM,western,WestConnect_South,WestConnect,WECC_SW,Public_Service_Co_of_New_Mexico p35059,NM,western,WestConnect_South,WestConnect,WECC_SW,Public_Service_Co_of_New_Mexico p35061,NM,western,WestConnect_South,WestConnect,WECC_SW,Public_Service_Co_of_New_Mexico -p46019,SD,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p46033,SD,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p46047,SD,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p46081,SD,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p46103,SD,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region -p08001,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08005,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08013,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08014,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08019,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08031,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08035,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08037,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08045,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08047,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08049,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08057,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08059,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08065,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08069,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08075,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08077,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08081,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08087,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08093,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08095,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08097,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08103,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08107,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado +p46019,SD,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p46033,SD,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p46047,SD,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p46081,SD,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p46103,SD,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region +p08001,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08005,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08013,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08014,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08019,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08031,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08035,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08037,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08045,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08047,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08049,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08057,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08059,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08065,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08069,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08075,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08077,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08081,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08087,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08093,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08095,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08097,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08103,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08107,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado p08115,CO,eastern,SPP_North,SPP,SPP,SPP -p08117,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08119,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08121,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08123,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08125,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08003,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08007,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08009,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08011,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08015,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08017,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08021,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08023,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08025,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08027,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08029,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08033,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08039,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08041,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08043,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08051,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08053,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08055,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08061,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08063,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08067,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08071,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08073,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08079,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08083,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08085,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08089,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08091,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08099,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08101,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08105,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08109,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08111,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado -p08113,CO,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado +p08117,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08119,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08121,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08123,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08125,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08003,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08007,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08009,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08011,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08015,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08017,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08021,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08023,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08025,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08027,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08029,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08033,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08039,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08041,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08043,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08051,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08053,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08055,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08061,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08063,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08067,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08071,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08073,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08079,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08083,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08085,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08089,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08091,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08099,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08101,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08105,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08109,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08111,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado +p08113,CO,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado p30011,MT,western,NorthernGrid_East,NorthernGrid,WECC_NW,Northwestern_Energy p30017,MT,eastern,SPP_North,SPP,SPP,SPP p30019,MT,eastern,SPP_North,SPP,SPP,SPP @@ -533,11 +533,11 @@ p31029,NE,eastern,SPP_North,SPP,SPP,SPP p31033,NE,eastern,SPP_North,SPP,SPP,SPP p31045,NE,eastern,SPP_North,SPP,SPP,SPP p31049,NE,eastern,SPP_North,SPP,SPP,SPP -p31057,NE,western,WestConnect_North,WestConnect,WECC_NW,Public_Service_Co_of_Colorado +p31057,NE,western,WestConnect_North,WestConnect,WECC_RM,Public_Service_Co_of_Colorado p31069,NE,eastern,SPP_North,SPP,SPP,SPP p31075,NE,eastern,SPP_North,SPP,SPP,SPP p31101,NE,eastern,SPP_North,SPP,SPP,SPP -p31105,NE,western,WestConnect_North,WestConnect,WECC_NW,WAPA_Rocky_Mountain_Region +p31105,NE,western,WestConnect_North,WestConnect,WECC_RM,WAPA_Rocky_Mountain_Region p31123,NE,eastern,SPP_North,SPP,SPP,SPP p31135,NE,eastern,SPP_North,SPP,SPP,SPP p31157,NE,eastern,SPP_North,SPP,SPP,SPP diff --git a/inputs/zones/z3109/hierarchy_from134.csv b/inputs/zones/z3109/hierarchy_from134.csv index c1b5a1a7..1284cc4f 100644 --- a/inputs/zones/z3109/hierarchy_from134.csv +++ b/inputs/zones/z3109/hierarchy_from134.csv @@ -10,29 +10,29 @@ p8,WECC_NW,NorthernGrid,NorthernGrid_South,Pacific,CA,western,USA,pacific,Califo p9,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p9 p10,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p10 p11,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,p11 -p12,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 -p13,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 +p12,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p12 +p13,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,p13 p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Avista_Corp,p14 -p15,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 -p16,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 +p15,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p15 +p16,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,p16 p17,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p17 p18,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p18 p19,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,WAPA_Upper_Great_Plains_West,p19 p20,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,p20 -p21,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 -p22,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 -p23,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 -p24,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 -p25,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 -p26,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 +p21,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p21 +p22,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,p22 +p23,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p23 +p24,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,p24 +p25,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p25 +p26,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,p26 p27,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,WAPA_Desert_Southwest_Region,p27 p28,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p29,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,p29 p30,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,z28 p31,WECC_SW,WestConnect,WestConnect_South,Mountain,NM,western,USA,mountain,Southwest,Public_Service_Co_of_New_Mexico,p31 -p32,WECC_NW,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 -p33,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 -p34,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 +p32,WECC_RM,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,p32 +p33,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p33 +p34,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,p34 p35,SPP,SPP,SPP_North,West_North_Central,MT,eastern,USA,mountain,Mountain,SPP,p35 p36,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,p36 p37,MISO,MISO,MISO_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,MISO,p37 diff --git a/inputs/zones/z48/hierarchy.csv b/inputs/zones/z48/hierarchy.csv index 5a73f641..fcdbb384 100644 --- a/inputs/zones/z48/hierarchy.csv +++ b/inputs/zones/z48/hierarchy.csv @@ -3,13 +3,13 @@ AL,AL,SERTP,SERTP,SERC_SE,eastern,PowerSouth_Energy_Coop AR,AR,MISO,MISO_South,MISO,eastern,MISO AZ,AZ,WestConnect,WestConnect_South,WECC_SW,western,Arizona_Public_Service_Co CA,CA,CAISO,CAISO,WECC_CA,western,CAISO -CO,CO,WestConnect,WestConnect_North,WECC_NW,western,Public_Service_Co_of_Colorado +CO,CO,WestConnect,WestConnect_North,WECC_RM,western,Public_Service_Co_of_Colorado CT,CT,ISONE,ISONE,NPCC_NE,eastern,ISONE DE,DE,PJM,PJM_East,PJM,eastern,PJM FL,FL,FRCC,FRCC,SERC_F,eastern,Seminole_Electric_Coop_Inc GA,GA,SERTP,SERTP,SERC_SE,eastern,Southern_Co_Services_Inc IA,IA,MISO,MISO_North,MISO,eastern,MISO -ID,ID,NorthernGrid,NorthernGrid_East,WECC_NW,western,Idaho_Power_Co +ID,ID,NorthernGrid,NorthernGrid_East,WECC_BA,western,Idaho_Power_Co IL,IL,MISO,MISO_Central,MISO,eastern,MISO IN,IN,MISO,MISO_Central,MISO,eastern,MISO KS,KS,SPP,SPP_South,SPP,eastern,SPP @@ -29,7 +29,7 @@ NE,NE,SPP,SPP_North,SPP,eastern,SPP NH,NH,ISONE,ISONE,NPCC_NE,eastern,ISONE NJ,NJ,PJM,PJM_East,PJM,eastern,PJM NM,NM,WestConnect,WestConnect_South,WECC_SW,western,Public_Service_Co_of_New_Mexico -NV,NV,NorthernGrid,NorthernGrid_South,WECC_NW,western,Nevada_Power_Co +NV,NV,NorthernGrid,NorthernGrid_South,WECC_SW,western,Nevada_Power_Co NY,NY,NYISO,NYISO,NPCC_NY,eastern,NYISO OH,OH,PJM,PJM_East,PJM,eastern,PJM OK,OK,SPP,SPP_South,SPP,eastern,SPP @@ -40,10 +40,10 @@ SC,SC,SERTP,SERTP,SERC_E,eastern,Duke_Energy_Carolinas_LLC SD,SD,SPP,SPP_North,SPP,eastern,SPP TN,TN,SERTP,SERTP,SERC_C,eastern,Tennessee_Valley_Authority TX,TX,ERCOT,ERCOT,ERCOT,texas,ERCOT -UT,UT,NorthernGrid,NorthernGrid_South,WECC_NW,western,PacifiCorp_East +UT,UT,NorthernGrid,NorthernGrid_South,WECC_BA,western,PacifiCorp_East VA,VA,PJM,PJM_East,PJM,eastern,PJM VT,VT,ISONE,ISONE,NPCC_NE,eastern,ISONE WA,WA,NorthernGrid,NorthernGrid_West,WECC_NW,western,Bonneville_Power_Administration WI,WI,MISO,MISO_North,MISO,eastern,MISO WV,WV,PJM,PJM_East,PJM,eastern,PJM -WY,WY,NorthernGrid,NorthernGrid_East,WECC_NW,western,PacifiCorp_East +WY,WY,NorthernGrid,NorthernGrid_East,WECC_RM,western,PacifiCorp_East diff --git a/inputs/zones/z48/hierarchy_from134.csv b/inputs/zones/z48/hierarchy_from134.csv index c0275442..56964d33 100644 --- a/inputs/zones/z48/hierarchy_from134.csv +++ b/inputs/zones/z48/hierarchy_from134.csv @@ -10,8 +10,8 @@ p8,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA p9,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA p10,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA p11,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA -p12,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV -p13,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV +p12,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV +p13,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID p15,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID p16,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID @@ -19,20 +19,20 @@ p17,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Moun p18,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT p19,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT p20,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT -p21,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p22,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p23,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p24,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p25,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT -p26,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT +p21,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p22,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p23,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p24,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p25,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT +p26,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT p27,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p28,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p29,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p30,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p31,WECC_SW,WestConnect,WestConnect_South,Mountain,NM,western,USA,mountain,Southwest,Public_Service_Co_of_New_Mexico,NM p32,SPP,SPP,SPP_North,West_North_Central,SD,eastern,USA,northern-plains,Plains,SPP,SD -p33,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO -p34,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO +p33,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO +p34,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO p35,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT p36,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,ND p37,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,ND diff --git a/inputs/zones/z54/hierarchy.csv b/inputs/zones/z54/hierarchy.csv index e1095868..ee3f286c 100644 --- a/inputs/zones/z54/hierarchy.csv +++ b/inputs/zones/z54/hierarchy.csv @@ -4,13 +4,13 @@ AR,MISO,MISO,MISO_South,AR,eastern,MISO AZ,WECC_SW,WestConnect,WestConnect_South,AZ,western,Arizona_Public_Service_Co CA_N,WECC_CA,CAISO,CAISO,CA,western,CAISO CA_S,WECC_CA,CAISO,CAISO,CA,western,CAISO -CO,WECC_NW,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado +CO,WECC_RM,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado CT,NPCC_NE,ISONE,ISONE,CT,eastern,ISONE DE,PJM,PJM,PJM_East,DE,eastern,PJM FL,SERC_F,FRCC,FRCC,FL,eastern,Seminole_Electric_Coop_Inc GA,SERC_SE,SERTP,SERTP,GA,eastern,Southern_Co_Services_Inc IA,MISO,MISO,MISO_North,IA,eastern,MISO -ID,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co +ID,WECC_BA,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co IL_MISO,MISO,MISO,MISO_Central,IL,eastern,MISO IL_PJM,PJM,PJM,PJM_West,IL,eastern,PJM IN,MISO,MISO,MISO_Central,IN,eastern,MISO @@ -31,7 +31,7 @@ NE,SPP,SPP,SPP_North,NE,eastern,SPP NH,NPCC_NE,ISONE,ISONE,NH,eastern,ISONE NJ,PJM,PJM,PJM_East,NJ,eastern,PJM NM,WECC_SW,WestConnect,WestConnect_South,NM,western,Public_Service_Co_of_New_Mexico -NV,WECC_NW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co +NV,WECC_SW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co NY_NYCLI,NPCC_NY,NYISO,NYISO,NY,eastern,NYISO NY_UP,NPCC_NY,NYISO,NYISO,NY,eastern,NYISO OH,PJM,PJM,PJM_East,OH,eastern,PJM @@ -46,10 +46,10 @@ TX_ERCOT_E,ERCOT,ERCOT,ERCOT,TX,texas,ERCOT TX_ERCOT_W,ERCOT,ERCOT,ERCOT,TX,texas,ERCOT TX_MISO,MISO,MISO,MISO_South,TX,eastern,MISO TX_SPP,SPP,SPP,SPP_South,TX,eastern,SPP -UT,WECC_NW,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East +UT,WECC_BA,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East VA,PJM,PJM,PJM_East,VA,eastern,PJM VT,NPCC_NE,ISONE,ISONE,VT,eastern,ISONE WA,WECC_NW,NorthernGrid,NorthernGrid_West,WA,western,Bonneville_Power_Administration WI,MISO,MISO,MISO_North,WI,eastern,MISO WV,PJM,PJM,PJM_East,WV,eastern,PJM -WY,WECC_NW,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East +WY,WECC_RM,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East diff --git a/inputs/zones/z54/hierarchy_from134.csv b/inputs/zones/z54/hierarchy_from134.csv index 59b418b3..8c7636ed 100644 --- a/inputs/zones/z54/hierarchy_from134.csv +++ b/inputs/zones/z54/hierarchy_from134.csv @@ -10,8 +10,8 @@ p8,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA_N p9,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA_N p10,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA_S p11,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA_S -p12,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV -p13,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV +p12,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV +p13,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID p15,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID p16,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID @@ -19,20 +19,20 @@ p17,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Moun p18,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT p19,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT p20,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT -p21,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p22,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p23,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p24,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY -p25,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT -p26,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT +p21,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p22,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p23,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p24,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY +p25,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT +p26,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT p27,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p28,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p29,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p30,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p31,WECC_SW,WestConnect,WestConnect_South,Mountain,NM,western,USA,mountain,Southwest,Public_Service_Co_of_New_Mexico,NM p32,SPP,SPP,SPP_North,West_North_Central,SD,eastern,USA,northern-plains,Plains,SPP,SD -p33,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO -p34,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO +p33,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO +p34,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO p35,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT p36,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,ND p37,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,ND diff --git a/inputs/zones/z69/b2b.csv b/inputs/zones/z70/b2b.csv similarity index 100% rename from inputs/zones/z69/b2b.csv rename to inputs/zones/z70/b2b.csv diff --git a/inputs/zones/z69/county2zone.csv b/inputs/zones/z70/county2zone.csv similarity index 98% rename from inputs/zones/z69/county2zone.csv rename to inputs/zones/z70/county2zone.csv index 3814041a..265114d7 100644 --- a/inputs/zones/z69/county2zone.csv +++ b/inputs/zones/z70/county2zone.csv @@ -149,50 +149,50 @@ FIPS,r 32033,NV 32510,NV 32003,NV -16009,ID -16017,ID -16021,ID -16055,ID -16057,ID -16061,ID -16069,ID -16001,ID -16003,ID -16013,ID -16015,ID -16023,ID -16025,ID -16027,ID -16035,ID -16037,ID -16039,ID -16045,ID -16047,ID -16049,ID -16053,ID -16059,ID -16063,ID -16067,ID -16073,ID -16075,ID -16079,ID -16085,ID -16087,ID -16005,ID -16007,ID -16011,ID -16019,ID -16029,ID -16031,ID -16033,ID -16041,ID -16043,ID -16051,ID -16065,ID -16071,ID -16077,ID -16081,ID -16083,ID +16009,ID_NW +16017,ID_NW +16021,ID_NW +16055,ID_NW +16057,ID_NW +16061,ID_NW +16069,ID_NW +16001,ID_BA +16003,ID_BA +16013,ID_BA +16015,ID_BA +16023,ID_BA +16025,ID_BA +16027,ID_BA +16035,ID_BA +16037,ID_BA +16039,ID_BA +16045,ID_BA +16047,ID_BA +16049,ID_BA +16053,ID_BA +16059,ID_BA +16063,ID_BA +16067,ID_BA +16073,ID_BA +16075,ID_BA +16079,ID_BA +16085,ID_BA +16087,ID_BA +16005,ID_BA +16007,ID_BA +16011,ID_BA +16019,ID_BA +16029,ID_BA +16031,ID_BA +16033,ID_BA +16041,ID_BA +16043,ID_BA +16051,ID_BA +16065,ID_BA +16071,ID_BA +16077,ID_BA +16081,ID_BA +16083,ID_BA 30001,MT_NorthernGrid 30007,MT_NorthernGrid 30023,MT_NorthernGrid diff --git a/inputs/zones/z69/hierarchy.csv b/inputs/zones/z70/hierarchy.csv similarity index 85% rename from inputs/zones/z69/hierarchy.csv rename to inputs/zones/z70/hierarchy.csv index d39c838c..06622620 100644 --- a/inputs/zones/z69/hierarchy.csv +++ b/inputs/zones/z70/hierarchy.csv @@ -4,16 +4,17 @@ OR,WECC_NW,NorthernGrid,NorthernGrid_West,OR,western,Bonneville_Power_Administra CA_NorthernGrid,WECC_NW,NorthernGrid,NorthernGrid_South,CA,western,PacifiCorp_West CA_N_CAISO,WECC_CA,CAISO,CAISO,CA,western,CAISO CA_S_CAISO,WECC_CA,CAISO,CAISO,CA,western,CAISO -NV,WECC_NW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co -ID,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co +NV,WECC_SW,NorthernGrid,NorthernGrid_South,NV,western,Nevada_Power_Co +ID_NW,WECC_NW,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co +ID_BA,WECC_BA,NorthernGrid,NorthernGrid_East,ID,western,Idaho_Power_Co MT_NorthernGrid,WECC_NW,NorthernGrid,NorthernGrid_East,MT,western,Northwestern_Energy -WY_NorthernGrid,WECC_NW,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East -WY_WestConnect,WECC_NW,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region -UT,WECC_NW,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East +WY_NorthernGrid,WECC_RM,NorthernGrid,NorthernGrid_East,WY,western,PacifiCorp_East +WY_WestConnect,WECC_RM,WestConnect,WestConnect_North,WY,western,WAPA_Rocky_Mountain_Region +UT,WECC_BA,NorthernGrid,NorthernGrid_South,UT,western,PacifiCorp_East AZ,WECC_SW,WestConnect,WestConnect_South,AZ,western,Arizona_Public_Service_Co NM_WestConnect,WECC_SW,WestConnect,WestConnect_South,NM,western,Public_Service_Co_of_New_Mexico -SD_WestConnect,WECC_NW,WestConnect,WestConnect_North,SD,western,WAPA_Rocky_Mountain_Region -CO,WECC_NW,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado +SD_WestConnect,WECC_RM,WestConnect,WestConnect_North,SD,western,WAPA_Rocky_Mountain_Region +CO,WECC_RM,WestConnect,WestConnect_North,CO,western,Public_Service_Co_of_Colorado MT_SPP,SPP,SPP,SPP_North,MT,eastern,SPP ND_SPP,SPP,SPP,SPP_North,ND,eastern,SPP ND_MISO,MISO,MISO,MISO_North,ND,eastern,MISO diff --git a/inputs/zones/z69/hierarchy_from134.csv b/inputs/zones/z70/hierarchy_from134.csv similarity index 92% rename from inputs/zones/z69/hierarchy_from134.csv rename to inputs/zones/z70/hierarchy_from134.csv index 8a2d12aa..1ce5e6fa 100644 --- a/inputs/zones/z69/hierarchy_from134.csv +++ b/inputs/zones/z70/hierarchy_from134.csv @@ -10,29 +10,29 @@ p8,WECC_NW,NorthernGrid,NorthernGrid_South,Pacific,CA,western,USA,pacific,Califo p9,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA_N_CAISO p10,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA_S_CAISO p11,WECC_CA,CAISO,CAISO,Pacific,CA,western,USA,pacific,California,CAISO,CA_S_CAISO -p12,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV -p13,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV -p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID -p15,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID -p16,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID +p12,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV +p13,WECC_SW,NorthernGrid,NorthernGrid_South,Mountain,NV,western,USA,mountain,Mountain,Nevada_Power_Co,NV +p14,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID_NW +p15,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID_BA +p16,WECC_BA,NorthernGrid,NorthernGrid_East,Mountain,ID,western,USA,mountain,Northwest,Idaho_Power_Co,ID_BA p17,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT_NorthernGrid p18,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT_NorthernGrid p19,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT_NorthernGrid p20,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,MT,western,USA,mountain,Mountain,Northwestern_Energy,MT_NorthernGrid -p21,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY_NorthernGrid -p22,WECC_NW,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY_NorthernGrid -p23,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,WY_WestConnect -p24,WECC_NW,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,WY_WestConnect -p25,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT -p26,WECC_NW,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT +p21,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY_NorthernGrid +p22,WECC_RM,NorthernGrid,NorthernGrid_East,Mountain,WY,western,USA,mountain,Mountain,PacifiCorp_East,WY_NorthernGrid +p23,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,WY_WestConnect +p24,WECC_RM,WestConnect,WestConnect_North,Mountain,WY,western,USA,mountain,Mountain,WAPA_Rocky_Mountain_Region,WY_WestConnect +p25,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT +p26,WECC_BA,NorthernGrid,NorthernGrid_South,Mountain,UT,western,USA,mountain,Mountain,PacifiCorp_East,UT p27,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p28,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p29,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p30,WECC_SW,WestConnect,WestConnect_South,Mountain,AZ,western,USA,mountain,Southwest,Arizona_Public_Service_Co,AZ p31,WECC_SW,WestConnect,WestConnect_South,Mountain,NM,western,USA,mountain,Southwest,Public_Service_Co_of_New_Mexico,NM_WestConnect -p32,WECC_NW,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,SD_WestConnect -p33,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO -p34,WECC_NW,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO +p32,WECC_RM,WestConnect,WestConnect_North,Mountain,SD,western,USA,northern-plains,Plains,WAPA_Rocky_Mountain_Region,SD_WestConnect +p33,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO +p34,WECC_RM,WestConnect,WestConnect_North,Mountain,CO,western,USA,mountain,Mountain,Public_Service_Co_of_Colorado,CO p35,SPP,SPP,SPP_North,West_North_Central,MT,eastern,USA,mountain,Mountain,SPP,MT_SPP p36,SPP,SPP,SPP_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,SPP,ND_SPP p37,MISO,MISO,MISO_North,West_North_Central,ND,eastern,USA,northern-plains,Plains,MISO,ND_MISO diff --git a/inputs/zones/z69/interfaces_r.csv b/inputs/zones/z70/interfaces_r.csv similarity index 93% rename from inputs/zones/z69/interfaces_r.csv rename to inputs/zones/z70/interfaces_r.csv index 976c995b..9a211f88 100644 --- a/inputs/zones/z69/interfaces_r.csv +++ b/inputs/zones/z70/interfaces_r.csv @@ -12,12 +12,15 @@ western,CA_S_CAISO~~NV western,CO~~NM_WestConnect western,CO~~UT western,CO~~WY_WestConnect -western,ID~~MT_NorthernGrid -western,ID~~NV -western,ID~~OR -western,ID~~UT -western,ID~~WA -western,ID~~WY_NorthernGrid +western,ID_BA~~ID_NW +western,ID_BA~~MT_NorthernGrid +western,ID_BA~~NV +western,ID_BA~~OR +western,ID_BA~~UT +western,ID_BA~~WY_NorthernGrid +western,ID_NW~~MT_NorthernGrid +western,ID_NW~~OR +western,ID_NW~~WA western,MT_NorthernGrid~~WA western,MT_NorthernGrid~~WY_NorthernGrid western,MT_NorthernGrid~~WY_WestConnect diff --git a/inputs/zones/z69/interfaces_transgrp.csv b/inputs/zones/z70/interfaces_transgrp.csv similarity index 100% rename from inputs/zones/z69/interfaces_transgrp.csv rename to inputs/zones/z70/interfaces_transgrp.csv diff --git a/inputs/zones/z69/zonehash.csv b/inputs/zones/z70/zonehash.csv similarity index 97% rename from inputs/zones/z69/zonehash.csv rename to inputs/zones/z70/zonehash.csv index 421d44a1..899ad7ba 100644 --- a/inputs/zones/z69/zonehash.csv +++ b/inputs/zones/z70/zonehash.csv @@ -13,7 +13,8 @@ FL_FRCC,aa49b2fbe0b5e20ae2bbdc3e7af3117f,28.2917081,-81.87816444 FL_SERTP,a978879bf2ad46037a6577da6e8417e1,30.58478781,-86.08395491 GA,9fdd565833dd9171d4b521bb517885ca,32.63997261,-83.43553366 IA,83da8c6a48b3856ca8d1fb06e894d798,42.07370099,-93.49615657 -ID,fc5cd505d2f7b267319a5fcfaf1ac9b4,44.3463085,-114.61639347 +ID_BA,1967627f52fd7bce2a873f889a10b76d,44.01545046,-114.42338817 +ID_NW,50429f255f0345eb0f7c06048a3bfd71,47.60393639,-116.62286863 IL_MISO,94b7031bb5bd63658dccb1e100b9867e,39.54191001,-89.31157834 IL_PJM,45a1cae9e3fb7425c15bc04bec28af32,41.76755631,-88.78740634 IN,866197216a17629b1bddc6715c3b4acb,39.89386398,-86.28131115 diff --git a/inputs/zones/z90/hierarchy.csv b/inputs/zones/z90/hierarchy.csv index 6930a59f..a51ff276 100644 --- a/inputs/zones/z90/hierarchy.csv +++ b/inputs/zones/z90/hierarchy.csv @@ -8,17 +8,17 @@ CA_S,CA,CAISO,CAISO,WECC_CA,western CA_LA,CA,CAISO,CAISO,WECC_CA,western CA_SE,CA,CAISO,CAISO,WECC_CA,western ID_N,ID,NorthernGrid,NorthernGrid_East,WECC_NW,western -ID_S,ID,NorthernGrid,NorthernGrid_East,WECC_NW,western +ID_S,ID,NorthernGrid,NorthernGrid_East,WECC_BA,western MT_W,MT,NorthernGrid,NorthernGrid_East,WECC_NW,western MT_C,MT,NorthernGrid,NorthernGrid_East,WECC_NW,western MT_E,MT,SPP,SPP_North,SPP,eastern -NV_N,NV,NorthernGrid,NorthernGrid_South,WECC_NW,western -NV_LV,NV,NorthernGrid,NorthernGrid_South,WECC_NW,western -UT,UT,NorthernGrid,NorthernGrid_South,WECC_NW,western -WY_W,WY,NorthernGrid,NorthernGrid_East,WECC_NW,western -WY_E,WY,WestConnect,WestConnect_North,WECC_NW,western -CO_W,CO,WestConnect,WestConnect_North,WECC_NW,western -CO_E,CO,WestConnect,WestConnect_North,WECC_NW,western +NV_N,NV,NorthernGrid,NorthernGrid_South,WECC_SW,western +NV_LV,NV,NorthernGrid,NorthernGrid_South,WECC_SW,western +UT,UT,NorthernGrid,NorthernGrid_South,WECC_BA,western +WY_W,WY,NorthernGrid,NorthernGrid_East,WECC_RM,western +WY_E,WY,WestConnect,WestConnect_North,WECC_RM,western +CO_W,CO,WestConnect,WestConnect_North,WECC_RM,western +CO_E,CO,WestConnect,WestConnect_North,WECC_RM,western AZ_N,AZ,WestConnect,WestConnect_South,WECC_SW,western AZ_S,AZ,WestConnect,WestConnect_South,WECC_SW,western NM_W,NM,WestConnect,WestConnect_South,WECC_SW,western diff --git a/reeds/inputs.py b/reeds/inputs.py index 45dfc002..576e5314 100644 --- a/reeds/inputs.py +++ b/reeds/inputs.py @@ -695,7 +695,7 @@ def validate_zoneset(GSw_ZoneSet): GSw_ZoneSets = [ 'z48', 'z54', - 'z69', + 'z70', 'z90', 'z132', 'z134', diff --git a/runfiles.csv b/runfiles.csv index 1a60f823..66901484 100644 --- a/runfiles.csv +++ b/runfiles.csv @@ -257,7 +257,7 @@ mttr.csv,inputs/plant_characteristics/mttr.csv,1,ignore,ignore,,,tech,,0,,,,,, natgas_price_cendiv.csv,inputs/fuelprices/ng_{ngscen}.csv,1,ignore,ignore,wide_cendiv,year,,1,0,,,,,, national_rps_frac_allScen.csv,inputs/national_generation/national_rps_frac_allScen.csv,int(sw.GSw_StateRPS) != 0,ignore,ignore,,,,1,0,,,,,, net_gen_existing_hydro.csv,inputs/hydro/net_gen_existing_hydro.csv,1,ignore,ignore,,"t,month",,0,0,,,,,, -peak_net_imports.csv,inputs/reserves/peak_net_imports.csv,1,ignore,ignore,nercr,t,,0,0,,,,,, +peak_net_imports.csv,inputs/reserves/peak_net_imports.csv,1,ignore,ignore,transreg,t,,0,0,,,,,, nexth.csv,,1,ignore,ignore,,,,,0,,,,,, nexth_actualszn.csv,,1,ignore,ignore,,,,,0,,,,,, nextpartition.csv,,1,ignore,ignore,,,,,0,,,,,, @@ -293,7 +293,7 @@ p.csv,inputs/sets/p.csv,1,ignore,ignore,,,,,,,,,p,, peak_ccseason.csv,,1,sum,ignore,*r,"ccseason,t",,0,0,,1,,,,ok because it's load during peak NERC hour peak_h.csv,,1,sum,ignore,r,"h,wide",,1,0,,1,,,, peakload.csv,,1,ignore,ignore,,,,,0,,1,,,, -peakload_nercr.csv,,1,ignore,ignore,,,,,0,,1,,,, +peakload_transreg.csv,,1,ignore,ignore,,,,,0,,1,,,, period_szn.csv,,1,ignore,ignore,,,,,0,,,,,, period_szn_user.csv,inputs/temporal/period_szn_{GSw_HourlyClusterAlgorithm}.csv,sw.GSw_HourlyClusterAlgorithm == 'user*',ignore,ignore,,,,,,,,,,, period_weights.csv,,1,ignore,ignore,,,,,0,,,,,,