From 9344c389a3a826b102cd9169da993e5ca2448cc9 Mon Sep 17 00:00:00 2001 From: wcole Date: Tue, 10 Nov 2026 15:31:29 -0700 Subject: [PATCH 1/3] Update out-of-date sections of the user guide. --- docs/source/user_guide.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/source/user_guide.md b/docs/source/user_guide.md index ff6f14312..3492176eb 100644 --- a/docs/source/user_guide.md +++ b/docs/source/user_guide.md @@ -93,12 +93,14 @@ Here is partial list of remotely hosted files used by ReEDS: - You can feed the period:szn mapping from a completed run into the inputs folder of your repo to force ReEDS to use the same representative or stress periods. More detail can be found in the postprocessing tools guide. -- `GSw_PRM_StressThreshold`: The default setting of 'transgrp_1_EUE_sum' means a threshold of "**1** ppm NEUE in each **transgrp**", with stress periods selected by the daily **sum** of **EUE** within each **transgrp**. - - The first argument can be selected from ['country', 'interconnect', 'nercr', 'transreg', 'transgrp', 'st', 'r'] and specifies the hierarchy level within which to compare RA performance against the threshold. - - The second argument can be any float and specifies the RA performance threshold in parts per million [ppm]. - - The third argument can be 'NEUE' or 'EUE', specifying which metric to use when selecting stress periods. If set to 'NEUE' the model will add stress periods with the largest **fraction** of dropped load; if set to 'EUE' the model will add stress periods with the largest **absolute MWh** of dropped load. - - The fourth argument can be 'sum' or 'max', specifying whether to add stress periods in order of their daily per-hour max dropped load or by their daily sum of dropped load when selecting stress periods. - - If desired you can provide /-delimited entries like 'transgrp_10_EUE_sum/country_1_EUE_sum', meaning that each transgrp must have ≤10 ppm NEUE and the country overall must have ≤1 ppm NEUE. +- `GSw_PRM_StressThresholdMetrics` and `GSw_PRM_StressThreshold{metric}`: Resource adequacy thresholds used to decide whether to add new stress periods. + - `GSw_PRM_StressThresholdMetrics` (default `NEUE`) is a /-delimited list of the metrics that can be used. Supported metrics are `NEUE`, `LOLD`, `LOLE`, `LOLH`, `Depth`, and `Duration`. + - Each listed metric reads its threshold from the matching `GSw_PRM_StressThreshold{metric}` switch, formatted as `{level}_{value}`. The default `GSw_PRM_StressThresholdNEUE=transgrp_1` means a threshold of "**1** ppm NEUE in each **transgrp**". + - `{level}` can be selected from ['country', 'interconnect', 'nercr', 'transreg', 'transgrp', 'st', 'r'] and specifies the hierarchy level within which to compare RA performance against the threshold. + - `{value}` is a non-negative number in the units of the metric: NEUE [ppm]; LOLD [event-days/year]; LOLE [events/year]; LOLH [event-hours/year]; Depth [maximum hourly EUE as a fraction of peak load]; Duration [hours in the longest outage event]. + - If desired you can provide /-delimited entries like `GSw_PRM_StressThresholdNEUE=transgrp_10/country_1`, meaning that each transgrp must have ≤10 ppm NEUE and the country overall must have ≤1 ppm NEUE. + - For each region that exceeds a threshold, `GSw_PRM_StressIncrement` new stress periods are added, ranked by a metric-specific criterion: daily sum of EUE (NEUE), daily maximum hourly EUE (Depth), daily maximum hourly loss-of-load probability (LOLD, LOLE), daily sum of hourly loss-of-load probability (LOLH), or longest EUE events (Duration). + - Shoulder periods for storage recharge (`GSw_PRM_StressStorageCutoff`) are only added for the NEUE metric. ### Conventions @@ -400,8 +402,8 @@ In addition, the `GSw_ReducedResource` switch allows for a uniform reduction of 1. `GSw_TransSquigglinessMin`: Minimum squiggliness (straight-line length multiplier) to apply for interzonal transmission; the default value of 1.3 is from the [MISO Transmission Cost Estimation Guide](https://www.misoenergy.org/planning/transmission-planning/mtep). The cost and length of representative interzonal transmission routes that are straighter than `GSw_TransSquigglinessMin` are scaled up to match `GSw_TransSquigglinessMin` (i.e., if a representative route is 11 miles long and the straight-line distance between its endpoints is 10 miles, giving a squiggliness factor of 1.1, its cost and length are scaled up by 1.3 / 1.1 = 1.18). -1. `GSw_TransHurdle`: Intra-US hurdle rate for interzonal flows, measured in $2004/MWh -1. `GSw_TransHurdleLevel`: Indicate the level of hierarchy.csv between which to apply the hurdle rate specified by `GSw_TransHurdle`. i.e. if set to ‘st’, intra-state flows will have no hurdle rates but inter-state flows will have hurdle rates specified by `GSw_TransHurdle`. +1. `GSw_TransHurdleRate`: Turn on (1) or off (0) hurdle rates for intra-US interzonal flows. The rates [2004$/MWh] are taken by year from the column of `inputs/transmission/cost_hurdle_intra.csv` that matches the selected hierarchy level. +1. `GSw_TransHurdleLevel1` and `GSw_TransHurdleLevel2`: Levels of hierarchy.csv between which to apply hurdle rates when `GSw_TransHurdleRate=1`. For example, if `GSw_TransHurdleLevel1=st`, intra-state flows will have no level-1 hurdle rate but inter-state flows will. The hurdle rate on each interface is the larger of the level-1 and level-2 rates (with a floor of `hurdle_rate_floor` from `inputs/scalars.csv`). Hurdle rates between the US and Canada/Mexico are set separately in `inputs/transmission/cost_hurdle_country.csv`. 1. `GSw_TransRestrict`: Spatial hierarchy level within which to allow transmission expansion. For example, if set to `st`, no inter-state expansion is allowed. 1. `GSw_TransScen`: Which `inputs/transmission/hvdc_planned-{GSw_TransScen}.csv` file to use. This file provides a list of additional transmission lines that can be built. From 06ef62810f2173557fa1ff134b94d7cc38ce7e4a Mon Sep 17 00:00:00 2001 From: wcole Date: Tue, 10 Nov 2026 15:39:36 -0700 Subject: [PATCH 2/3] Fix documentation inconsistencies. --- docs/source/model_documentation.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/source/model_documentation.md b/docs/source/model_documentation.md index e25784c75..abfdc9025 100644 --- a/docs/source/model_documentation.md +++ b/docs/source/model_documentation.md @@ -1212,7 +1212,7 @@ PSH fixed O&M costs and round-trip efficiency are taken from {cite}`mongird2020G ```{admonition} PSH options - `pshsupplycurve`: Determines the PSH supply-curve dataset used. - - PSH storage duration is either 8, 10, or 12 hours depending on the chosen PSH supply curve (with 12 hours as the default). Supply curves with wEph or wEphemeral in the filename allow sites that intersect with ephemeral streams. Supply curves with wExist in the filename allow sites that utilize existing reservoirs. The repository typically includes the latest and previous data vintages. + - Specified as `{duration}hr_{siting}` with entries from `inputs/supply_curve/supplycurve_psh-{pshsupplycurve}.csv`. The PSH storage duration options are 8, 10, or 12 hours and the siting scenario options are `limited`, `reference`, or `open`. The default is `8hr_reference`. - `GSw_PSHwatercon`: Requires new PSH to purchase water access from water supply supply curves. - `0`: Ignore water access costs (default). @@ -1226,7 +1226,7 @@ PSH fixed O&M costs and round-trip efficiency are taken from {cite}`mongird2020G - `GSw_PSHfillyears`: Scales the water requirement by the number of years it is assumed to take to fill the PSH reservoirs. - Default setting: 3 years. -**`GSw_PSHwatertypes` and `GSw_PSHfillyears` are only relevant when `GSw_watercon = 1`.** +**`GSw_PSHwatertypes` is only relevant when `GSw_WaterMain = 1`, and `GSw_PSHfillyears` is only relevant when `GSw_PSHwatercon = 1` (which also requires `GSw_WaterMain = 1`).** ``` @@ -1267,7 +1267,7 @@ By default, the model uses the third option (endogenous representation with zona ```{admonition} Hydrogen options - `GSw_H2` (default `2`): Controls the representation of hydrogen. - - `0`: **drop-in fuel** — no endogenous representation of hydrogen production or transport; if `GSw_H2CT=1` fuel is assumed to be available at the cost specified by `h2ctfuelscen`. + - `0`: **drop-in fuel** — no endogenous representation of hydrogen production or transport; if `GSw_H2Combustion=1`, fuel for H2-CT and H2-CC is assumed to be available at the cost specified by `h2combustionfuelscen`. - `1`: **production, national balancing** — endogenous representation of hydrogen production represented with national balancing (no network constraints). - `2`: **production, regional balancing** — endogenous representation of hydrogen production and transport network. @@ -2428,7 +2428,8 @@ The syntax for these switches is described in the "Description" column of `cases - Choose between stress periods vs. capacity credit - `GSw_PRM_CapCredit` (default 0): Use stress periods if 0, capacity credit if 1 - Control the iteration between ReEDS and PRAS - - `GSw_PRM_StressThreshold` (default `transgrp_1_EUE_sum`): Regional RA threshold for stress period iteration + - `GSw_PRM_StressThresholdMetrics` (default `NEUE`): RA metric(s) checked during stress period iteration + - `GSw_PRM_StressThreshold{metric}` (default `GSw_PRM_StressThresholdNEUE=transgrp_1`): Regional RA threshold for each metric - `GSw_PRM_StressIterateMax` (default 5): Max number of times to iterate on a particular solve year before halting the run - `GSw_PRM_StressIncrement` (default 2): How many stress periods to add per region per iteration - `GSw_PRM_StressStorageCutoff` (default `EUE_0.1`): How to select "shoulder" stress periods for interday storage @@ -2446,7 +2447,7 @@ The syntax for these switches is described in the "Description" column of `cases - Additional RA modeling details - `resource_adequacy_years` (default `2007_2008_2009_2010_2011_2012_2013_2016_2017_2018_2019_2020_2021_2022_2023`): Weather years to include in resource adequacy calculations - `GSw_HourlyChunkLengthStress` (default 3): Hours per time chunk modeled during stress periods - - `pras_samples` (default 10): Number of Monte Carlo outage draws modeled in PRAS + - `pras_samples` (default 100): Number of Monte Carlo outage draws modeled in PRAS - `GSw_PRM_StressLoadAggMethod` (default `max`): How to aggregate load within time chunks: "mean" or "max" - `GSw_PRM_StressOutages` (default 1): Turn on (1) / off (0) outages during stress periods in ReEDS ``` @@ -2524,8 +2525,8 @@ In all cases, the VRE profile is compared against the aggregated regional load p Many settings related to capacity credit calculations can be adjusted by the user. - `capcredit_hierarchy_level` (default `transreg` for the 11 planning regions shown in {numref}`figure-spatial_layers_zones`): Level at which to aggregate net load for capacity credit calculation - `GSw_PRM_CapCreditHours` (default 20): Number of peak net load hours per capacity credit season considered in capacity credit calculation -- `marg_vre_mw` (default 1000): Amount of marginal VRE capacity to add in MW for marginal capacity credit calculation -- `marg_stor_mw` (default 100): Amount of marginal storage capacity to add in MW for marginal capacity credit calculation +- `marg_vre_mw` (default 1000): Minimum amount of marginal VRE capacity in MW to add for marginal capacity credit calculation; the specific amount used is the maximum of this value and the the most recent average new VRE investment per capacity credit region (looking back the number of solve years specified by `marg_vre_steps`) +- `cc_stor_stepsize` (default 100): Amount of marginal storage capacity in MW to add for marginal storage capacity credit calculation ``` From 0d1eb8e7794d74575eac5d2270ada6b3375e89c8 Mon Sep 17 00:00:00 2001 From: wcole Date: Tue, 10 Nov 2026 15:40:32 -0700 Subject: [PATCH 3/3] Update comments to match correct switch names. --- reeds/core/setup/b_inputs.gms | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reeds/core/setup/b_inputs.gms b/reeds/core/setup/b_inputs.gms index e916bbe8d..516fcadab 100644 --- a/reeds/core/setup/b_inputs.gms +++ b/reeds/core/setup/b_inputs.gms @@ -2732,7 +2732,7 @@ set routes(r,rr,trtype,t) "final conditional on transmission feasibility" opres_routes(r,rr,t) "final conditional on operating reserve flow feasibility" ; -* Specify the transmission types that are limited by Sw_TransCapMax and Sw_TransCapMaxTotal +* Specify the transmission types that are limited by Sw_TransCapMaxEachType and Sw_TransCapMaxAllTypes set trtypemax(trtype) "trtypes to limit" ; trtypemax(trtype)$[(Sw_TransCapMaxTypes=0)] = no ; trtypemax(trtype)$[(Sw_TransCapMaxTypes=1)] = yes ; @@ -2898,7 +2898,7 @@ $onlisting / ; $offempty -* Assign hurdle rates to chosen GSw_TransHurdLevel +* Assign hurdle rates to chosen GSw_TransHurdleLevel1 and GSw_TransHurdleLevel2 * define hurdle rates across international lines * first determine whether the regions are of different countries.. cost_hurdle_regiongrp1(r,rr,t)$[sum{country$r_country(r,country),ord(country) }