Fix Monte Carlo random sampling for VRE siting availability

cases.csv

@@ -37,7 +37,7 @@ geodiscov,Annual discover rates for new geothermal sites,BAU; TI,BAU,
 geohydrosupplycurve,Geohydro Supply Curve,ATB_2023,ATB_2023,
 egssupplycurve,EGS Supply Curve,ATB_2023; reV,reV,
 egsnearfieldsupplycurve,EGS (near field) Supply Curve,ATB_2023,ATB_2023,
-ngscen,Natural gas price inputs (see inputs\fuelprices),N/A,AEO_2026_baseline,
+ngscen,Natural gas price inputs,^AEO_(2025_(HOG|reference|LOG)|2026_(HOG|baseline|LOG))$,AEO_2026_baseline,
 pshsupplycurve,PSH Supply Curve,(8|10|12)hr_(limited|reference|open),8hr_reference,
 pvbscen,PVB cost-sharing scenario,benchmark2020,benchmark2020,
 dacscen,Electrical DAC cost and performance inputs (see inputs/consume/[dacscen].csv starting with 'dac_elec_').,BVRE_2021_(high|mid|low),BVRE_2021_mid,

cases_test.csv

@@ -1,6 +1,6 @@
 ,Default Value,Pacific,USA_defaults,Mid_Case,USA_decarb,github_Pacific,github_Everything,github_MA_county_CC,Pacific_CC,Pacific_weks,Pacific_full_year,Interday_storage,Pacific_2020,Pacific_rep15,WY_county,WECC_county,PJM_county_CC,NYVT_mixed,OR_water,MonteCarlo_Random,MonteCarlo_LHS,Everything,Simple,USA_fast,USA_faster,MultiMetricRA,Pacific_DR,Pacific_MGA,Pacific_MGA_RV,Pacific_LoadSite95,MARICTNYNJPAOH_Offshore,R2P
 ignore,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-GSw_Region,cendiv/Pacific,,country/USA,country/USA,country/USA,,st/ID.WY.NE.IA.IL,st/MA,,,,,,,st/WY,interconnect/western,transreg/PJM,st/NY.VT,st/OR,st/NE.NY.PA,st/NE.NY.PA,st/ID.WY.NE.IA.IL,st/KS,country/USA,country/USA,st/NY.NJ,,,,,st/MA.RI.CT.NY.NJ.PA.OH,
+GSw_Region,cendiv/Pacific,,country/USA,country/USA,country/USA,,st/ID.WY.NE.IA.IL,st/MA,,,,,,,st/WY,interconnect/western,transreg/PJM,st/NY.VT,st/OR,,,st/ID.WY.NE.IA.IL,st/KS,country/USA,country/USA,st/NY.NJ,,,,,st/MA.RI.CT.NY.NJ.PA.OH,
 endyear,2035,,2050,2050,2050,2030,2060,2030,,,,,,,,,,,2035,2030,2030,2060,2035,2050,2050,2050,,,,,,
 yearset,,,,,,,2010..2060..10,,,,,,,,,,,,,,,2010..2060..10,2010_2015_2020..2050..3,,2010_2025_2050,,,,,,,
 GSw_ZoneSet,,,,,,,z54,z3109,,,,,,,z3109,z3109,z3109,PJMcounty,,,,z54,z134,z54,z48,,,,,,,
@@ -30,7 +30,7 @@ GSw_WaterUse,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
 resource_adequacy_years,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,,,
 GSw_HourlyClusterAlgorithm,,,,,,,,,,,,,,,,,,,,user,user,,,,,,,,,,,
 MCS_runs,,,,,,,,,,,,,,,,,,,,2,2,,,,,,,,,,,
-MCS_dist_groups,,,,,,,,,,,,,,,,,,,,tech.hydro.nuclear.gas.coal.load_country,upv_tri.nuclear_tri.ng_fuel_price_tri.load_country_unif,,,,,,,,,,,
+MCS_dist_groups,,,,,,,,,,,,,,,,,,,,load_flat_state.gasprice_flat.siting_flat_state.upv.onswind.ofswind.battery.nuclear.geo,load_country_unif.gasprice_tri.siting_country_discrete_flat.upv_tri.nuclear_tri,,,,,,,,,,,
 MCS_lhs,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
 GSw_PRM_StressIterateMax,,,,,,,,0,,,,,,,,0,0,,,1,1,,,,,,,,,,,
 GSw_ReducedResource,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,,,

inputs/capacity_exogenous/README.md

