blue-marble · anamileva · Jul 18, 2023 · Jul 11, 2023 · Jul 11, 2023 · Jul 11, 2023
diff --git a/db/csvs_test_examples/csv_structure.csv b/db/csvs_test_examples/csv_structure.csv
@@ -3,6 +3,7 @@ solver,core,solver_options_id,options_solver,simple,,0,0,,,,
 temporal,core,temporal_scenario_id,temporal,dir_subsc_only,,0,0,,"ignore
 ",,
 temporal,core,temporal_scenario_id,temporal_periods,dir_aux,,0,0,period_params.csv,,,
+temporal,core,temporal_scenario_id,temporal_superperiods,dir_aux,,0,0,superperiods.csv,,,
 temporal,core,temporal_scenario_id,temporal_horizons,dir_aux,,0,0,horizon_params.csv,,,
 temporal,core,temporal_scenario_id,temporal,dir_aux,,0,0,structure.csv,ignore,,
 temporal,core,temporal_scenario_id,temporal_horizon_timepoints_start_end,dir_aux,temporal,0,0,horizon_timepoints.csv,,,

diff --git a/db/csvs_test_examples/policy/subsidies/1_base_subsidies/budgets.csv b/db/csvs_test_examples/policy/subsidies/1_base_subsidies/budgets.csv
@@ -1,3 +1,3 @@
-program,period,program_budget
-ITC,2020,1000
-ITC,2030,1000
+program,superperiod,program_budget
+ITC,1,1000
+ITC,2,1000
diff --git a/db/csvs_test_examples/policy/subsidies/2_tx_subsidies/budgets.csv b/db/csvs_test_examples/policy/subsidies/2_tx_subsidies/budgets.csv
@@ -1,3 +1,3 @@
-program,period,program_budget
-ITC,2020,100000
-ITC,2030,100000
+program,superperiod,program_budget
+ITC,1,100000
+ITC,2,100000
diff --git a/db/csvs_test_examples/policy/subsidies/3_superperiod_subsidies/budgets.csv b/db/csvs_test_examples/policy/subsidies/3_superperiod_subsidies/budgets.csv
@@ -0,0 +1,2 @@
+program,superperiod,program_budget
+ITC,1,2000
diff --git a/db/csvs_test_examples/policy/subsidies/3_superperiod_subsidies/subsidies.csv b/db/csvs_test_examples/policy/subsidies/3_superperiod_subsidies/subsidies.csv
@@ -0,0 +1,3 @@
+program,project_or_tx,vintage,is_tx,annual_payment_subsidy
+ITC,Solar,2020,0,20
+ITC,Battery,2030,0,20
diff --git a/db/csvs_test_examples/scenarios.csv b/db/csvs_test_examples/scenarios.csv
diff --git a/db/csvs_test_examples/temporal/10_1_w_timepoints_as_horizons/superperiods.csv b/db/csvs_test_examples/temporal/10_1_w_timepoints_as_horizons/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/11_1horizon_1period/description.txt b/db/csvs_test_examples/temporal/11_1horizon_1period/description.txt
@@ -0,0 +1 @@
+1horizon_1period
diff --git a/db/csvs_test_examples/temporal/11_1horizon_1period/horizon_params.csv b/db/csvs_test_examples/temporal/11_1horizon_1period/horizon_params.csv
@@ -0,0 +1,2 @@
+subproblem_id,balancing_type_horizon,horizon,boundary
+1,day,202001,circular
diff --git a/db/csvs_test_examples/temporal/11_1horizon_1period/horizon_timepoints.csv b/db/csvs_test_examples/temporal/11_1horizon_1period/horizon_timepoints.csv
@@ -0,0 +1,2 @@
+subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
+1,1,day,202001,20200101,20200102
diff --git a/db/csvs_test_examples/temporal/11_1horizon_1period/period_params.csv b/db/csvs_test_examples/temporal/11_1horizon_1period/period_params.csv
@@ -0,0 +1,2 @@
+period,discount_factor,period_start_year,period_end_year
+2020,1,2020,2021
diff --git a/db/csvs_test_examples/temporal/11_1horizon_1period/structure.csv b/db/csvs_test_examples/temporal/11_1horizon_1period/structure.csv
@@ -0,0 +1,3 @@
+subproblem_id,stage_id,timepoint,period,number_of_hours_in_timepoint,timepoint_weight,previous_stage_timepoint_map,spinup_or_lookahead,linked_timepoint,month,hour_of_day,timestamp,ignore_horizon_day
+1,1,20200101,2020,1,4380,,0,,1,1,1/1/20 0:00,202001
+1,1,20200102,2020,1,4380,,0,,1,2,1/1/20 1:00,202001
diff --git a/db/csvs_test_examples/temporal/11_1horizon_1period/superperiods.csv b/db/csvs_test_examples/temporal/11_1horizon_1period/superperiods.csv
@@ -0,0 +1,2 @@
+superperiod,period
+1,2020
diff --git a/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/description.txt b/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/description.txt
@@ -0,0 +1 @@
+1horizon_2periods
diff --git a/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/horizon_params.csv b/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/horizon_params.csv
@@ -0,0 +1,3 @@
+subproblem_id,balancing_type_horizon,horizon,boundary
+1,day,202001,circular
+1,day,203001,circular
diff --git a/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/horizon_timepoints.csv b/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/horizon_timepoints.csv
@@ -0,0 +1,3 @@
+subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
+1,1,day,202001,20200101,20200102
+1,1,day,203001,20300101,20300102
diff --git a/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/period_params.csv b/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/period_params.csv
@@ -0,0 +1,3 @@
+period,discount_factor,period_start_year,period_end_year
+2020,1,2020,2030
+2030,1,2030,2040
diff --git a/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/structure.csv b/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/structure.csv
@@ -0,0 +1,5 @@
+subproblem_id,stage_id,timepoint,period,number_of_hours_in_timepoint,timepoint_weight,previous_stage_timepoint_map,spinup_or_lookahead,linked_timepoint,month,hour_of_day,timestamp,ignore_horizon_day
+1,1,20200101,2020,1,4380,,0,,1,1,1/1/20 0:00,202001
+1,1,20200102,2020,1,4380,,0,,1,2,1/1/20 1:00,202001
+1,1,20300101,2030,1,4380,,0,,1,1,1/1/30 0:00,203001
+1,1,20300102,2030,1,4380,,0,,1,2,1/1/30 1:00,203001
diff --git a/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/superperiods.csv b/db/csvs_test_examples/temporal/12_1horizon_2periods_superperiods/superperiods.csv
@@ -0,0 +1,3 @@
+superperiod,period
+1,2020
+2,2030
diff --git a/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/description.txt b/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/description.txt
@@ -0,0 +1 @@
+1horizon_2periods
diff --git a/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/horizon_params.csv b/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/horizon_params.csv
@@ -0,0 +1,3 @@
+subproblem_id,balancing_type_horizon,horizon,boundary
+1,day,202001,circular
+1,day,203001,circular
diff --git a/...svs_test_examples/temporal/13_1horizon_2periods_single_superperiod/horizon_timepoints.csv b/...svs_test_examples/temporal/13_1horizon_2periods_single_superperiod/horizon_timepoints.csv
@@ -0,0 +1,3 @@
+subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
+1,1,day,202001,20200101,20200102
+1,1,day,203001,20300101,20300102
diff --git a/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/period_params.csv b/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/period_params.csv
@@ -0,0 +1,3 @@
+period,discount_factor,period_start_year,period_end_year
+2020,1,2020,2030
+2030,1,2030,2040
diff --git a/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/structure.csv b/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/structure.csv
@@ -0,0 +1,5 @@
+subproblem_id,stage_id,timepoint,period,number_of_hours_in_timepoint,timepoint_weight,previous_stage_timepoint_map,spinup_or_lookahead,linked_timepoint,month,hour_of_day,timestamp,ignore_horizon_day
+1,1,20200101,2020,1,4380,,0,,1,1,1/1/20 0:00,202001
+1,1,20200102,2020,1,4380,,0,,1,2,1/1/20 1:00,202001
+1,1,20300101,2030,1,4380,,0,,1,1,1/1/30 0:00,203001
+1,1,20300102,2030,1,4380,,0,,1,2,1/1/30 1:00,203001
diff --git a/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/superperiods.csv b/db/csvs_test_examples/temporal/13_1horizon_2periods_single_superperiod/superperiods.csv
@@ -0,0 +1,3 @@
+superperiod,period
+1,2020
+1,2030
diff --git a/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/description.txt b/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/description.txt
@@ -0,0 +1 @@
+1horizon_2periods_10yrs
diff --git a/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/horizon_params.csv b/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/horizon_params.csv
@@ -0,0 +1,9 @@
+subproblem_id,balancing_type_horizon,horizon,boundary
+1,day,202001,circular
+1,day,203001,circular
+1,year,2020,circular
+1,year,2030,circular
+1,halfyear,20201,circular
+1,halfyear,20202,circular
+1,halfyear,20301,circular
+1,halfyear,20302,circular
diff --git a/...s_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/horizon_timepoints.csv b/...s_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/horizon_timepoints.csv
@@ -0,0 +1,9 @@
+subproblem_id,stage_id,balancing_type_horizon,horizon,tmp_start,tmp_end
+1,1,day,202001,20200101,20200102
+1,1,day,203001,20300101,20300102
+1,1,year,2020,20200101,20200102
+1,1,year,2030,20300101,20300102
+1,1,halfyear,20201,20200101,20200101
+1,1,halfyear,20202,20200102,20200102
+1,1,halfyear,20301,20300101,20300101
+1,1,halfyear,20302,20300102,20300102
diff --git a/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/period_params.csv b/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/period_params.csv
@@ -0,0 +1,3 @@
+period,discount_factor,period_start_year,period_end_year
+2020,1,2020,2030
+2030,1,2030,2040
diff --git a/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/structure.csv b/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/structure.csv
@@ -0,0 +1,5 @@
+subproblem_id,stage_id,timepoint,period,number_of_hours_in_timepoint,timepoint_weight,previous_stage_timepoint_map,spinup_or_lookahead,linked_timepoint,month,hour_of_day,timestamp,ignore_horizon_day
+1,1,20200101,2020,1,4380,,0,,1,1,1/1/20 0:00,202001
+1,1,20200102,2020,1,4380,,0,,1,2,1/1/20 1:00,202001
+1,1,20300101,2030,1,4380,,0,,1,1,1/1/30 0:00,203001
+1,1,20300102,2030,1,4380,,0,,1,2,1/1/30 1:00,203001
diff --git a/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/superperiods.csv b/db/csvs_test_examples/temporal/14_1horizon_2periods_10yrs_w_superperiods/superperiods.csv
@@ -0,0 +1,3 @@
+superperiod,period
+1,2020
+2,2030
diff --git a/db/csvs_test_examples/temporal/1_1horizon_1period/superperiods.csv b/db/csvs_test_examples/temporal/1_1horizon_1period/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/2_2horizons_1period/superperiods.csv b/db/csvs_test_examples/temporal/2_2horizons_1period/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/3_1horizon_2periods/superperiods.csv b/db/csvs_test_examples/temporal/3_1horizon_2periods/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/4_1horizon_1period_3subproblems/superperiods.csv b/db/csvs_test_examples/temporal/4_1horizon_1period_3subproblems/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/5_1horizon_1period_3subproblems_3stages/superperiods.csv b/db/csvs_test_examples/temporal/5_1horizon_1period_3subproblems_3stages/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/6_1horizon_2periods_10yrs/superperiods.csv b/db/csvs_test_examples/temporal/6_1horizon_2periods_10yrs/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/7_1horizon_12timepoints/superperiods.csv b/db/csvs_test_examples/temporal/7_1horizon_12timepoints/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/csvs_test_examples/temporal/8_1horizon_1period_3subproblems_linked/superperiods.csv b/db/csvs_test_examples/temporal/8_1horizon_1period_3subproblems_linked/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/...vs_test_examples/temporal/9_1horizon_1period_3subproblems_3stages_linked/superperiods.csv b/...vs_test_examples/temporal/9_1horizon_1period_3subproblems_3stages_linked/superperiods.csv
@@ -0,0 +1 @@
+superperiod,period
diff --git a/db/db_schema.sql b/db/db_schema.sql
@@ -249,6 +249,17 @@ FOREIGN KEY (temporal_scenario_id) REFERENCES subscenarios_temporal
 (temporal_scenario_id)
 );
 
