Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
206 commits
Select commit Hold shift + click to select a range
35b2339
moved to github.com
atpham88 Apr 15, 2026
8a17399
Update ReEDS_generator_database_final_EIA-NEMS.csv
atpham88 Apr 15, 2026
04d2355
put climate folder back
atpham88 Apr 15, 2026
b8779fa
update upload-artifact to v4 to pass github tests
atpham88 Apr 15, 2026
2c1fec0
Merge branch 'main' into ap_flex-start-year
atpham88 Apr 16, 2026
64ea661
fix issue with wind-ons supply curves
atpham88 Apr 16, 2026
bacf02a
Merge branch 'main' into ap_flex-start-year
atpham88 Apr 16, 2026
e760e49
Update sources.csv
atpham88 Apr 17, 2026
ad71748
remove redundant statements
atpham88 Apr 17, 2026
1d989fc
remove exog_cap and exog_prescribe files from hourlize
atpham88 Apr 17, 2026
2afc17b
Update sources.csv
atpham88 Apr 17, 2026
3dda333
add more description for tech classification files
atpham88 Apr 17, 2026
2848ff5
Update e_report.gms
atpham88 Apr 18, 2026
eb1f1ce
Merge branch 'main' into ap_flex-start-year
atpham88 Apr 20, 2026
2f78001
only use max cf for class cut off to avoid gaps
atpham88 Apr 21, 2026
a880c2a
keep rounding to 4 decimals
atpham88 Apr 21, 2026
bb0282f
add function to get missing_class_resource
atpham88 Apr 21, 2026
13079d8
clean up
atpham88 Apr 21, 2026
c7d90f6
clean up
atpham88 Apr 21, 2026
c208046
remove sc_point_gid and geothermal temp from NEMS
atpham88 Apr 21, 2026
91cec02
remove unitdata.csv from runfiles.csv
atpham88 Apr 22, 2026
74ae71c
Create generate_unitdata.py
atpham88 Apr 22, 2026
496246c
remove reading NEMS data and its processing from copy_files.py
atpham88 Apr 22, 2026
10fe8ef
Add generate_unitdata.py script
atpham88 Apr 22, 2026
8e160ac
move all NEMS data processing from copy_files and add to generate_uni…
atpham88 Apr 22, 2026
4a1ffa6
use current NEMS data for this PR
atpham88 Apr 22, 2026
ab58f8e
add mean resource temp to geothermal supply curves
atpham88 Apr 22, 2026
068e7ea
add one-off script to add mean temp to geothermal resources
atpham88 Apr 22, 2026
5d6ed6d
use egs supply curve for existing geohydro units in NEMS
atpham88 Apr 22, 2026
7730a81
clean up
atpham88 Apr 22, 2026
0917120
Merge branch 'main' into ap_flex-start-year
atpham88 Apr 22, 2026
fab7c02
clean up
atpham88 Apr 22, 2026
91fd4a5
Update generate_unitdata.py
atpham88 Apr 23, 2026
71dccc9
Update generate_unitdata.py
atpham88 Apr 23, 2026
72455b6
clean up
atpham88 Apr 23, 2026
13bea65
Update generate_unitdata.py
atpham88 Apr 23, 2026
6cd9c44
Merge branch 'main' into ap_flex-start-year
atpham88 Apr 23, 2026
57cdef8
update mapping between offshore wind sc_point_gid and NEMS units
atpham88 Apr 23, 2026
7a06fa0
Merge branch 'main' into ap_flex-start-year
atpham88 Apr 23, 2026
fb7ab38
clean up and add more description
atpham88 Apr 23, 2026
d2e5cbd
remove csp from upv_exog_cap
atpham88 Apr 24, 2026
1dfa19d
Update c_supplymodel.gms
atpham88 May 2, 2026
b79c2c7
Update c_supplymodel.gms
atpham88 May 2, 2026
ece954d
reduce decimal in resource temp and change classification file names
atpham88 May 2, 2026
37672cc
Merge branch 'ap_flex-start-year' of https://github.com/ReEDS-Model/R…
atpham88 May 2, 2026
f8bb631
Merge branch 'main' into ap_flex-start-year
atpham88 May 2, 2026
752767b
rename exog_cap_{tech} files
atpham88 May 2, 2026
bb813de
remove duplicate testing lines
atpham88 May 2, 2026
c4ea341
Update input_processing/generate_unitdata.py
atpham88 May 2, 2026
1c28dc6
wrap under 100 characters
atpham88 May 2, 2026
2114afd
clean up datafile names
atpham88 May 2, 2026
75c126b
Update hourlize/define_tech_classes.py
atpham88 May 2, 2026
ff7d420
Update b_inputs.gms
atpham88 May 2, 2026
fe847ea
Update input_processing/recf.py
atpham88 May 2, 2026
ef38eee
Update b_inputs.gms
atpham88 May 2, 2026
ab45787
remove Sw_onlineyearcol
atpham88 May 2, 2026
f82b6bf
Merge branch 'ap_flex-start-year' of https://github.com/ReEDS-Model/R…
atpham88 May 2, 2026
26191fb
move main function after supporting functions
atpham88 May 2, 2026
9807765
clean up coordinates and sc_points mapping function
atpham88 May 2, 2026
85f382d
Update README.md
atpham88 May 2, 2026
f14c35d
Update input_processing/aggregate_regions.py
atpham88 May 2, 2026
7c398a2
wrap under 100 characters
atpham88 May 2, 2026
9e8ed14
reduce number of dfs/gdfs
atpham88 May 2, 2026
df83f58
fix to pass tests
atpham88 May 3, 2026
e859335
clean up generate_unitdata.py
atpham88 May 4, 2026
b364b1a
clean up
atpham88 May 4, 2026
c635b80
Merge branch 'main' into ap_flex-start-year
atpham88 May 5, 2026
9c1780d
assign missing tech classes to resources closest to them
atpham88 May 6, 2026
3f09cfd
Merge branch 'main' into ap_flex-start-year
atpham88 May 6, 2026
db0ff30
Update recf.py
atpham88 May 6, 2026
7002c5f
exclude geothermal from missing resources
atpham88 May 6, 2026
20cd128
Merge branch 'main' into ap_flex-start-year
atpham88 May 7, 2026
2df57c3
Use supply curves in main repo stead of nrelnas to generate tech clas…
atpham88 May 8, 2026
06c948a
Merge branch 'main' into ap_flex-start-year
atpham88 May 8, 2026
b092f29
Update define_tech_classes.py
atpham88 May 9, 2026
3ca7b3b
Merge branch 'main' into ap_flex-start-year
atpham88 May 9, 2026
bda4e11
remove startyear from cases.csv and establish startyear based on yearset
atpham88 May 10, 2026
1ec5338
Update inputs.py
atpham88 May 10, 2026
b4ebb33
Clean up
atpham88 May 10, 2026
c3e3945
Update inputs.py
atpham88 May 10, 2026
cd767f2
Merge branch 'main' into ap_flex-start-year
atpham88 May 11, 2026
ed213b5
still write unitdata.csv to inputs_case in copy_files but process tec…
atpham88 May 11, 2026
097ea5f
remove unnecessary process
atpham88 May 11, 2026
f061367
add __name__ == '__main__' block to define_tech_classes.py
atpham88 May 11, 2026
fe3ff00
remove classification_{tech}.csv for pv and wind, create these files …
atpham88 May 11, 2026
65d2938
clean up
atpham88 May 11, 2026
7d3022d
clean up
atpham88 May 12, 2026
f03fedf
exclude geothermal from missing resource
atpham88 May 12, 2026
752109f
Update recf.py
atpham88 May 12, 2026
2ad78ae
remove missing class resource check
atpham88 May 12, 2026
fedfa98
use supply_curves in inputs_case for sc_point_gids mapping
atpham88 May 12, 2026
c0c7649
clean up
atpham88 May 12, 2026
918963c
separate unitdata_orig.csv and unitdata.csv
atpham88 May 13, 2026
391b89d
adjust class cutoffs to match with resources
atpham88 May 13, 2026
eae710b
Update futurefiles.csv
atpham88 May 13, 2026
6c99ee2
Merge branch 'main' into ap_flex-start-year
atpham88 May 13, 2026
288b46a
change path for reeds functions
atpham88 May 13, 2026
8402b72
resolve conflict
atpham88 May 13, 2026
a0deb81
remove reassignment of missing class resources and add an error check…
atpham88 May 13, 2026
46cf43e
add exogenous offshore wind cap
atpham88 May 13, 2026
15c6644
remove comment ='#' when reading NEMS data to avoid data loss
atpham88 May 13, 2026
d2c400f
reassign reeds_ba in unitdata as well to avoid resource/capacity mism…
atpham88 May 13, 2026
1c60b21
remove prescriptivelink from b_inputs.gms
atpham88 May 13, 2026
5ec49d2
use 'ba' column in county2zone to update 'reeds_ba' column in unitdat…
atpham88 May 13, 2026
2663d10
remove remaining pcat and clean up
atpham88 May 14, 2026
5822ee3
Merge branch 'main' into ap_flex-start-year
atpham88 May 21, 2026
72059b6
Merge branch 'main' into ap_flex-start-year
atpham88 Jun 5, 2026
f54e9b7
resolve conflicts
atpham88 Jun 6, 2026
756d583
Update b_inputs.gms
atpham88 Jun 6, 2026
a419c9b
resolve conflicts
atpham88 Jun 6, 2026
d6a313b
resolve conflicts
atpham88 Jun 6, 2026
b6d18f1
resolve conflicts
atpham88 Jun 6, 2026
c6d1a91
resolve conflicts
atpham88 Jun 7, 2026
37fda6c
resolve conflicts (add 'sets' as GAMStype for f, and etype sets)
atpham88 Jun 8, 2026
2f77cd8
resolve conflicts
atpham88 Jun 8, 2026
9d27f65
resolve conflicts
atpham88 Jun 8, 2026
8132b49
Update docs/sources.csv
atpham88 Jun 9, 2026
c39ef1e
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
f05b52e
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
1a64224
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
762a344
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
6728fe8
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
e416178
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
1c27e02
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
2c0dc40
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 9, 2026
9f65020
Update reeds/core/setup/c_model.gms
atpham88 Jun 9, 2026
a256424
Update cases.csv
atpham88 Jun 9, 2026
829aed4
add comment
atpham88 Jun 9, 2026
e1acebf
clean up
atpham88 Jun 9, 2026
89b68e4
print out missing classes if there are any and more clean up
atpham88 Jun 9, 2026
31fe937
Merge branch 'main' into ap_flex-start-year
atpham88 Jun 9, 2026
02861c8
clean up
atpham88 Jun 10, 2026
4528ac1
clean up
atpham88 Jun 12, 2026
c844e89
Merge branch 'main' into ap_flex-start-year
atpham88 Jun 16, 2026
3591014
Merge branch 'main' into ap_flex-start-year
atpham88 Jun 16, 2026
f67cf55
Merge branch 'main' into ap_flex-start-year
atpham88 Jun 17, 2026
f1f212f
fix issue with pcat removal
atpham88 Jun 17, 2026
2d9ada5
Update b_inputs.gms
atpham88 Jun 17, 2026
644c6be
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 18, 2026
6d05987
Update reeds/core/setup/b_inputs.gms
atpham88 Jun 18, 2026
4219d80
Merge branch 'main' into ap_flex-start-year
atpham88 Jun 25, 2026
bcec949
Merge branch 'main' into ap_flex-start-year
atpham88 Jun 28, 2026
847e8c8
reformat and clean up
atpham88 Jun 28, 2026
682411f
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 1, 2026
b4f194a
resolve conflicts and clean up
atpham88 Jul 1, 2026
d96bfdf
clean up
atpham88 Jul 1, 2026
1f78e20
resolve lfill issue in p128
atpham88 Jul 2, 2026
f14d692
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 4, 2026
ef5acba
capture some missing prescribed capacities
atpham88 Jul 4, 2026
dc46fff
clean up
atpham88 Jul 5, 2026
9c36a88
clean up
atpham88 Jul 5, 2026
bdd8f99
clean up
atpham88 Jul 6, 2026
b2a6fe6
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 6, 2026
aef6c21
resolve issue where non-offshore capacity is freely deployed in offsh…
atpham88 Jul 6, 2026
9d72a45
remove remaining mentions of pcat in documentation
atpham88 Jul 7, 2026
50258cd
fix a minor onshore wind issue
atpham88 Jul 9, 2026
7a7894f
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 9, 2026
b8a4c7d
clean up
atpham88 Jul 9, 2026
73f9069
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 14, 2026
fce2ae8
capture missing upv exog cap
atpham88 Jul 14, 2026
f7a0322
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 15, 2026
9669a1c
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 17, 2026
6395626
resolve issue with limit access case
atpham88 Jul 18, 2026
2948901
Update process_unitdata.py
atpham88 Jul 18, 2026
e2363d8
clean up
atpham88 Jul 19, 2026
bba19a3
Update writecapdat.py
atpham88 Jul 20, 2026
cf7571e
remove "existing_sites"
atpham88 Jul 20, 2026
fc2461e
Update resource.py
atpham88 Jul 20, 2026
827853c
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 20, 2026
d2fb9b8
capture prescribed build that starts on endyear
atpham88 Jul 21, 2026
68ddf21
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 21, 2026
b4b5652
Update reeds/input_processing/process_unitdata.py
atpham88 Jul 21, 2026
a0fe312
clean up
atpham88 Jul 21, 2026
ec84d1b
Merge branch 'ap_flex-start-year' of https://github.com/ReEDS-Model/R…
atpham88 Jul 21, 2026
72219fc
rename rsc_all as rsc_pv_all
atpham88 Jul 21, 2026
df2170c
Bugfix: Filter hydcf years later to prevent need for pre-2023 startyear
Jul 21, 2026
81f586e
clean up process_unitdata.py and add more comments
atpham88 Jul 21, 2026
0095042
Merge branch 'ap_flex-start-year' of https://github.com/ReEDS-Model/R…
atpham88 Jul 21, 2026
ec5c9bf
clean up and move set definition out of b_inputs
atpham88 Jul 22, 2026
10a8695
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 22, 2026
94471e1
fix errors, format, add comments, more clean up
atpham88 Jul 22, 2026
65431ba
Update writecapdat.py
atpham88 Jul 22, 2026
1ffdcc2
clean up and reverse unneeded changes
atpham88 Jul 22, 2026
9676496
reverse changes to config iles in metadata folder
atpham88 Jul 22, 2026
ed89fc1
Add check to filter out rsc tech classes in unitdata without a resour…
atpham88 Jul 22, 2026
5102c8c
clean up
atpham88 Jul 22, 2026
10f17a6
Apply suggestions from code review
atpham88 Jul 23, 2026
f91b518
clean up and fix typos
atpham88 Jul 23, 2026
84a3464
Merge branch 'ap_flex-start-year' of https://github.com/ReEDS-Model/R…
atpham88 Jul 23, 2026
7a76c0d
Apply suggestions from code review
atpham88 Jul 24, 2026
dd6ff26
fix indentation and remove ggregate_regions.py related statement
atpham88 Jul 24, 2026
8fc3727
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 24, 2026
835aef2
add fixed inputs, clean up, resolve conflict
atpham88 Jul 24, 2026
fd177ea
Update writecapdat.py
atpham88 Jul 24, 2026
af80ba5
resolve issue with updated conda
atpham88 Jul 24, 2026
12b9d79
Update process_unitdata.py
atpham88 Jul 24, 2026
c24ea76
if wind-ofs cf matches to both fixed and floating, assign it to fixed
atpham88 Jul 24, 2026
247eeb5
resolve github runner issue
atpham88 Jul 24, 2026
25778d1
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 28, 2026
7b81215
collapse rsc_pv terms and terminate if startyear is not 2010
atpham88 Jul 29, 2026
4893eec
Merge branch 'main' into ap_flex-start-year
atpham88 Jul 29, 2026
b381ae8
clean up
atpham88 Jul 29, 2026
d508ca7
remove unnecessary files and functions
atpham88 Jul 29, 2026
73cda95
Delete uncertainty_plots_all_cases.csv
atpham88 Jul 29, 2026
24e58df
clean up and revert some changes
atpham88 Jul 29, 2026
47f8023
Merge branch 'ap_flex-start-year' of https://github.com/ReEDS-Model/R…
atpham88 Jul 29, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cases.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
timetype,Sequential or Intertemporal,seq; int; win,seq,
ignore,"0=run this case, 1=ignore this case",0; 1,0,
AWS,Switch for when running on AWS,0; 1,0,
yearset,"_-delimited list of years to model OR bash-formatted year ranges (start..end..step). For example, 2010_2015_2020..2035..3_2040..2050..5 means: 2010, 2015, then 2020 through 2035 in 3-year steps, then 2040 through 2050 in 5-year steps. startyear will be prepended if it is not included. Truncated at endyear.",N/A,2010_2015_2020..2050..3,
startyear,First year to be modeled,N/A,2010,
yearset,"_-delimited list of years to model OR bash-formatted year ranges (start..end..step). For example, 2010_2015_2020..2035..3_2040..2050..5 means: 2010, 2015, then 2020 through 2035 in 3-year steps, then 2040 through 2050 in 5-year steps. startyear will be the first year in the list. Truncated at endyear.",N/A,2010_2015_2020..2050..3,
endyear,Last year to be modeled,N/A,2050,
windows_suffix,Set of windows that are modeled,default; step5; step10; 2100,default,
solver,Solver for GAMS to use,CPLEX; gurobi,CPLEX,
Expand Down Expand Up @@ -307,7 +306,7 @@ GSw_SitingGeo,Specify the Geothermal siting scenario,reference,reference,
GSw_SitingUPV,Specify the UPV siting scenario,open; reference; limited,reference,
GSw_SitingWindOfs,Specify the offshore wind siting scenario,open; reference; limited,reference,
GSw_SitingWindOns,Specify the onshore wind siting scenario,open; reference; limited,reference,
GSw_SkipRAyear,Last year in which to skip running the resource adequacy (RA) calculations,N/A,2020,
GSw_SkipRAyear,Last year in which to skip running the resource adequacy (RA) calculations,N/A,2024,
GSw_SpurCostMult,Multiplier for spur-line costs,float,1,
GSw_SpurScen,Spur-line scenario: 0 to include in resource supply curve; 1 to model endoegenously,0; 1,0,
GSw_SpurShare,Indicate whether wind-ons and upv are allowed to share spur line capacity,0; 1,0,
Expand Down
20 changes: 0 additions & 20 deletions docs/source/sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -496,24 +496,7 @@
- **Citation:** See 'notes' column in the file and https://www.energy.gov/oced/advanced-reactor-demonstration-projects-0
- **Units:** MW