@@ -8,35 +8,6 @@
   - Active when `GSw_NuclearDemo = 1`
   - For more information, refer to the **notes** section of [https://www.energy.gov/oced/advanced-reactor-demonstration-projects-0](https://www.energy.gov/oced/advanced-reactor-demonstration-projects-0)
 
-- `exog_cap_geohydro_allkm_reference.csv`: 
-
-- `exog_cap_geohydro_reference.csv`: 
-
-- `exog_cap_upv_*.csv`:
-  - `exog_cap_upv_limited.csv`: 
-  - `exog_cap_upv_open.csv`: 
-  - `exog_cap_upv_reference.csv`: 
-
-- `exog_cap_wind-ons_*.csv`:
-  - `exog_cap_wind-ons_limited.csv`: 
-  - `exog_cap_wind-ons_open.csv`: 
-  - `exog_cap_wind-ons_reference.csv`: 
-
 - `interconnection_queues.csv`: 
 
-- `prescribed_builds_wind-ofs_meshed_*.csv`:
-  - `prescribed_builds_wind-ofs_meshed_limited.csv`: 
-  - `prescribed_builds_wind-ofs_meshed_open.csv`: 
-  - `prescribed_builds_wind-ofs_meshed_reference.csv`: 
-
-- `prescribed_builds_wind-ofs_radial_*.csv`:
-  - `prescribed_builds_wind-ofs_radial_limited.csv`: 
-  - `prescribed_builds_wind-ofs_radial_open.csv`: 
-  - `prescribed_builds_wind-ofs_radial_reference.csv`: 
-
-- `prescribed_builds_wind-ons_*.csv`:
-  - `prescribed_builds_wind-ons_limited.csv`: 
-  - `prescribed_builds_wind-ons_open.csv`:  
-  - `prescribed_builds_wind-ons_reference.csv`: 
-
 - `ReEDS_generator_database_final_EIA-NEMS.csv`: ReEDS generator database derived from the EIA NEMS plant file and EIA 860M. See https://github.com/ReEDS-Model/ReEDS_Input_Processing/tree/main/nems_database_processing.

inputs/supply_curve/dollaryear.csv

@@ -5,9 +5,9 @@ dr_shed,2020
 evmc_rsc_Baseline,2020
 geo_rsc_ATB_2023,2015
 hydcost,2004
-supplycurve_egs,2023
-supplycurve_geohydro,2023
-supplycurve_psh,2022
-supplycurve_upv,2023
-supplycurve_wind-ofs,2023
-supplycurve_wind-ons,2022
+supplycurve_init_egs,2023
+supplycurve_init_geohydro,2023
+supplycurve_init_psh,2022
+supplycurve_init_upv,2023
+supplycurve_init_wind-ofs,2023
+supplycurve_init_wind-ons,2022

inputs/userinput/futurefiles.csv

@@ -428,6 +428,12 @@ storinmaxfrac.csv,.csv,1,None,9999,None,9999,0,constant,None,None,done,constant
 stressperiods_user.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new; check if we need to expand the input file,
 superpeak_hour_mapper.csv,.csv,1,None,9999,None,9999,0,constant,None,None,done,constant
 supply_chain_adjust.csv,.csv,0,None,0,None,0,None,constant,None,None,new,
+supplycurve_init_egs.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
+supplycurve_init_geohydro.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
+supplycurve_init_psh.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
+supplycurve_init_upv.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
+supplycurve_init_wind-ofs.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
+supplycurve_init_wind-ons.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
 supplycurve_egs.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
 supplycurve_geohydro.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,
 supplycurve_psh.csv,.csv,1,None,9999,None,9999,0,constant,None,None,new,

inputs/userinput/mcs_distributions_default.yaml

@@ -201,52 +201,52 @@
 ### ---------------------------------------------------###
 ### --- Distributions for NG-fuel prices
 ### ---------------------------------------------------###
-- name: ng_fuel_price
+- name: gasprice_flat
   assignments_list:
-    - ngscen: [AEO_2025_LOG, AEO_2025_reference, AEO_2025_HOG]
+    - ngscen: [AEO_2026_HOG, AEO_2026_LOG]
   dist: dirichlet
-  dist_params: [1, 1, 1]
+  dist_params: [1, 1]
   weight_r: country
 
-- name: ng_fuel_price_tri
+- name: gasprice_tri
   assignments_list:
-    - ngscen: [AEO_2025_HOG, AEO_2025_reference, AEO_2025_LOG]
+    - ngscen: [AEO_2026_HOG, AEO_2026_baseline, AEO_2026_LOG]
   dist: triangular
   weight_r: country
 
 ### ---------------------------------------------------###
 ### --- Distributions for load
 ### ---------------------------------------------------###
-- name: load_country
+- name: load_flat_country
   assignments_list: 
-    - GSw_LoadProfiles: [EER2025_100by2050, EER2025_IRAlow]
+    - GSw_LoadProfiles: [EER2025_Baseline_AEO2023, EER2025_100by2050]
   dist: dirichlet
   dist_params: [1, 1]
   weight_r: country
 
+- name: load_tri_country
+  assignments_list: 
+    - GSw_LoadProfiles: [EER2025_Baseline_AEO2023, EER2025_IRAlow, EER2025_100by2050]
+  dist: dirichlet
+  dist_params: [1, 1, 1]
+  weight_r: country
+
 - name: load_country_unif
   assignments_list: 
     - GSw_LoadProfiles: [EER2025_IRAlow, EER2025_100by2050]
   dist: uniform
   weight_r: country
 
-- name: load_st
+- name: load_flat_state
   assignments_list: 
-    - GSw_LoadProfiles: [EER2025_100by2050, EER2025_IRAlow]
+    - GSw_LoadProfiles: [EER2025_Baseline_AEO2023, EER2025_100by2050]
   dist: dirichlet
   dist_params: [1, 1]
   weight_r: st
 
-- name: load_ba
-  assignments_list: 
-    - GSw_LoadProfiles: [EER2025_100by2050, EER2025_IRAlow]
-  dist: dirichlet
-  dist_params: [1, 1]
-  weight_r: ba
-
 - name: load_discrete_st
   assignments_list: 
-    - GSw_LoadProfiles: [EER2025_100by2050, EER2025_IRAlow]
+    - GSw_LoadProfiles: [EER2025_IRAlow, EER2025_100by2050]
   dist: discrete
   dist_params: [1, 1]
   weight_r: st
@@ -289,7 +289,7 @@
   dist_params: [1, 1]
   weight_r: country
 
-- name: wind_solar_siting_country
+- name: siting_lowmid_country
   assignments_list:
     - GSw_SitingUPV: [limited, reference]
     - GSw_SitingWindOfs: [limited, reference]
@@ -298,25 +298,25 @@
   dist_params: [1, 1]
   weight_r: country
 
-- name: wind_solar_siting_st
+- name: siting_tri_country
   assignments_list:
-    - GSw_SitingUPV: [limited, reference]
-    - GSw_SitingWindOfs: [limited, reference]
-    - GSw_SitingWindOns: [limited, reference]
+    - GSw_SitingUPV: [limited, reference, open]
+    - GSw_SitingWindOfs: [limited, reference, open]
+    - GSw_SitingWindOns: [limited, reference, open]
   dist: dirichlet
-  dist_params: [1, 1]
-  weight_r: st
+  dist_params: [1, 1, 1]
+  weight_r: country
 
-- name: wind_solar_siting_ba
+- name: siting_flat_state
   assignments_list:
-    - GSw_SitingUPV: [limited, reference]
-    - GSw_SitingWindOfs: [limited, reference]
-    - GSw_SitingWindOns: [limited, reference]
+    - GSw_SitingUPV: [limited, open]
+    - GSw_SitingWindOfs: [limited, open]
+    - GSw_SitingWindOns: [limited, open]
   dist: dirichlet
   dist_params: [1, 1]
-  weight_r: ba
+  weight_r: st
 
-- name: wind_solar_siting_discrete_st
+- name: siting_discrete_st
   assignments_list:
     - GSw_SitingUPV: [limited, reference]
     - GSw_SitingWindOfs: [limited, reference]
@@ -325,6 +325,15 @@
   dist_params: [1, 1]
   weight_r: st
 
+- name: siting_country_discrete_flat
+  assignments_list:
+    - GSw_SitingUPV: [limited, reference, open]
+    - GSw_SitingWindOfs: [limited, reference, open]
+    - GSw_SitingWindOns: [limited, reference, open]
+  dist: discrete
+  dist_params: [1, 1, 1]
+  weight_r: country
+
 
 ### ---------------------------------------------------###
 ### --- Miscellaneous distributions

reeds/input_processing/copy_files.py

@@ -414,11 +414,7 @@ def subset_to_valid_regions(
     full_path = full_path.format(**sw)
     ## Filename conditions
     if filename.startswith('supplycurve'):
-        df = reeds.io.assemble_supplycurve(
-            full_path,
-            case=os.path.dirname(os.path.normpath(inputs_case)),
-            agg=agg,
-        ).reset_index()
+        df = reeds.io.get_supplycurve(full_path, case=inputs_case)
     elif filename == 'techs_banned.csv':
         df, nuclear_ban_regions = read_banned_tech_file(
             full_path,