+-- Superperiods (combinations of periods)
+DROP TABLE IF EXISTS inputs_temporal_superperiods;
+CREATE TABLE inputs_temporal_superperiods (
+temporal_scenario_id INTEGER,
+superperiod INTEGER,
+period INTEGER,
+PRIMARY KEY (temporal_scenario_id, superperiod, period),
+FOREIGN KEY (temporal_scenario_id) REFERENCES subscenarios_temporal
+(temporal_scenario_id)
+);
+
 -- Timepoints
 -- Note on linked timepoints: the user can designate timepoints from the last
 -- horizon of the subproblem to be linked to the first horizon of the next
@@ -3116,9 +3127,9 @@ DROP TABLE IF EXISTS inputs_system_system_subsides;
 CREATE TABLE inputs_system_subsidies (
 subsidy_scenario_id INTEGER,
 program VARCHAR(32),
-period INTEGER,
+superperiod INTEGER,
 program_budget FLOAT,
-PRIMARY KEY (subsidy_scenario_id, program, period),
+PRIMARY KEY (subsidy_scenario_id, program, superperiod),
 FOREIGN KEY (subsidy_scenario_id) REFERENCES
 subscenarios_system_subsidies (subsidy_scenario_id)
 );

diff --git a/..._simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/subsidies_program_budgets.tab b/..._simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/subsidies_program_budgets.tab
@@ -1,3 +1,3 @@
-program	period	program_budget
-ITC	2020	100000.0
-ITC	2030	100000.0
+program	superperiod	program_budget
+ITC	1	100000.0
+ITC	2	100000.0
diff --git a/...ods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/superperiods.tab b/...ods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/superperiods.tab
@@ -0,0 +1,3 @@
+superperiod	period
+1	2020
+2	2030
diff --git a/...ds_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/scenario_description.csv b/...ds_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/scenario_description.csv
@@ -25,7 +25,7 @@ of_elcc_surface,
 of_local_capacity,
 of_markets,
 of_tuning,