- [exog_cap_geohydro_allkm_reference.csv](/inputs/capacity_exogenous/exog_cap_geohydro_allkm_reference.csv)
- [exog_cap_geohydro_reference.csv](/inputs/capacity_exogenous/exog_cap_geohydro_reference.csv)
- [exog_cap_upv_limited.csv](/inputs/capacity_exogenous/exog_cap_upv_limited.csv)
- [exog_cap_upv_open.csv](/inputs/capacity_exogenous/exog_cap_upv_open.csv)
- [exog_cap_upv_reference.csv](/inputs/capacity_exogenous/exog_cap_upv_reference.csv)
- [exog_cap_wind-ons_limited.csv](/inputs/capacity_exogenous/exog_cap_wind-ons_limited.csv)
- [exog_cap_wind-ons_open.csv](/inputs/capacity_exogenous/exog_cap_wind-ons_open.csv)
- [exog_cap_wind-ons_reference.csv](/inputs/capacity_exogenous/exog_cap_wind-ons_reference.csv)
- [interconnection_queues.csv](/inputs/capacity_exogenous/interconnection_queues.csv)
- [prescribed_builds_wind-ofs_meshed_limited.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_limited.csv)
- [prescribed_builds_wind-ofs_meshed_open.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_open.csv)
- [prescribed_builds_wind-ofs_meshed_reference.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_reference.csv)
- [prescribed_builds_wind-ofs_radial_limited.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_limited.csv)
- [prescribed_builds_wind-ofs_radial_open.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_open.csv)
- [prescribed_builds_wind-ofs_radial_reference.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_reference.csv)
- [prescribed_builds_wind-ons_limited.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ons_limited.csv)
- [prescribed_builds_wind-ons_open.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ons_open.csv)
- [prescribed_builds_wind-ons_reference.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ons_reference.csv)
- [ReEDS_generator_database_final_EIA-NEMS.csv](/inputs/capacity_exogenous/ReEDS_generator_database_final_EIA-NEMS.csv)
- **File Type:** Input
- **Description:** EIA-NEMS database of existing generators
Expand Down Expand Up @@ -1633,9 +1616,6 @@
- [p.csv](/inputs/sets/p.csv)
- **File Type:** GAMS set
- **Description:** set of products produced
- [pcat.csv](/inputs/sets/pcat.csv)
- **File Type:** GAMS set
- **Description:** set of prescribed technology categories
- [plantcat.csv](/inputs/sets/plantcat.csv)
- **File Type:** GAMS set
- **Description:** set of categories for plant characteristics
Expand Down
20 changes: 1 addition & 19 deletions docs/sources.csv
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,8 @@ RelativeFilePath,RelativeFolderPath,FileName_new,FileExtension,Description_new,I
/inputs/capacity_exogenous/cappayments.csv,/inputs/capacity_exogenous,cappayments,.csv,,,,,,
/inputs/capacity_exogenous/cappayments_ba.csv,/inputs/capacity_exogenous,cappayments_ba,.csv,,,,,,
/inputs/capacity_exogenous/demonstration_plants.csv,/inputs/capacity_exogenous,demonstration_plants,.csv,Nuclear-smr demonstration plants; active when GSw_NuclearDemo=1,"t,r,i,coolingwatertech,ctt,wst,value",,See 'notes' column in the file and https://www.energy.gov/oced/advanced-reactor-demonstration-projects-0,Prescribed capacity,MW
/inputs/capacity_exogenous/exog_cap_geohydro_allkm_reference.csv,/inputs/capacity_exogenous,exog_cap_geohydro_allkm_reference,.csv,,,,,,
/inputs/capacity_exogenous/exog_cap_geohydro_reference.csv,/inputs/capacity_exogenous,exog_cap_geohydro_reference,.csv,,,,,,
/inputs/capacity_exogenous/exog_cap_upv_limited.csv,/inputs/capacity_exogenous,exog_cap_upv_limited,.csv,,,,,,
/inputs/capacity_exogenous/exog_cap_upv_open.csv,/inputs/capacity_exogenous,exog_cap_upv_open,.csv,,,,,,
/inputs/capacity_exogenous/exog_cap_upv_reference.csv,/inputs/capacity_exogenous,exog_cap_upv_reference,.csv,,,,,,
/inputs/capacity_exogenous/exog_cap_wind-ons_limited.csv,/inputs/capacity_exogenous,exog_cap_wind-ons_limited,.csv,,,,,,
/inputs/capacity_exogenous/exog_cap_wind-ons_open.csv,/inputs/capacity_exogenous,exog_cap_wind-ons_open,.csv,,,,,,
/inputs/capacity_exogenous/exog_cap_wind-ons_reference.csv,/inputs/capacity_exogenous,exog_cap_wind-ons_reference,.csv,,,,,,
/inputs/supply_curve/classification_geothermal.csv,/inputs/capacity_exogenous,classification_geothermal,.csv,Tempurature ranges of geothermal facilities classes defined based on reV resource supply curves and are aligned with 2024 ATB assumptions. Table 6 of the model documentation summarizes these classifications https://reeds-model.github.io/ReEDS/model_documentation.html#technical-resource-potential ,"class,access_case,min_reV_mean_temp,max_reV_mean_temp",,,Use to define prescribed capacity class of rsc technology,degree celsius
/inputs/capacity_exogenous/interconnection_queues.csv,/inputs/capacity_exogenous,interconnection_queues,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_limited.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ofs_meshed_limited,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_open.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ofs_meshed_open,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_reference.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ofs_meshed_reference,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_limited.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ofs_radial_limited,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_open.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ofs_radial_open,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_reference.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ofs_radial_reference,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ons_limited.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ons_limited,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ons_open.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ons_open,.csv,,,,,,
/inputs/capacity_exogenous/prescribed_builds_wind-ons_reference.csv,/inputs/capacity_exogenous,prescribed_builds_wind-ons_reference,.csv,,,,,,
/inputs/capacity_exogenous/ReEDS_generator_database_final_EIA-NEMS.csv,/inputs/capacity_exogenous,ReEDS_generator_database_final_EIA-NEMS,.csv,EIA-NEMS database of existing generators,,,,Input,
/inputs/climate/climate_heuristics_finalyear.csv,/inputs/climate,climate_heuristics_finalyear,.csv,,,,,,
/inputs/climate/climate_heuristics_yearfrac.csv,/inputs/climate,climate_heuristics_yearfrac,.csv,,,,,,
Expand Down Expand Up @@ -534,10 +518,8 @@ RelativeFilePath,RelativeFolderPath,FileName_new,FileExtension,Description_new,I
/inputs/sets/orcat.csv,/inputs/sets,orcat,.csv,set of operating reserve categories,,,,GAMS set,
/inputs/sets/ortype.csv,/inputs/sets,ortype,.csv,set of types of operating reserve constraints,,,,GAMS set,
/inputs/sets/p.csv,/inputs/sets,p,.csv,set of products produced,,,,GAMS set,
/inputs/sets/pcat.csv,/inputs/sets,pcat,.csv,set of prescribed technology categories,,,,GAMS set,
/inputs/sets/plantcat.csv,/inputs/sets,plantcat,.csv,set of categories for plant characteristics,,,,GAMS set,
/inputs/sets/prepost.csv,/inputs/sets,prepost,.csv,,,,,GAMS set,
/inputs/sets/prescriptivelink0.csv,/inputs/sets,prescriptivelink0,.csv,initial set of prescribed categories and their technologies - used in assigning prescribed builds,,,,GAMS set,
/inputs/sets/pvb_agg.csv,/inputs/sets,pvb_agg,.csv,crosswalk between hybrid pv+battery configurations and technology options,,,,GAMS set,
/inputs/sets/pvb_config.csv,/inputs/sets,pvb_config,.csv,set of hybrid pv+battery configurations,,,,GAMS set,
/inputs/sets/quarter.csv,/inputs/sets,quarter,.csv,,,,,GAMS set,
Expand Down
61 changes: 0 additions & 61 deletions docs/sources_documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -750,62 +750,11 @@
- **Citation:** See 'notes' column in the file and https://www.energy.gov/oced/advanced-reactor-demonstration-projects-0
- **Units:** MW

