patrickbrown4 · Oct 1, 2026 · Oct 1, 2026 · Oct 1, 2026 · Oct 1, 2026 · Oct 1, 2026
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -50,20 +50,20 @@ Include additional illustrative plots describing input data, methods, testing, a
   - postprocessing_tools.md: User/developer-facing description of scripts in postprocessing folder
   - README.md files: User/developer facing description of individual input folders
   -->
+- [ ] If switches have been added or modified in `cases.csv`, allowed values are specified in the "Choices" column or checked in `reeds/checks.py`
 - If input data added/modified:
   - [ ] Dollar year recorded and converted to 2004$ for GAMS
   - [ ] Timeseries are in Central Time
   - [ ] Units are specified
   - [ ] Preprocessing steps have been documented and committed to [ReEDS_Input_Processing](https://github.com/ReEDS-Model/ReEDS_Input_Processing)
   - [ ] New large data files handled with .h5 instead of .csv
+  - [ ] New .csv data files are rounded to a reasonable number of decimal places (≤2 for costs and capacity, ≤6 for lat/lon)
   - [ ] If new parameters are added to `d_objective.gms`, they are included in `objective_function_params.yaml` for completeness checking
   - [ ] If spatially resolved inputs are modified, the following visualizations for each file are included in the PR description (time-averaged if the inputs are time-resolved):
     - [ ] Map of absolute values before
     - [ ] Map of absolute values after
     - [ ] Map of differences: (after - before) or (after / before)
-  - If entries are added/removed/changed in the EIA-NEMS unit database:
-    - [ ] Changes have been committed to [ReEDS_Input_Processing](https://github.com/ReEDS-Model/ReEDS_Input_Processing)
-    - [ ] `hourlize/resource.py` was rerun to regenerate the existing/prescribed VRE capacity data
+  - [ ] If entries are added/removed/changed in the EIA-NEMS unit database, associated changes have been committed to [ReEDS_Input_Processing](https://github.com/ReEDS-Model/ReEDS_Input_Processing)
 - [ ] Code formatting standardized <!-- Coding conventions: https://reeds-model.github.io/ReEDS/developer_best_practices.html#coding-standards-and-conventions -->
 - [ ] Reusable functions used where possible instead of copy/pasted code
 

diff --git a/.github/workflows/python-app.yaml b/.github/workflows/python-app.yaml
@@ -195,7 +195,7 @@ jobs:
       - name: Run ReEDS model
         env:
           SCENARIO: ${{ matrix.scenario }}
-        run: python runreeds.py -b "$batch" -c test -s "$SCENARIO"
+        run: python runreeds.py -b "$batch" -c test -fs "$SCENARIO"
 
       - name: Print GAMS log
         if: runner.debug == '1'

diff --git a/cases_test.csv b/cases_test.csv
@@ -1,7 +1,7 @@
-,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
+,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,NY_365,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,
-endyear,2035,,2050,2050,2050,2030,2060,2030,,,,,,,,,,,2035,2030,2030,2060,2035,2050,2050,2050,,,,,,
+GSw_Region,cendiv/Pacific,,country/USA,country/USA,country/USA,,st/ID.WY.NE.IA.IL,st/MA,,,,,st/NY,,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,
+endyear,2035,,2050,2050,2050,2030,2060,2030,,,,,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,,,,,,,
 GSw_GasCurve,2,,1,1,,,,,,,,,,,,,,,,,,,,1,1,,,,,,,
@@ -12,7 +12,7 @@ GSw_TransHurdleRate,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 distpvscen,,,,,stscen2023_mid_case_95_by_2035,,,,,,,,,,,,,,,,,,,,,,,,,,,
 GSw_AnnualCap,,,,,2,,1,,,,,,,,,,,,,,,1,,,,,,,,,,
 GSw_AnnualCapScen,,,,,start2024_90pct2035_100pct2045,,start2027_95pct2035,,,,,,,,,,,,,,,start2027_95pct2035,,,,,,,,,,
-GSw_LoadProfiles,,,,,EER2025_100by2050,EER2025_IRAlow,EER2025_IRAlow,EER2025_IRAlow,,,,,historic,,,,,,,,,EER2025_100by2050,,,,,historic,,,,,
+GSw_LoadProfiles,,,,,EER2025_100by2050,EER2025_IRAlow,EER2025_IRAlow,EER2025_IRAlow,,,,,,,,,,,,,,EER2025_100by2050,,,,,historic,,,,,
 GSw_NG_CRF_penalty,,,,,ramp_2045,,ramp_2023_2035,,,,,,,,,,,,,,,ramp_2023_2035,,,,,,,,,,
 GSw_PRM_NetImportLimit,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,
 GSw_RetirePenalty,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -22,13 +22,14 @@ GSw_PRM_scenario,,,,,,,,,static,,,,,,,,static,,,,,,,,,,,,,,,
 GSw_PRM_UpdateMethod,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,
 GSw_HourlyType,,,,,,,,,,wek,year,,,,,,,,,,,,,,,,,,,,,
 GSw_InterDayLinkage,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,
-GSw_HourlyWeatherYears,,,,,,,2012_2013,,,,,,2020,2007_2008_2009_2010_2011_2012_2013_2016_2017_2018_2019_2020_2021_2022_2023,,,,,,,,2012_2013,,,,,2018,,,,,
+GSw_HourlyWeatherYears,,,,,,,2012_2013,,,,,,,2007_2008_2009_2010_2011_2012_2013_2016_2017_2018_2019_2020_2021_2022_2023,,,,,,,,2012_2013,,,,,2018,,,,,
 GSw_HourlyClusterMapMethod,,,,,,,,,,,,,,bestfirst,,,,,,,,,,,,,,,,,,
 GSw_WaterCapacity,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
 GSw_WaterMain,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
 GSw_WaterUse,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,
 resource_adequacy_years,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,,,
-GSw_HourlyClusterAlgorithm,,,,,,,,,,,,,,,,,,,,user,user,,,,,,,,,,,
+GSw_HourlyClusterAlgorithm,,,,,,,,,,,,,hierarchical,,,,,,,user,user,,,,,,,,,,,
+GSw_HourlyNumClusters,,,,,,,,,,,,,365,,,,,,,,,,,,,,,,,,,
 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_lhs,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,

diff --git a/docs/source/developer_best_practices.md b/docs/source/developer_best_practices.md
@@ -638,7 +638,7 @@ Additionally, if you want to re-run a given scenario without having to run all o
         | `--simult_runs` / `-r` | Number of simultaneous runs. If negative, run all simultaneously |
         | `--forcelocal` / `-l` | Force model to run locally instead of submitting a slurm job |
         | `--restart` / `-r` | Switch to restart existing ReEDS runs |
-        | `--skip_checks` / `-f` | Force run, skipping checks on conda environment and switches |
+        | `--force` / `-f` | Force run, skipping checks on conda environment and switches |
         | `--debug` / `-d` | Run in debug mode (same behavior as debug switch in cases.csv) |
         | `--debugnode` / `-n` | Run using debug specifications for slurm on an hpc system |
 

diff --git a/docs/source/figs/docs/transmission-itl-r.png b/docs/source/figs/docs/transmission-itl-r.png
diff --git a/docs/source/user_guide.md b/docs/source/user_guide.md
@@ -64,7 +64,7 @@ Here is partial list of remotely hosted files used by ReEDS:
   - So turning up `GSw_HourlyNumClusters` on its own won't increase the temporal coverage. If you want more temporal coverage, the options are:
     - Switch to `GSw_HourlyType=wek`, which increases the length of the periods from 1 day to 5 days. If all the other switches are left at their defaults, switching to `wek` would increase the coverage from 42 days to 5*42=210 days.
     - Reduce `GSw_HourlyClusterRegionLevel` to something smaller than transreg (like `st`), and then increase `GSw_HourlyNumClusters`
-    - Switch to `GSw_HourlyClusteAlgorithm=hierarchical` and then increase `GSw_HourlyNumClusters` (although that's less desirable, because hierarchical clustering doesn't do as good of a job of reproducing the actual spatial distribution of CF and load)
+    - Switch to `GSw_HourlyClusterAlgorithm=hierarchical` and then increase `GSw_HourlyNumClusters` (although that's less desirable, because hierarchical clustering doesn't do as good of a job of reproducing the actual spatial distribution of CF and load)
     - Switch to `Gsw_HourlyType=year`. Although if you're running for the whole US you'll need to turn on region aggregation (`GSw_ZoneSet` in [`z54` or `z70`]) for it to solve.
 - `GSw_HourlyClusterAlgorithm`
   - If set to 'hierarchical', then hierarchical clustering is used via