-temporal_scenario_id,6
+temporal_scenario_id,14
 load_zone_scenario_id,2
 lf_reserves_up_ba_scenario_id,1
 lf_reserves_down_ba_scenario_id,1

diff --git a/examples/test_new_build_storage_itc/inputs/subsidies_program_budgets.tab b/examples/test_new_build_storage_itc/inputs/subsidies_program_budgets.tab
@@ -1,3 +1,3 @@
-program	period	program_budget
-ITC	2020	1000.0
-ITC	2030	1000.0
+program	superperiod	program_budget
+ITC	1	1000.0
+ITC	2	1000.0
diff --git a/examples/test_new_build_storage_itc/inputs/superperiods.tab b/examples/test_new_build_storage_itc/inputs/superperiods.tab
@@ -0,0 +1,3 @@
+superperiod	period
+1	2020
+2	2030
diff --git a/examples/test_new_build_storage_itc/scenario_description.csv b/examples/test_new_build_storage_itc/scenario_description.csv
@@ -25,7 +25,7 @@ of_elcc_surface,
 of_local_capacity,
 of_markets,
 of_tuning,
-temporal_scenario_id,3
+temporal_scenario_id,12
 load_zone_scenario_id,1
 lf_reserves_up_ba_scenario_id,1
 lf_reserves_down_ba_scenario_id,1

