Skip to content
2 changes: 1 addition & 1 deletion docs/sources.csv
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ RelativeFilePath,RelativeFolderPath,FileName_new,FileExtension,Description_new,I
/inputs/state_policies/techs_banned_rps.csv,/inputs/state_policies,techs_banned_rps,.csv,Indicates which technolgies are not eligible to contribute to RPS,,,,,
/inputs/state_policies/unbundled_limit_ces.csv,/inputs/state_policies,unbundled_limit_ces,.csv,Limit on fraction of credits towards CES which can be purchased unbundled from other states ,,,,,
/inputs/state_policies/unbundled_limit_rps.csv,/inputs/state_policies,unbundled_limit_rps,.csv,Limit on fraction of credits towards RPS which can be purchased unbundled from other states ,,,,,
/inputs/storage/cap_existing_psh.csv,/inputs/storage,cap_existing_psh,.csv,"County-wide PSH operational capacity, pump capacity, and max energy, based on plant-level data from https://www.hydropower.org/hydropower-pumped-storage-tool",,,,,MW/MWh
/inputs/storage/cap_existing_psh.csv,/inputs/storage,cap_existing_psh,.csv,"County-wide PSH operational capacity, pump capacity, and max energy, based on plant-level data from https://www.energy.gov/sites/prod/files/2021/01/f82/us-hydropower-market-report-full-2021.pdf",,,,,MW/MWh
/inputs/storage/PSH_supply_curves_durations.csv,/inputs/storage,PSH_supply_curves_durations,.csv,,,,,,
/inputs/storage/storage_duration.csv,/inputs/storage,storage_duration,.csv,,,,,,
/inputs/supply_curve/bio_supplycurve.csv,/inputs/supply_curve,bio_supplycurve,.csv,Regional biomass supply and costs by resource class,,2015,,,
Expand Down
68 changes: 35 additions & 33 deletions inputs/storage/cap_existing_psh.csv
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
*i,v,r,operational_capacity_MW,pump_capacity_MW,max_energy_MWh
pumped-hydro,init-1,p04013,235,192,26654
pumped-hydro,init-1,p05019,68,28,190
pumped-hydro,init-1,p06007,939,474,1859862
pumped-hydro,init-1,p06019,1411.8,1412,185600
pumped-hydro,init-1,p06037,1556,1500,18672
pumped-hydro,init-1,p06047,529.2,451,510012.4
pumped-hydro,init-1,p06073,40,40,15792
pumped-hydro,init-1,p08019,324,324,1450
pumped-hydro,init-1,p08065,200,200,2410
pumped-hydro,init-1,p08069,94.5,9,1134
pumped-hydro,init-1,p09190,29,12,26790
pumped-hydro,init-1,p13105,600,300,7200
pumped-hydro,init-1,p13115,1095,903,6080
pumped-hydro,init-1,p13141,321,210,213000
pumped-hydro,init-1,p13213,500,250,1890
pumped-hydro,init-1,p25011,1724,1680,14190
pumped-hydro,init-1,p26105,1872,1872,17200
pumped-hydro,init-1,p29173,58,31,280
pumped-hydro,init-1,p29179,450,440,2750
pumped-hydro,init-1,p34041,453,420,2800
pumped-hydro,init-1,p36063,240,240,4800
pumped-hydro,init-1,p36095,1160,1160,12000
pumped-hydro,init-1,p37039,185,185,289200
pumped-hydro,init-1,p40097,260,260,2650
pumped-hydro,init-1,p42071,1072,1072,11100
pumped-hydro,init-1,p42123,469,440,3920
pumped-hydro,init-1,p45039,576,576,4100
pumped-hydro,init-1,p45073,1065.2,1065,24000
pumped-hydro,init-1,p45077,710,710,57540
pumped-hydro,init-1,p47115,1652,1652,32130
pumped-hydro,init-1,p51017,3003,2880,23700
pumped-hydro,init-1,p51143,560,100,3330
pumped-hydro,init-1,p53047,314,314,11120
pumped-hydro,init-1,p04013,194.1,194.1,3833.4
pumped-hydro,init-1,p05019,28.0,28.0,112.0
pumped-hydro,init-1,p06007,375.6,375.6,20885.6
pumped-hydro,init-1,p06019,1252.8,1252.8,127784.5
pumped-hydro,init-1,p06025,7.2,7.2,68.2
pumped-hydro,init-1,p06037,1631.4,1631.4,16281.6
pumped-hydro,init-1,p06047,449.2,449.2,3718.7
pumped-hydro,init-1,p06073,42.0,42.0,252.0
pumped-hydro,init-1,p08019,300.0,300.0,1200.0
pumped-hydro,init-1,p08065,200.0,200.0,2400.0
pumped-hydro,init-1,p08069,8.5,8.5,611.5
pumped-hydro,init-1,p09190,31.0,31.0,12603.4
pumped-hydro,init-1,p13115,847.8,847.8,6104.2
pumped-hydro,init-1,p13213,250.0,250.0,54192.9
pumped-hydro,init-1,p13237,208.8,208.8,2886.8
pumped-hydro,init-1,p25011,1768.0,1768.0,11853.4
pumped-hydro,init-1,p26105,1978.8,1978.8,15830.4
pumped-hydro,init-1,p29015,161.4,161.4,6580.8
pumped-hydro,init-1,p29173,31.0,31.0,1160.3
pumped-hydro,init-1,p29179,408.0,408.0,3264.0
pumped-hydro,init-1,p34041,453.0,453.0,2718.0
pumped-hydro,init-1,p36063,240.0,240.0,1954.8
pumped-hydro,init-1,p36095,1000.0,1000.0,15000.0
pumped-hydro,init-1,p37039,95.0,95.0,4454.3
pumped-hydro,init-1,p40097,259.2,259.2,7966.3
pumped-hydro,init-1,p42071,1072.0,1072.0,15329.6
pumped-hydro,init-1,p42123,469.0,469.0,5252.8
pumped-hydro,init-1,p45001,328.0,328.0,1319.4
pumped-hydro,init-1,p45039,587.2,587.2,4092.8
pumped-hydro,init-1,p45073,2070.0,2070.0,103473.0
pumped-hydro,init-1,p47065,1713.6,1713.6,37699.2
pumped-hydro,init-1,p49041,0.1,0.1,0.6
pumped-hydro,init-1,p51017,2862.0,2862.0,29478.6
pumped-hydro,init-1,p51067,247.3,247.3,7797.8
pumped-hydro,init-1,p53025,314.0,314.0,25120.0
1 change: 1 addition & 0 deletions reeds/core/setup/b_inputs.gms
Original file line number Diff line number Diff line change
Expand Up @@ -5269,6 +5269,7 @@ $onlisting
$offempty