---

- [exog_cap_geohydro_allkm_reference.csv](/inputs/capacity_exogenous/exog_cap_geohydro_allkm_reference.csv)
---

- [exog_cap_geohydro_reference.csv](/inputs/capacity_exogenous/exog_cap_geohydro_reference.csv)
---

- [exog_cap_upv_limited.csv](/inputs/capacity_exogenous/exog_cap_upv_limited.csv)
---

- [exog_cap_upv_open.csv](/inputs/capacity_exogenous/exog_cap_upv_open.csv)
---

- [exog_cap_upv_reference.csv](/inputs/capacity_exogenous/exog_cap_upv_reference.csv)
---

- [exog_cap_wind-ons_limited.csv](/inputs/capacity_exogenous/exog_cap_wind-ons_limited.csv)
---

- [exog_cap_wind-ons_open.csv](/inputs/capacity_exogenous/exog_cap_wind-ons_open.csv)
---

- [exog_cap_wind-ons_reference.csv](/inputs/capacity_exogenous/exog_cap_wind-ons_reference.csv)
---

- [interconnection_queues.csv](/inputs/capacity_exogenous/interconnection_queues.csv)
---

- [prescribed_builds_wind-ofs_meshed_limited.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_limited.csv)
---

- [prescribed_builds_wind-ofs_meshed_open.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_open.csv)
---