diff --git a/examples/test_new_build_storage_itc_single_superperiod/features.csv b/examples/test_new_build_storage_itc_single_superperiod/features.csv
@@ -0,0 +1,6 @@
+features
+lf_reserves_up
+lf_reserves_down
+regulation_up
+regulation_down
+subsidies
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/fuel_prices.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/fuel_prices.tab
@@ -0,0 +1,13 @@
+fuel	period	month	fuel_price_per_mmbtu
+Coal	2020	1	4.0
+Coal	2020	2	4.0
+Coal	2030	1	4.0
+Coal	2030	2	4.0
+Gas	2020	1	5.0
+Gas	2020	2	5.0
+Gas	2030	1	5.0
+Gas	2030	2	5.0
+Uranium	2020	1	2.0
+Uranium	2020	2	2.0
+Uranium	2030	1	2.0
+Uranium	2030	2	2.0
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/fuels.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/fuels.tab
@@ -0,0 +1,4 @@
+fuel	co2_intensity_tons_per_mmbtu	fuel_group
+Coal	0.09552	Solid
+Gas	0.05306	Gas
+Uranium	0.0	Other
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/heat_rate_curves.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/heat_rate_curves.tab
@@ -0,0 +1,8 @@
+project	period	load_point_fraction	average_heat_rate_mmbtu_per_mwh
+Coal	0	0.4	1250.0
+Coal	0	1.0	506.0
+Gas_CCGT	0	0.5	506.0
+Gas_CCGT	0	1.0	256.0
+Gas_CT	0	0.4	208.33333
+Gas_CT	0	1.0	88.13333
+Nuclear	0	1.0	1666.67
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/horizon_timepoints.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/horizon_timepoints.tab
@@ -0,0 +1,5 @@
+horizon	balancing_type_horizon	timepoint
+202001	day	20200101
+202001	day	20200102
+203001	day	20300101
+203001	day	20300102
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/horizons.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/horizons.tab
@@ -0,0 +1,3 @@
+horizon	balancing_type_horizon	boundary
+202001	day	circular
+203001	day	circular
diff --git a/...test_new_build_storage_itc_single_superperiod/inputs/lf_reserves_down_tmp_requirement.tab b/...test_new_build_storage_itc_single_superperiod/inputs/lf_reserves_down_tmp_requirement.tab
@@ -0,0 +1,5 @@
+ba	timepoint	requirement
+Zone1	20200101	1.0
+Zone1	20200102	2.0
+Zone1	20300101	1.0
+Zone1	20300102	2.0
diff --git a/...s/test_new_build_storage_itc_single_superperiod/inputs/lf_reserves_up_tmp_requirement.tab b/...s/test_new_build_storage_itc_single_superperiod/inputs/lf_reserves_up_tmp_requirement.tab
@@ -0,0 +1,5 @@
+ba	timepoint	requirement
+Zone1	20200101	1.0
+Zone1	20200102	2.0
+Zone1	20300101	1.0
+Zone1	20300102	2.0
diff --git a/...t_new_build_storage_itc_single_superperiod/inputs/load_following_down_balancing_areas.tab b/...t_new_build_storage_itc_single_superperiod/inputs/load_following_down_balancing_areas.tab
@@ -0,0 +1,2 @@
+balancing_area	allow_violation	violation_penalty_per_mw	reserve_to_energy_adjustment
+Zone1	1	999999999.0	.
diff --git a/...est_new_build_storage_itc_single_superperiod/inputs/load_following_up_balancing_areas.tab b/...est_new_build_storage_itc_single_superperiod/inputs/load_following_up_balancing_areas.tab
@@ -0,0 +1,2 @@
+balancing_area	allow_violation	violation_penalty_per_mw	reserve_to_energy_adjustment
+Zone1	1	999999999.0	.
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/load_mw.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/load_mw.tab
@@ -0,0 +1,5 @@
+LOAD_ZONES	timepoint	load_mw
+Zone1	20200101	10.0
+Zone1	20200102	20.0
+Zone1	20300101	10.0
+Zone1	20300102	20.0
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/load_zones.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/load_zones.tab
@@ -0,0 +1,2 @@
+load_zone	allow_overgeneration	overgeneration_penalty_per_mw	allow_unserved_energy	unserved_energy_penalty_per_mwh	unserved_energy_limit_mwh	max_unserved_load_penalty_per_mw	max_unserved_load_limit_mw	export_penalty_cost_per_mwh
+Zone1	1	99999999.0	1	99999999.0	.	0.0	.	0.0
diff --git a/.../test_new_build_storage_itc_single_superperiod/inputs/new_build_storage_vintage_costs.tab b/.../test_new_build_storage_itc_single_superperiod/inputs/new_build_storage_vintage_costs.tab
@@ -0,0 +1,3 @@
+project	vintage	operational_lifetime_yrs	fixed_cost_per_mw_yr	fixed_cost_per_mwh_yr	financial_lifetime_yrs	annualized_real_cost_per_mw_yr	annualized_real_cost_per_mwh_yr
+Battery	2020	10.0	0.0	0.0	10.0	1.0	1.0
+Battery	2030	10.0	0.0	0.0	10.0	1.0	1.0
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/periods.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/periods.tab
@@ -0,0 +1,3 @@
+period	discount_factor	period_start_year	period_end_year	hours_in_period_timepoints
+2020	1.0	2020.0	2030.0	8760.0
+2030	1.0	2030.0	2040.0	8760.0
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/project_fuels.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/project_fuels.tab
@@ -0,0 +1,5 @@
+project	fuel	min_fraction_in_fuel_blend	max_fraction_in_fuel_blend
+Coal	Coal	.	.
+Gas_CCGT	Gas	.	.
+Gas_CT	Gas	.	.
+Nuclear	Uranium	.	.
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/projects.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/projects.tab
@@ -0,0 +1,7 @@
+project	capacity_type	availability_type	operational_type	balancing_type_project	technology	load_zone	variable_om_cost_per_mwh	min_stable_level_fraction	unit_size_mw	startup_cost_per_mw	shutdown_cost_per_mw	startup_fuel_mmbtu_per_mw	startup_plus_ramp_up_rate	shutdown_plus_ramp_down_rate	ramp_up_when_on_rate	ramp_down_when_on_rate	ramp_up_violation_penalty	ramp_down_violation_penalty	min_up_time_hours	min_up_time_violation_penalty	min_down_time_hours	min_down_time_violation_penalty	allow_startup_shutdown_power	storage_efficiency	charging_efficiency	discharging_efficiency	charging_capacity_multiplier	discharging_capacity_multiplier	minimum_duration_hours	maximum_duration_hours	aux_consumption_frac_capacity	aux_consumption_frac_power	last_commitment_stage	curtailment_cost_per_pwh	powerunithour_per_fuelunit	soc_penalty_cost_per_energyunit	soc_last_tmp_penalty_cost_per_energyunit	partial_availability_threshold	lf_reserves_up_ba	lf_reserves_up_derate	lf_reserves_down_ba	lf_reserves_down_derate	regulation_up_ba	regulation_up_derate	regulation_down_ba	regulation_down_derate	lf_reserves_up_ramp_rate	lf_reserves_down_ramp_rate	regulation_up_ramp_rate	regulation_down_ramp_rate
+Battery	stor_new_lin	exogenous	stor	day	Storage	Zone1	0.0	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	0.8	0.8	.	.	1.0	99.0	.	.	.	.	.	.	.	.	Zone1	.	Zone1	.	Zone1	.	Zone1	.	.	.	.	.
+Coal	gen_spec	exogenous	gen_commit_cap	day	Coal	Zone1	1.0	0.4	6.0	1.0	0.0	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	2	.	.	.	.	.	.	.	.	.	Zone1	.	Zone1	.	.	.	.	.
+Gas_CCGT	gen_spec	exogenous	gen_commit_cap	day	Gas	Zone1	2.0	0.4	6.0	1.0	2.0	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	1	.	.	.	.	.	Zone1	.	Zone1	.	Zone1	.	Zone1	.	.	.	.	.
+Gas_CT	gen_spec	exogenous	gen_commit_cap	day	Gas	Zone1	2.0	0.4	6.0	0.0	1.0	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	3	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.
+Nuclear	gen_spec	exogenous	gen_must_run	day	Nuclear	Zone1	1.0	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.
+Wind	gen_spec	exogenous	gen_var	day	Wind	Zone1	0.0	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.	.
diff --git a/.../test_new_build_storage_itc_single_superperiod/inputs/regulation_down_balancing_areas.tab b/.../test_new_build_storage_itc_single_superperiod/inputs/regulation_down_balancing_areas.tab
@@ -0,0 +1,2 @@
+balancing_area	allow_violation	violation_penalty_per_mw	reserve_to_energy_adjustment
+Zone1	1	999999999.0	.
diff --git a/.../test_new_build_storage_itc_single_superperiod/inputs/regulation_down_tmp_requirement.tab b/.../test_new_build_storage_itc_single_superperiod/inputs/regulation_down_tmp_requirement.tab
@@ -0,0 +1,5 @@
+ba	timepoint	requirement
+Zone1	20200101	1.0
+Zone1	20200102	2.0
+Zone1	20300101	1.0
+Zone1	20300102	2.0
diff --git a/...es/test_new_build_storage_itc_single_superperiod/inputs/regulation_up_balancing_areas.tab b/...es/test_new_build_storage_itc_single_superperiod/inputs/regulation_up_balancing_areas.tab
@@ -0,0 +1,2 @@
+balancing_area	allow_violation	violation_penalty_per_mw	reserve_to_energy_adjustment
+Zone1	1	999999999.0	.
diff --git a/...es/test_new_build_storage_itc_single_superperiod/inputs/regulation_up_tmp_requirement.tab b/...es/test_new_build_storage_itc_single_superperiod/inputs/regulation_up_tmp_requirement.tab
@@ -0,0 +1,5 @@
+ba	timepoint	requirement
+Zone1	20200101	1.0
+Zone1	20200102	2.0
+Zone1	20300101	1.0
+Zone1	20300102	2.0
diff --git a/...ples/test_new_build_storage_itc_single_superperiod/inputs/spec_capacity_period_params.tab b/...ples/test_new_build_storage_itc_single_superperiod/inputs/spec_capacity_period_params.tab
@@ -0,0 +1,11 @@
+project	period	specified_capacity_mw	hyb_gen_specified_capacity_mw	hyb_stor_specified_capacity_mw	specified_capacity_mwh	fuel_production_capacity_fuelunitperhour	fuel_release_capacity_fuelunitperhour	fuel_storage_capacity_fuelunit	fixed_cost_per_mw_yr	hyb_gen_fixed_cost_per_mw_yr	hyb_stor_fixed_cost_per_mw_yr	fixed_cost_per_mwh_yr	fuel_production_capacity_fixed_cost_per_fuelunitperhour_yr	fuel_release_capacity_fixed_cost_per_fuelunitperhour_yr	fuel_storage_capacity_fixed_cost_per_fuelunit_yr
+Coal	2020	6.0							0.0						
+Coal	2030	6.0							0.0						
+Gas_CCGT	2020	6.0							0.0						
+Gas_CCGT	2030	6.0							0.0						
+Gas_CT	2020	6.0							0.0						
+Gas_CT	2030	6.0							0.0						
+Nuclear	2020	6.0							0.0						
+Nuclear	2030	6.0							0.0						
+Wind	2020	2.0							0.0						
+Wind	2030	2.0							0.0						
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/subsidies_program_budgets.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/subsidies_program_budgets.tab
@@ -0,0 +1,2 @@
+program	superperiod	program_budget
+ITC	1	2000.0
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/subsidies_projects.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/subsidies_projects.tab
@@ -0,0 +1,2 @@
+program	project_or_tx	period	is_tx	annual_payment_subsidy
+ITC	Battery	2030	0	20.0
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/superperiods.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/superperiods.tab
@@ -0,0 +1,3 @@
+superperiod	period
+1	2020
+1	2030
diff --git a/examples/test_new_build_storage_itc_single_superperiod/inputs/timepoints.tab b/examples/test_new_build_storage_itc_single_superperiod/inputs/timepoints.tab
@@ -0,0 +1,5 @@
+timepoint	period	timepoint_weight	number_of_hours_in_timepoint	previous_stage_timepoint_map	month
+20200101	2020	4380.0	1	.	1
+20200102	2020	4380.0	1	.	1
+20300101	2030	4380.0	1	.	1
+20300102	2030	4380.0	1	.	1