* Note that this PSH duration overwrites what is contained in storage_duration.csv
* and will be overridden by data in storage_duration_pshdata.csv if durations for existing PSH are used
storage_duration(i)$psh(i) = psh_sc_duration ;

storage_duration(i)$[i_water_cooling(i)$Sw_WaterMain] =
Expand Down
6 changes: 3 additions & 3 deletions reeds/core/setup/c_model.gms
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,7 @@ eq_storage_duration(i,v,r,h,t)$[valgen(i,v,r,t)$valcap(i,v,r,t)
$(not storage_interday(i))]..

* [plus] storage duration times storage capacity for fixed-duration techs
storage_duration(i) * CAP(i,v,r,t) * (1$CSP_Storage(i) + 1$psh(i) + bcr(i)$pvb(i))
storage_duration_m(i,v,r) * CAP(i,v,r,t) * (1$CSP_Storage(i) + 1$psh(i) + bcr(i)$pvb(i))

* [plus] EVMC storage has time-varying energy capacity
+ evmc_storage_energy_hours(i,r,h,t) * CAP(i,v,r,t) * (bcr(i)$evmc_storage(i))
Expand Down Expand Up @@ -3314,7 +3314,7 @@ eq_storage_interday_min_level_end(i,v,r,allszn,t)$[valgen(i,v,r,t)$storage_inter
eq_storage_interday_max_level_start(i,v,r,allszn,t)$[valgen(i,v,r,t)$storage_interday(i)$tmodel(t)$numpartitions(allszn)]..

* Fixed-duration storage
storage_duration(i) * CAP(i,v,r,t)$(not battery(i))
storage_duration_m(i,v,r) * CAP(i,v,r,t)$(not battery(i))
* Variable-duration storage
+ CAP_ENERGY(i,v,r,t)$battery(i)

Expand All @@ -3332,7 +3332,7 @@ eq_storage_interday_max_level_start(i,v,r,allszn,t)$[valgen(i,v,r,t)$storage_int
* This is to make sure not only their hour 0 but also the highest point of the last period of each partition is greater than maximum capacity
eq_storage_interday_max_level_end(i,v,r,allszn,t)$[valgen(i,v,r,t)$storage_interday(i)$tmodel(t)$numpartitions(allszn)]..

storage_duration(i) * CAP(i,v,r,t)$(not battery(i))
storage_duration_m(i,v,r) * CAP(i,v,r,t)$(not battery(i))

+ CAP_ENERGY(i,v,r,t)$battery(i)

Expand Down
4 changes: 2 additions & 2 deletions reeds/core/terminus/report.gms
Original file line number Diff line number Diff line change
Expand Up @@ -910,10 +910,10 @@ cap_sdbin_out(i,r,ccseason,sdbin,t)$valcap_irt(i,r,t) = sum{v, CAP_SDBIN.l(i,v,r

* energy capacity of storage
stor_energy_cap(i,v,r,t)$[tmodel_new(t)$valcap(i,v,r,t)] =
storage_duration(i) * CAP.l(i,v,r,t) * (1$CSP_Storage(i) + 1$psh(i) + bcr(i)$[battery(i) or storage_hybrid(i)$(not csp(i))]) ;
storage_duration_m(i,v,r) * CAP.l(i,v,r,t) * (1$CSP_Storage(i) + 1$psh(i) + bcr(i)$[battery(i) or storage_hybrid(i)$(not csp(i))]) ;

* add PSH energy capacity to cap_energy_ivrt
cap_energy_ivrt(i,v,r,t)$[valcap(i,v,r,t)$psh(i)] = CAP.l(i,v,r,t) * storage_duration(i) ;
cap_energy_ivrt(i,v,r,t)$[valcap(i,v,r,t)$psh(i)] = CAP.l(i,v,r,t) * storage_duration_m(i,v,r) ;

* battery storage duration
storage_duration_out(i,v,r,t)$[valcap(i,v,r,t)$battery(i)$CAP.l(i,v,r,t)] =
Expand Down
1 change: 1 addition & 0 deletions reeds/core/terminus/report_params.csv
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ pvf_onm,,,,,1
r,,,,,1
rsc_dat,,,,,1
storage_duration,,,,,1
storage_duration_m,,,,,1
storage_eff,,,,,1
szn_stress_t,,,,,1
tc_phaseout_mult,,,,,1
Expand Down
Loading