- [prescribed_builds_wind-ofs_meshed_reference.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_meshed_reference.csv)
---

- [prescribed_builds_wind-ofs_radial_limited.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_limited.csv)
---

- [prescribed_builds_wind-ofs_radial_open.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_open.csv)
---

- [prescribed_builds_wind-ofs_radial_reference.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ofs_radial_reference.csv)
---

- [prescribed_builds_wind-ons_limited.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ons_limited.csv)
---

- [prescribed_builds_wind-ons_open.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ons_open.csv)
---

- [prescribed_builds_wind-ons_reference.csv](/inputs/capacity_exogenous/prescribed_builds_wind-ons_reference.csv)
---

- [ReEDS_generator_database_final_EIA-NEMS.csv](/inputs/capacity_exogenous/ReEDS_generator_database_final_EIA-NEMS.csv)
- **File Type:** Input
- **Description:** EIA-NEMS database of existing generators
Expand Down Expand Up @@ -2708,11 +2657,6 @@
- **Description:** set of products produced
---

- [pcat.csv](/inputs/sets/pcat.csv)
- **File Type:** GAMS set
- **Description:** set of prescribed technology categories
---

- [plantcat.csv](/inputs/sets/plantcat.csv)
- **File Type:** GAMS set
- **Description:** set of categories for plant characteristics
Expand All @@ -2722,11 +2666,6 @@
- **File Type:** GAMS set
---

- [prescriptivelink0.csv](/inputs/sets/prescriptivelink0.csv)
- **File Type:** GAMS set
- **Description:** initial set of prescribed categories and their technologies - used in assigning prescribed builds
---

- [pvb_agg.csv](/inputs/sets/pvb_agg.csv)
- **File Type:** GAMS set
- **Description:** crosswalk between hybrid pv+battery configurations and technology options
Expand Down
8 changes: 2 additions & 6 deletions hourlize/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ By default hourlize will copy the required files in your ReEDS repository (`copy

Note that hourlize copies to only one of the shared locations (either the HPC or nrelnas01, depending on where you are running it), so even with `copy_to_shared=True` you'll want to sync up the two shared folders. When starting from the HPC, be sure to open up permissions to the supply curve outputs you've just created (e.g., `chmod -R 777 UPV/2023_06_06_Update`). Then, from your local computer, use WinSCP or rsync to copy the files from Kestrel to nrelnas01:


```bash
rsync -aPu [username]@kestrel.nlr.gov://projects/shared-projects-reeds/reeds/Supply_Curve_Data/UPV/2023_11_02_LandCover /Volumes/ReEDS/Supply_Curve_Data/UPV
```
Expand Down Expand Up @@ -168,8 +169,6 @@ The main inputs to hourlize are reV outputs for a given reV scenario:
By default, the outputs will be dumped to a subdirectory named `results` within `hourlize/out/[casename]`. In addition, with `copy_to_reeds` set to true (as is default), we'll copy the results to the ReEDS repo containing this hourlize directory, and with`copy_to_shared` set to true (not default), we'll copy to the shared drive (see Shared Drive Locations below).

* `supplycurve_{tech}.csv`: A supply curve with rows for each site and columns for region, class, available capacity, and costs. E.g. see `inputs/supply_curve/wind-ons_supply_curve-reference_ba.csv` (within ReEDS repo)
* `{tech}_exog_cap.csv`: Exogenous (built pre-2010) capacity with columns for region, site and year. This is not capacity builds in each year, but rather cumulative capacity of each existing site over time. E.g. see `inputs/capacity_exogenous/wind-ons_exog_cap_reference_ba.csv` (within ReEDS repo)
* `{tech}_prescribed_builds.csv`: Capacity prescribed builds (2010 - present) with columns for region, year, capacity. This is the installed capacity in each year rather than cumulative capacity over time. E.g. see `inputs/capacity_exogenous/wind-ons_prescribed_builds_reference_ba.csv` (within ReEDS repo)
* `{tech}_.h5`: Hourly capacity factor profiles for each region/class. See `inputs/profiles_cf/cf_wind-ons_reference_ba.h5` within the ReEDS repository as an example. These files include datasets with column names (class|region) and an index with datetime and timezone information.

### Shared Drive Locations
Expand All @@ -182,15 +181,14 @@ The `resource.py` script follows the following logic (in order of execution):

1. `get_supply_curve_and_preprocess()`
* The supply curve is filtered if necessary, based on `filter_cols`.
* Existing and planned sites from a generator database (`existing_sites`) are assigned to supply curve points for exogenous and prescribed capacity outputs respectively.
* If we have minimum capacity thresholds for the supply curve points, these are applied to further filter the supply curve.
1. `add_classes()`
* A 'class' column is added to the supply curve and filled with the associated class. Classes can be based on statically defined conditions for columns in the supply curve (`class_path`). Otherwise (or layered on top of static class definitions), dynamic classes can be assigned (`class_bin`=true) using a binning method (`class_bin_method`, e.g. "kmeans"), a number of bins (`class_bin_num`), and the supply curve column to bin (`class_bin_col`). The binning logic itself is in `reeds.inputs.get_bin()`. The current default classes for onshore wind and utility-scale PV are based on national k-means clustering of average annual capacity factor (where higher class number corresponds with higher annual CF). Offshore wind, by contrast, uses statically defined classes from `hourlize/inputs/resource/wind-ofs_resource_classes.csv`.
1. `add_cost()`
* A column of overall supply curve costs is added to the supply curve (`supply_curve_cost_per_mw`), as well as certain components of that cost (e.g. `trans_adder_per_mw` and `capital_adder_per_mw`). Logic for these costs depends on `tech`, and the value of `cost_out` in config (e.g. `combined_eos_trans` for onshore wind).
* A column of overall supply curve costs is added to the supply curve (`supply_curve_cost_per_mw`), as well as certain components of that cost (e.g. `trans_adder_per_mw` and `capital_adder_per_mw`). Logic for these costs depends on `tech`, and the value of `cost_out` in config (e.g. `combined_eos_trans` for onshore wind).
1. `save_sc_outputs()`
* Supply curve outputs are saved (`supplycurve_{tech}.csv`) as well as exogenous capacity (`{tech}_exog_cap.csv`), which is built pre-2010, and prescribed builds (`{tech}_prescribed_builds.csv`), which are built between 2010 and present day.
* Supply curve outputs are saved (`supplycurve_{tech}.csv`).
1. `process_cf_profiles()`
* The hourly generation profiles are gathered and applicable conversions (AC-to-DC, scaling) are applied. The processed profiles are saved to a `{tech}.h5` file. This method makes use of the same h5 format specified in the `get_site_cf_hourly` function used by `recf.py` in ReEDS.
1. `copy_outputs()`
Expand Down Expand Up @@ -230,14 +228,12 @@ This section provides some descriptions and typical values for the settings in t
| copy_to_shared | Copy hourlize outputs to the shared drive | False |
| driver | 'H5FD_CORE', None. H5FD_CORE will load the h5 into memory for better perforamnce, but None must be used for low-memory machines. | 'H5FD_CORE' |
| dtype | data type used to save hourly profiles | np.uint16 |
| existing_sites | None or path to file with existing capacity | '{reeds_path}/inputs/capacity_exogenous/ReEDS_generator_database_final_EIA-NEMS.csv' |
| gather_method | 'list', 'slice', 'smart'. This setting will take a slice of profile ids from the min to max, rather than using a list of ids, for improved performance when ids are close together for each group. | 'smart' |
| hourly_out_years | e.g. [2012] for just 2012 or a list of year [2011, 2012, 2013] | [2007, 2008, 2009, 2010, 2011, 2012, 2013], |
| inputfiles | list of files to copy over to hourlize input folder | ["reg_map_file", "class_path"] |
| profile_id_col | Unique identifier for reV supply curve and profiles | 'sc_point_gid' |
| resource_source_timezone | UTC would be 0, Eastern standard time would be -5 | 0 |
| scale_factor | Factor by which capacity factor values are scaled up when writing hourly profiles. | 1e4 |
| start_year | The start year of the model, for existing capacity purposes. | 2010 |
| state_abbrev | Path to file with state abbreviations | '{hourlize_path}/inputs/resource/state_abbrev.csv' |
| subsetvars | list of columns in the rev_paths file to use to select the appropriate rev_path | ['tech', 'access_case'] |
| subtract_exog | Indicate whether to remove exogenous (pre-start_year) capacity from the supply curve [default False] | False |
Expand Down
6 changes: 3 additions & 3 deletions hourlize/inputs/configs/config_egs.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"upv_type": null,
"geo_run_supply_curve_aggregation": true,
"geo_aggregation_method": "lowest_lcoe",
"process_profiles": false,
"existing_sites": null
}
"process_profiles": false
}

Loading
Loading