Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2e3d144
use float32 for all parameters in inputs.h5; move more input paramete…
patrickbrown4 Jun 17, 2026
2060be5
add inputs.h5 support to copy_files.write_region_indexed_file(); move…
patrickbrown4 Jun 26, 2026
0e612ee
io.write_to_h5(): turn overwrite on by default
patrickbrown4 Jun 26, 2026
c1c66a2
plots.rainbowmapper(): move cmap for large number of traces to kwarg
patrickbrown4 Jun 26, 2026
7413571
Merge branch 'main' into pb/inputs
patrickbrown4 Jun 26, 2026
c69b109
reshape some waterclimate inputs to long
patrickbrown4 Jul 2, 2026
7c8c3bf
move transmission.py outputs to inputs.h5; disaggregate co2_site_char…
patrickbrown4 Jul 2, 2026
471ae98
fix co2_site_char index
patrickbrown4 Jul 3, 2026
61ada42
move outputs of calc_financial_inputs.py to inputs.h5
patrickbrown4 Jul 7, 2026
8eed5a3
Merge branch 'main' into pb/inputs
patrickbrown4 Jul 7, 2026
ba47c99
adapt forecast.py for inputs.h5
patrickbrown4 Jul 7, 2026
2b9dbb0
fix a few futurefiles.csv entries
patrickbrown4 Jul 7, 2026
5610ac1
Merge branch 'main' into pb/inputs
patrickbrown4 Jul 8, 2026
ef4bf05
reedsplots.plot_map_diff(): add level kwarg and use it in compare_cas…
patrickbrown4 Jul 9, 2026
58db8ad
cases_test.csv: change yearset back to 5-year steps for USA_fast
patrickbrown4 Jul 9, 2026
7849a14
calc_financial_inputs.py: t -> allt; reedsplots.py: fix plot_max_impo…
patrickbrown4 Jul 9, 2026
05156e1
calc_financial_inputs.py: fix a few more t/allt
patrickbrown4 Jul 9, 2026
066d8fe
h5_to_gdx.py: add v to special_keys
patrickbrown4 Jul 9, 2026
85fdbc2
finish moving outputs of calc_financial_inputs.py to inputs.h5
patrickbrown4 Jul 9, 2026
6b937e7
adjust parameter names in futurefiles.csv
patrickbrown4 Jul 9, 2026
b644a6d
more futurefiles.csv
patrickbrown4 Jul 9, 2026
4884398
write trancap_init_energy for r2x
patrickbrown4 Jul 10, 2026
916654d
inputs.h5: include units in attrs
patrickbrown4 Jul 10, 2026
70a2c68
trans_cost_cap_fin_mult_noITC: Fix typo
patrickbrown4 Jul 23, 2026
0d98abe
writecapdat.py: 2010->startyear
patrickbrown4 Jul 23, 2026
2d91c94
runfiles.csv: change 'comment' to 'GAMScomment'
patrickbrown4 Jul 23, 2026
fb0b095
Merge branch 'main' into pb/inputs
patrickbrown4 Jul 23, 2026
f3a3530
forecast.py: write params read from inputs.h5 back to inputs.h5
patrickbrown4 Jul 23, 2026
9065e68
futurefiles.csv: fill in forecasts for cost_hurdle_rate* and national…
patrickbrown4 Jul 23, 2026
6df28f7
Merge branch 'main' into pb/inputs
patrickbrown4 Jul 24, 2026
f1ba970
mcs_sampler.py: remove removed overwrite in get_regions_and_agglevel()
patrickbrown4 Jul 24, 2026
9249534
fix MARICTNYNJPAOH_Offshore: change trancap_fut t index to allt
patrickbrown4 Jul 24, 2026
78d3012
Merge branch 'main' into pb/inputs
patrickbrown4 Jul 27, 2026
1a4a711
transmission.py: fix trancap_fut (move t->allt to end)
patrickbrown4 Jul 27, 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
2 changes: 2 additions & 0 deletions inputs/ctus/dollaryear.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
filename,US_dollar_year
co2_site_char.csv,2018
3 changes: 2 additions & 1 deletion inputs/financials/retire_penalty.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
allt,fraction
2010,1
2011,1
2012,1
Expand Down Expand Up @@ -38,4 +39,4 @@
2047,0.5
2048,0.5
2049,0.5
2050,0.5
2050,0.5
1 change: 1 addition & 0 deletions inputs/load/mex_growth_rate.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
allt,fraction
2010,0.860050287
2011,0.91512148
2012,0.93208905
Expand Down
1 change: 1 addition & 0 deletions inputs/plant_characteristics/maxdailycf.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
i,fraction
dr_shed_1,0.167
dr_shed_2,0.167
1 change: 1 addition & 0 deletions inputs/plant_characteristics/minCF.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
i,fraction
beccs_mod,0.06
beccs_max,0.06
biopower,0.06
Expand Down
3 changes: 2 additions & 1 deletion inputs/plant_characteristics/min_retire_age.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
i,years
biopower,20
coal-IGCC,20
coal-new,20
Expand All @@ -10,4 +11,4 @@ Gas-CT,20
Gas-CT_aero,20
Nuclear,20
Nuclear-SMR,20
o-g-s,20
o-g-s,20
188 changes: 168 additions & 20 deletions inputs/plant_characteristics/years_until_endogenous.csv
Original file line number Diff line number Diff line change
@@ -1,26 +1,100 @@
tech,years_from_now
i,years_from_now
battery_li,0
biopower,2
beccs_mod,4
beccs_max,4
can-imports,500
coal-CCS_mod,4
coal-CCS_max,4
coal-CCS-F1*coal-CCS-F3,4
coal-CCS-F1,4
coal-CCS-F2,4
coal-CCS-F3,4
Coal-IGCC,2
coal-new,2
CoalOldScr,500
CoalOldUns,500
CofireNew,2
CofireOld,500
csp1_1*csp1_12,3
csp2_1*csp2_12,3
csp3_1*csp3_12,3
csp4_1*csp4_12,3
dr_shed_1*dr_shed_2,0
evmc_storage_1*evmc_storage_10,0
evmc_shape_1*evmc_shape_10,0
egs_allkm_1*egs_allkm_10,8
csp1_1,3
csp1_2,3
csp1_3,3
csp1_4,3
csp1_5,3
csp1_6,3
csp1_7,3
csp1_8,3
csp1_9,3
csp1_10,3
csp1_11,3
csp1_12,3
csp2_1,3
csp2_2,3
csp2_3,3
csp2_4,3
csp2_5,3
csp2_6,3
csp2_7,3
csp2_8,3
csp2_9,3
csp2_10,3
csp2_11,3
csp2_12,3
csp3_1,3
csp3_2,3
csp3_3,3
csp3_4,3
csp3_5,3
csp3_6,3
csp3_7,3
csp3_8,3
csp3_9,3
csp3_10,3
csp3_11,3
csp3_12,3
csp4_1,3
csp4_2,3
csp4_3,3
csp4_4,3
csp4_5,3
csp4_6,3
csp4_7,3
csp4_8,3
csp4_9,3
csp4_10,3
csp4_11,3
csp4_12,3
dr_shed_1,0
dr_shed_2,0
evmc_storage_1,0
evmc_storage_2,0
evmc_storage_3,0
evmc_storage_4,0
evmc_storage_5,0
evmc_storage_6,0
evmc_storage_7,0
evmc_storage_8,0
evmc_storage_9,0
evmc_storage_10,0
evmc_shape_1,0
evmc_shape_2,0
evmc_shape_3,0
evmc_shape_4,0
evmc_shape_5,0
evmc_shape_6,0
evmc_shape_7,0
evmc_shape_8,0
evmc_shape_9,0
evmc_shape_10,0
egs_allkm_1,8
egs_allkm_2,8
egs_allkm_3,8
egs_allkm_4,8
egs_allkm_5,8
egs_allkm_6,8
egs_allkm_7,8
egs_allkm_8,8
egs_allkm_9,8
egs_allkm_10,8
distpv,0
Gas-CC,0
Gas-CC_H_1x1,0
Expand All @@ -31,17 +105,55 @@ Gas-CC_H_1x1-CCS_mod,4
Gas-CC_H_1x1-CCS_max,4
Gas-CC_H_2x1-CCS_mod,4
Gas-CC_H_2x1-CCS_max,4
Gas-CC-CCS-F1*Gas-CC-CCS-F3,4
Gas-CC-CCS-F1,4
Gas-CC-CCS-F2,4
Gas-CC-CCS-F3,4
Gas-CT,0
Gas-CT_aero,0
H2-CT,3
H2-CC,3
ng-fuel-cell,10
geohydro_allkm_1*geohydro_allkm_10,2
geohydro_allkm_1,2
geohydro_allkm_2,2
geohydro_allkm_3,2
geohydro_allkm_4,2
geohydro_allkm_5,2
geohydro_allkm_6,2
geohydro_allkm_7,2
geohydro_allkm_8,2
geohydro_allkm_9,2
geohydro_allkm_10,2
geothermal,2
pvb1_1*pvb1_10,0
pvb2_1*pvb2_10,0
pvb3_1*pvb3_10,0
pvb1_1,0
pvb1_2,0
pvb1_3,0
pvb1_4,0
pvb1_5,0
pvb1_6,0
pvb1_7,0
pvb1_8,0
pvb1_9,0
pvb1_10,0
pvb2_1,0
pvb2_2,0
pvb2_3,0
pvb2_4,0
pvb2_5,0
pvb2_6,0
pvb2_7,0
pvb2_8,0
pvb2_9,0
pvb2_10,0
pvb3_1,0
pvb3_2,0
pvb3_3,0
pvb3_4,0
pvb3_5,0
pvb3_6,0
pvb3_7,0
pvb3_8,0
pvb3_9,0
pvb3_10,0
hydD,2
hydED,2
hydEND,2
Expand All @@ -54,17 +166,53 @@ hydSND,2
hydUD,2
hydUND,2
lfill-gas,500
egs_nearfield_1*egs_nearfield_10,2
egs_nearfield_1,2
egs_nearfield_2,2
egs_nearfield_3,2
egs_nearfield_4,2
egs_nearfield_5,2
egs_nearfield_6,2
egs_nearfield_7,2
egs_nearfield_8,2
egs_nearfield_9,2
egs_nearfield_10,2
Nuclear,8
Nuclear-SMR,8
o-g-s,500
pumped-hydro,3
pumped-hydro-flex,3
upv_1*upv_10,0
wind-ofs_1*wind-ofs_10,4
wind-ons_1*wind-ons_10,0
upv_1,0
upv_2,0
upv_3,0
upv_4,0
upv_5,0
upv_6,0
upv_7,0
upv_8,0
upv_9,0
upv_10,0
wind-ofs_1,4
wind-ofs_2,4
wind-ofs_3,4
wind-ofs_4,4
wind-ofs_5,4
wind-ofs_6,4
wind-ofs_7,4
wind-ofs_8,4
wind-ofs_9,4
wind-ofs_10,4
wind-ons_1,0
wind-ons_2,0
wind-ons_3,0
wind-ons_4,0
wind-ons_5,0
wind-ons_6,0
wind-ons_7,0
wind-ons_8,0
wind-ons_9,0
wind-ons_10,0
electrolyzer,0
smr,0
smr_ccs,0
dac,3
dac_gas,3
dac_gas,3
2 changes: 1 addition & 1 deletion inputs/state_policies/acp_disallowed.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*st,RPSCat,val
st,RPSCat,val
NY,CES,1
2 changes: 1 addition & 1 deletion inputs/state_policies/forced_retirements.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*i,st,t
i,st,t
CoalOldScr,IL,2045
CoalOldScr,NY,2040
CoalOldScr,VA,2024
Expand Down
2 changes: 1 addition & 1 deletion inputs/state_policies/nuclear_subsidies.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*st,year
st,year
CT,2030
IL,2028
NJ,2026
Expand Down
1 change: 1 addition & 0 deletions inputs/storage/storage_duration.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
i,hours
pumped-hydro,12
pumped-hydro-flex,12
csp1_1,14
Expand Down
2 changes: 1 addition & 1 deletion inputs/techs/tech_resourceclass.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*i,resourceclass
i,resourceclass
csp1_1,1
csp1_2,2
csp1_3,3
Expand Down
Loading
Loading