-
Notifications
You must be signed in to change notification settings - Fork 7
Create an inputs.h5 -> inputs.gdx pipeline to help move processing out of b_inputs.gms
#61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
e87cb07
0660c5f
edb0fc7
e6f039e
8840ec9
9506d1e
61befc0
df4941e
23435c1
4ade0f1
007690e
353b1f0
1613bd6
2e98528
ddd646f
1e83c9f
63f8551
107ef85
f864a4b
a00721d
2da17d6
2351485
6e4bc88
4554c37
85b3ec5
3b2c75c
8651baf
ab6fb0c
6756c86
6d01278
ddfba00
932e249
3bee175
18a6f62
0c3b8ca
4d691b3
6a25508
7fde0e6
1547606
06cd3ef
236d9aa
3b338b8
913d104
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| *i,RE,Nuclear,NuclearCCS,RE_NoCombust | ||
| can-imports,1,1,1,1 | ||
| coal-CCS_mod,0,0,1,0 | ||
| coal-CCS_max,0,0,1,0 | ||
| coal-CCS-F1,0,0,1,0 | ||
| coal-CCS-F2,0,0,1,0 | ||
| coal-CCS-F3,0,0,1,0 | ||
| Coal-IGCC,0,0,0,0 | ||
| coal-new,0,0,0,0 | ||
| CoalOldScr,0,0,0,0 | ||
| CoalOldUns,0,0,0,0 | ||
| CofireNew,0,0,0,0 | ||
| CofireOld,0,0,0,0 | ||
| Gas-CC,0,0,0,0 | ||
| Gas-CC_H_1x1,0,0,0,0 | ||
| Gas-CC_H_2x1,0,0,0,0 | ||
| Gas-CC-CCS_mod,0,0,1,0 | ||
| Gas-CC-CCS_max,0,0,1,0 | ||
| Gas-CC_H_1x1-CCS_mod,0,0,1,0 | ||
| Gas-CC_H_1x1-CCS_max,0,0,1,0 | ||
| Gas-CC_H_2x1-CCS_mod,0,0,1,0 | ||
| Gas-CC_H_2x1-CCS_max,0,0,1,0 | ||
| Gas-CC-CCS-F1,0,0,1,0 | ||
| Gas-CC-CCS-F2,0,0,1,0 | ||
| Gas-CC-CCS-F3,0,0,1,0 | ||
| Gas-CT,0,0,0,0 | ||
| Gas-CT_aero,0,0,0,0 | ||
| o-g-s,0,0,0,0 | ||
| Nuclear,0,1,1,0 | ||
| Nuclear-SMR,0,1,1,0 | ||
| H2-CT,1,1,1,0 | ||
| H2-CC,1,1,1,0 | ||
| ng-fuel-cell,0,0,0,0 | ||
| biopower,1,1,1,0 | ||
| beccs_mod,1,1,1,0 | ||
| beccs_max,1,1,1,0 | ||
| geothermal,1,1,1,1 | ||
| Hydro,1,1,1,1 | ||
| lfill-gas,1,1,1,0 | ||
| battery_li,0,0,0,0 | ||
| pumped-hydro,0,0,0,0 | ||
| pumped-hydro-flex,0,0,0,0 | ||
| distpv,1,1,1,1 | ||
| upv_1,1,1,1,1 | ||
| upv_2,1,1,1,1 | ||
| upv_3,1,1,1,1 | ||
| upv_4,1,1,1,1 | ||
| upv_5,1,1,1,1 | ||
| upv_6,1,1,1,1 | ||
| upv_7,1,1,1,1 | ||
| upv_8,1,1,1,1 | ||
| upv_9,1,1,1,1 | ||
| upv_10,1,1,1,1 | ||
| wind-ofs_1,1,1,1,1 | ||
| wind-ofs_2,1,1,1,1 | ||
| wind-ofs_3,1,1,1,1 | ||
| wind-ofs_4,1,1,1,1 | ||
| wind-ofs_5,1,1,1,1 | ||
| wind-ofs_6,1,1,1,1 | ||
| wind-ofs_7,1,1,1,1 | ||
| wind-ofs_8,1,1,1,1 | ||
| wind-ofs_9,1,1,1,1 | ||
| wind-ofs_10,1,1,1,1 | ||
| wind-ons_1,1,1,1,1 | ||
| wind-ons_2,1,1,1,1 | ||
| wind-ons_3,1,1,1,1 | ||
| wind-ons_4,1,1,1,1 | ||
| wind-ons_5,1,1,1,1 | ||
| wind-ons_6,1,1,1,1 | ||
| wind-ons_7,1,1,1,1 | ||
| wind-ons_8,1,1,1,1 | ||
| wind-ons_9,1,1,1,1 | ||
| wind-ons_10,1,1,1,1 | ||
| csp1_1,1,1,1,1 | ||
| csp1_2,1,1,1,1 | ||
| csp1_3,1,1,1,1 | ||
| csp1_4,1,1,1,1 | ||
| csp1_5,1,1,1,1 | ||
| csp1_6,1,1,1,1 | ||
| csp1_7,1,1,1,1 | ||
| csp1_8,1,1,1,1 | ||
| csp1_9,1,1,1,1 | ||
| csp1_10,1,1,1,1 | ||
| csp1_11,1,1,1,1 | ||
| csp1_12,1,1,1,1 | ||
| csp2_1,1,1,1,1 | ||
| csp2_2,1,1,1,1 | ||
| csp2_3,1,1,1,1 | ||
| csp2_4,1,1,1,1 | ||
| csp2_5,1,1,1,1 | ||
| csp2_6,1,1,1,1 | ||
| csp2_7,1,1,1,1 | ||
| csp2_8,1,1,1,1 | ||
| csp2_9,1,1,1,1 | ||
| csp2_10,1,1,1,1 | ||
| csp2_11,1,1,1,1 | ||
| csp2_12,1,1,1,1 | ||
| egs_allkm_1,1,1,1,1 | ||
| egs_allkm_2,1,1,1,1 | ||
| egs_allkm_3,1,1,1,1 | ||
| egs_allkm_4,1,1,1,1 | ||
| egs_allkm_5,1,1,1,1 | ||
| egs_allkm_6,1,1,1,1 | ||
| egs_allkm_7,1,1,1,1 | ||
| egs_allkm_8,1,1,1,1 | ||
| egs_allkm_9,1,1,1,1 | ||
| egs_allkm_10,1,1,1,1 | ||
| geohydro_allkm_1,1,1,1,1 | ||
| geohydro_allkm_2,1,1,1,1 | ||
| geohydro_allkm_3,1,1,1,1 | ||
| geohydro_allkm_4,1,1,1,1 | ||
| geohydro_allkm_5,1,1,1,1 | ||
| geohydro_allkm_6,1,1,1,1 | ||
| geohydro_allkm_7,1,1,1,1 | ||
| geohydro_allkm_8,1,1,1,1 | ||
| geohydro_allkm_9,1,1,1,1 | ||
| geohydro_allkm_10,1,1,1,1 | ||
| egs_nearfield_1,1,1,1,1 | ||
| egs_nearfield_2,1,1,1,1 | ||
| egs_nearfield_3,1,1,1,1 | ||
| egs_nearfield_4,1,1,1,1 | ||
| egs_nearfield_5,1,1,1,1 | ||
| egs_nearfield_6,1,1,1,1 | ||
| egs_nearfield_7,1,1,1,1 | ||
| egs_nearfield_8,1,1,1,1 | ||
| egs_nearfield_9,1,1,1,1 | ||
| egs_nearfield_10,1,1,1,1 | ||
| dr_shed_1,1,1,1,1 | ||
| dr_shed_2,1,1,1,1 | ||
| hydD,1,1,1,1 | ||
| hydND,1,1,1,1 | ||
| hydSD,1,1,1,1 | ||
| hydSND,1,1,1,1 | ||
| hydUD,1,1,1,1 | ||
| hydUND,1,1,1,1 | ||
| hydNPD,1,1,1,1 | ||
| hydNPND,1,1,1,1 | ||
| hydED,1,1,1,1 | ||
| hydEND,1,1,1,1 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,48 @@ | ||
| # Sets | ||
| ## Notes | ||
| * These files can have comment lines but remember to use '*' (for GAMS) instead of '#' | ||
| * Don't use * for element expansion | ||
|
|
||
| ## Formatting guidelines | ||
|
|
||
| - Primary sets (those that define elements that are not subsets of other sets): | ||
| - No header column | ||
| - One element per line | ||
| - No element-wise comments; each line should contain only the element | ||
| - Subsets (groups of elements from other sets, either 1-dimensional or multidimensional): | ||
| - Include a header column specifying the relevant primary sets | ||
| - The header column should start with a `*` | ||
| - Even 1-dimensional subsets should have a header column. | ||
| So if the set `food` has elements `[apple, banana, cauliflower]`, the subset `fruit(food)` (specified by `fruit.csv`) has the following lines: | ||
| - `*food` | ||
| - `apple` | ||
| - `banana` | ||
| - Don't use * or # for element expansion in GAMS | ||
| - Don't use * for full-line comments; only use it for the first (header) row in subset definitions | ||
|
|
||
| ## Set-defining files | ||
|
|
||
| - `ctt.csv`: cooling technology types | ||
| - `o`: once through | ||
| - `r`: recirculating | ||
| - `d`: dry cooled | ||
| - `p`: pond cooled | ||
| - `n`: no cooling (or generic placeholder) | ||
| - `sc_cat.csv`: resource supply curve data categories | ||
| - `cap`: power capacity available [MW] | ||
| - `cost`: total supply curve cost [\$/MW] | ||
| - `cost_trans`: transmission (spur, point-of-interconnection, and reinforcement) component of supply curve cost [\$/MW] | ||
| - `cost_cap`: economies of scale, land cost, and other modifier components of supply curve cost [\$/MW] | ||
| - `wst.csv`: water source type | ||
| - `fsu`: fresh surface water that is unappropriated | ||
| - `fsa`: fresh surface water that is appropriated | ||
| - `fsl`: fresh surface lake | ||
| - `fg`: fresh groundwater | ||
| - `sg`: brackish or saline groundwater | ||
| - `ss`: saline surface water | ||
| - `ww`: wastewater effluent | ||
|
|
||
| ## Special-case files | ||
|
|
||
| - `_aliases.csv`: aliases (extra names for the same set) used in GAMS | ||
| - Aliases of primary sets should be added here | ||
| - Aliases of sets defined in `b_inputs.gms` (e.g., `h`→`hh`) should instead be defined in GAMS after the set definition | ||
| - `_pcat.csv`: prescribed capacity categories | ||
| - The `pcat` set in GAMS (defined in `writecapdat.py`) includes the members of the `i` set; this file includes only the *extra* elements on top of the `i` set | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why the underscore for aliases and pcat? None of the others use that convention.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just to set them apart because they are not read directly into GAMS (explained in |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| *parent,alias | ||
| allh,allhh | ||
| allh,allhhh | ||
| allszn,allsznn | ||
| allt,alltt | ||
| cendiv,cendiv2 | ||
| dummy,adummy | ||
| fuelbin,afuelbin | ||
| gb,gbb | ||
| i,ii | ||
| i,iii | ||
| itlgrp,itlgrpp | ||
| nercr,nercrr | ||
| pcat,ppcat | ||
| r,n | ||
| r,nn | ||
| r,rr | ||
| rscbin,arscbin | ||
| st,ast | ||
| t,tt | ||
| t,ttt | ||
| tg,tgg | ||
| transgrp,transgrpp | ||
| trtype,intype | ||
| trtype,outtype | ||
| v,vv |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| upv | ||
| pvb | ||
| wind-ons | ||
| wind-ofs | ||
| csp-ws | ||
| geohydro_allkm | ||
| egs_allkm | ||
| egs_nearfield |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| o "once through", | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it feasible to keep comments in the set files? I see you moved these to the ReadMe--it just seems more useful here than there, but keeping it in the file might be a hassle.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure if |
||
| r "recirculating", | ||
| d "dry cooled", | ||
| p "pond cooled", | ||
| n "no cooling (or generic placeholder)" | ||
| o | ||
| r | ||
| d | ||
| p | ||
| n | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| *h2_stor | ||
| *h2_st | ||
| h2_storage_saltcavern | ||
| h2_storage_hardrock | ||
| h2_storage_undergroundpipe |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| *i | ||
| Gas-CC-CCS_mod | ||
| Gas-CC-CCS_max | ||
| Gas-CC_H_1x1-CCS_mod | ||
|
|
||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,4 @@ | ||
| * capacity available | ||
| cap | ||
| * total supply curve cost | ||
| cost | ||
| * transmission component of supply curve cost | ||
| cost_trans | ||
| * generation capacity (e.g. economies of scale) component of supply curve cost | ||
| cost_cap | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see here that these are special case file. Is that why the underscore is used, as a flag that this won't exactly match the GAMS set?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah that's right; I thought it would be confusing if all the csv files in
inputs/setsmatch the sets used in the model except for these files.