[PSH] Update PSH Supply Curves for Site-Level Processing

cases.csv

@@ -38,7 +38,7 @@ 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,
-pshsupplycurve,PSH Supply Curve,(8|10|12)hr_(ref|wEphemeral|wExist|wEph|wExist_wEph)_(apr2025|mar2024),12hr_ref_apr2025,
+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,
 h2combustionfuelscen,H2-CT/CC Fuel Price Scenarios (only used if endogenous H2 production is turned off),10; reference; 30,reference,
@@ -64,12 +64,13 @@ techs_suffix,File suffix for master list of technologies,default; subsetForTesti
 dollar_year,DO NOT CHANGE FROM 2004 UNTIL ALL FINANCIAL INPUTS HAVE DOLLAR YEAR ADJUSTMENT - Real dollar year for model to calculate and report,2004,2004,
 sys_eval_years,Number of years that the model evaluates investments on,int,30,
 numhintage,"number of hintage bins. Enter 'unit' for unit level bins. Enter 'group' to group by unique technology, region, and heatrate combinations",int,6,
-numbins_windons,Number of interconnection supply curve bins for onshore wind; options are 5 and 1300 (for individual sites lite),int,10,
+numbins_windons,Number of interconnection supply curve bins for onshore wind,int,10,
 numbins_windofs,Number of interconnection supply curve bins for offshore wind; options are 5 and 1300 (for individual sites lite),int,5,
-numbins_upv,Number of interconnection supply curve bins for upv; options are 20 and 1300 (for individual sites lite),int,40,
+numbins_upv,Number of interconnection supply curve bins for upv,int,40,
 numbins_csp,Number of interconnection supply curve bins for csp,int,5,
 numbins_geohydro_allkm,Number of interconnection supply curve bins for hydrothermal geothermal,int,10,
 numbins_egs_allkm,Number of interconnection supply curve bins for deep enhanced geothermal,int,10,
+numbins_psh, Number of interconnection supply curve bins for pumped storage hydropower,int,15,
 mindev,minimum deviation for a hintage to qualify for a new bin,int,50,
 unitdata,"Unit Database: ""EIA-NEMS"" for NEMS",EIA-NEMS,EIA-NEMS,
 marg_vre_mw,MW for marginal VRE curt/cc calcs,N/A,1000,
@@ -322,6 +323,7 @@ GSw_StateRPS_Carveouts,Turn wind and solar carveouts off/on,0;1,0,
 GSw_StateCO2ImportLevel,Hierarchy level within which to calculate CO2 emissions rate [metric ton/MWh] for state CO2 caps,r; nercr; transreg; cendiv; st; interconnect; country; usda_region,interconnect,
 GSw_Storage,0=ban storage; 1=use all standalone storage techs,0; 1,1,
 GSw_StorageBinPenalty,Turn on/off the storage bin penalty for the PRM method (when on results in better firm capacity outputs),0; 1,1,
+GSw_TechCostAdjust,"Fractional adjustments to overnight capital costs by technology group and year (inputs/plant_characteristics/tech_cost_adjustments_{GSw_TechCostAdjust}.csv). Groups are column names in inputs/tech-subset-table.csv; 'none' applies no adjustment",none; ATB_2025,none,
 GSw_TCPhaseout,Switch for whether tax credit Phaseout is enabled (0=no; 1=yes),0; 1,1,
 GSw_TCPhaseout_forceyear,(0=off by default) Indicate a year in which to force the start of the tax credit phaseout,N/A,2032,
 GSw_TCPhaseout_ref_year,The reference year used to determine whether the trigger for the tax credit phaseout threshold has been hit (with 100by),N/A,2022,

helpers/runstatus.py

@@ -137,7 +137,7 @@ def get_run_status(reeds_path, batch_name):
                     mem_eff = result['Memory Efficiency'].split('%')[0]
                     msg = f"{duration:>10} | {cpu_eff:>5}% CPU | {mem_eff:>5}% memory ({mem_use})"
                 if include_finished:
-                    print(f"{case:<{longest}}: {msg}")
+                    print(f"{case:<{longest+1}}: {msg}")
             else:
                 ### Get last .lst file
                 lstfiles = sorted(glob(os.path.join(fullcase,'lstfiles','*')))

inputs/storage/PSH_supply_curves_durations.csv

@@ -1,25 +1,10 @@
 pshsupplycurve,duration
-8hr_ref_mar2024,8
-8hr_wEphemeral_mar2024,8
-10hr_ref_mar2024,10
-10hr_wEphemeral_mar2024,10
-12hr_ref_mar2024,12
-12hr_wEphemeral_mar2024,12
-8hr_wExist_mar2024,8
-8hr_wExist_wEph_mar2024,8
-10hr_wExist_mar2024,10
-10hr_wExist_wEph_mar2024,10
-12hr_wExist_mar2024,12
-12hr_wExist_wEph_mar2024,12
-8hr_ref_apr2025,8
-8hr_wEph_apr2025,8
-10hr_ref_apr2025,10
-10hr_wEph_apr2025,10
-12hr_ref_apr2025,12
-12hr_wEph_apr2025,12
-8hr_wExist_apr2025,8
-8hr_wExist_wEph_apr2025,8
-10hr_wExist_apr2025,10
-10hr_wExist_wEph_apr2025,10
-12hr_wExist_apr2025,12
-12hr_wExist_wEph_apr2025,12
+8hr_limited,8
+8hr_reference,8
+8hr_open,8
+10hr_limited,10
+10hr_reference,10
+10hr_open,10
+12hr_limited,12
+12hr_reference,12
+12hr_open,12

inputs/storage/README.md

@@ -2,6 +2,6 @@
 
 - `cap_existing_psh.csv`: County-wide PSH operational capacity [MW/MWh], pump capacity, and max energy, based on plant-level data from [https://www.hydropower.org/hydropower-pumped-storage-tool](https://www.hydropower.org/hydropower-pumped-storage-tool)
 
-- `PSH_supply_curves_durations.csv`: 
+- `PSH_supply_curves_durations.csv`: PSH storage duration corresponding to each PSH supply curve, used to define the storage duration of new PSH capacity as well as existing PSH capacity if not explicitly defined.
 
 - `storage_duration.csv`: