diff --git a/data_toolkit/system/eia930_load_zone_input_csvs.py b/data_toolkit/system/eia930_load_zone_input_csvs.py index b385d5af74..0c849be9fb 100644 --- a/data_toolkit/system/eia930_load_zone_input_csvs.py +++ b/data_toolkit/system/eia930_load_zone_input_csvs.py @@ -51,6 +51,7 @@ * allow_unserved_energy * unserved_energy_penalty_per_mwh * max_unserved_load_penalty_per_mw + * avg_unserved_load_penalty_per_mwa * export_penalty_cost_per_mwh * unserved_energy_stats_threshold_mw @@ -96,6 +97,7 @@ def parse_arguments(args): parser.add_argument("--unserved_energy_limit_mwh", default=None) parser.add_argument("--max_unserved_load_penalty_per_mw", default=0) parser.add_argument("--max_unserved_load_limit_mw", default=None) + parser.add_argument("--avg_unserved_load_penalty_per_mwa", default=0) parser.add_argument("--export_penalty_cost_per_mwh", default=0) parser.add_argument("--unserved_energy_stats_threshold_mw", default=None) parser.add_argument( @@ -162,6 +164,7 @@ def make_load_balance_csv( unserved_energy_limit_mwh, max_unserved_load_penalty_per_mw, max_unserved_load_limit_mw, + avg_unserved_load_penalty_per_mwa, export_penalty_cost_per_mwh, unserved_energy_stats_threshold_mw, output_directory, @@ -184,6 +187,9 @@ def make_load_balance_csv( max_unserved_load_penalty_per_mw for lz in all_lzs ], "max_unserved_load_limit_mw": [max_unserved_load_limit_mw for lz in all_lzs], + "avg_unserved_load_penalty_per_mwa": [ + avg_unserved_load_penalty_per_mwa for lz in all_lzs + ], "export_penalty_cost_per_mwh": [export_penalty_cost_per_mwh for lz in all_lzs], "unserved_energy_stats_threshold_mw": [ unserved_energy_stats_threshold_mw for lz in all_lzs @@ -233,6 +239,7 @@ def main(args=None): unserved_energy_limit_mwh=parsed_args.unserved_energy_limit_mwh, max_unserved_load_penalty_per_mw=parsed_args.max_unserved_load_penalty_per_mw, max_unserved_load_limit_mw=parsed_args.max_unserved_load_limit_mw, + avg_unserved_load_penalty_per_mwa=parsed_args.avg_unserved_load_penalty_per_mwa, export_penalty_cost_per_mwh=parsed_args.export_penalty_cost_per_mwh, unserved_energy_stats_threshold_mw=parsed_args.unserved_energy_stats_threshold_mw, output_directory=parsed_args.lb_output_directory, diff --git a/db/csvs_test_examples/system_load/load_balance/1_1zone.csv b/db/csvs_test_examples/system_load/load_balance/1_1zone.csv index e515157cae..194a99f809 100644 --- a/db/csvs_test_examples/system_load/load_balance/1_1zone.csv +++ b/db/csvs_test_examples/system_load/load_balance/1_1zone.csv @@ -1,4 +1,4 @@ -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,unserved_energy_stats_threshold_mw -Zone1,1,99999999,1,99999999,,0,,0, -Zone2,1,99999999,1,99999999,,0,,0, -Zone3,1,99999999,1,99999999,,0,,0, +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,avg_unserved_load_penalty_per_mwa,export_penalty_cost_per_mwh,unserved_energy_stats_threshold_mw +Zone1,1,99999999,1,99999999,,0,,,0, +Zone2,1,99999999,1,99999999,,0,,,0, +Zone3,1,99999999,1,99999999,,0,,,0, diff --git a/db/csvs_test_examples/system_load/load_balance/2_noovergen-1.csv b/db/csvs_test_examples/system_load/load_balance/2_noovergen-1.csv index 7ce2468a7f..9a6170437a 100644 --- a/db/csvs_test_examples/system_load/load_balance/2_noovergen-1.csv +++ b/db/csvs_test_examples/system_load/load_balance/2_noovergen-1.csv @@ -1,2 +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,unserved_energy_stats_threshold_mw -Zone1,0,99999999,1,99999999,,0,,0, \ No newline at end of file +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,avg_unserved_load_penalty_per_mwa,export_penalty_cost_per_mwh,unserved_energy_stats_threshold_mw +Zone1,0,99999999,1,99999999,,0,,,0, diff --git a/db/csvs_test_examples/system_load/load_balance/3_export_penalty-1.csv b/db/csvs_test_examples/system_load/load_balance/3_export_penalty-1.csv index 08840a1e6d..f97626f964 100644 --- a/db/csvs_test_examples/system_load/load_balance/3_export_penalty-1.csv +++ b/db/csvs_test_examples/system_load/load_balance/3_export_penalty-1.csv @@ -1,3 +1,3 @@ -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,unserved_energy_stats_threshold_mw -Zone1,1,99999999,1,99999999,,0,,200, -Zone2,1,99999999,1,99999999,,0,,200, \ No newline at end of file +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,avg_unserved_load_penalty_per_mwa,export_penalty_cost_per_mwh,unserved_energy_stats_threshold_mw +Zone1,1,99999999,1,99999999,,0,,,200, +Zone2,1,99999999,1,99999999,,0,,,200, diff --git a/db/csvs_test_examples/system_load/load_balance/4_ra_toolkit-1.csv b/db/csvs_test_examples/system_load/load_balance/4_ra_toolkit-1.csv index 405c149fdb..218ce0e93b 100644 --- a/db/csvs_test_examples/system_load/load_balance/4_ra_toolkit-1.csv +++ b/db/csvs_test_examples/system_load/load_balance/4_ra_toolkit-1.csv @@ -1,2 +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,unserved_energy_stats_threshold_mw -Zone1,1,0,1,1,,1,,0.001, \ No newline at end of file +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,avg_unserved_load_penalty_per_mwa,export_penalty_cost_per_mwh,unserved_energy_stats_threshold_mw +Zone1,1,0,1,1,,1,,,0.001, diff --git a/db/csvs_test_examples/system_load/load_balance/5_open_data.csv b/db/csvs_test_examples/system_load/load_balance/5_open_data.csv index 60c8adc64a..20baf3dd99 100644 --- a/db/csvs_test_examples/system_load/load_balance/5_open_data.csv +++ b/db/csvs_test_examples/system_load/load_balance/5_open_data.csv @@ -1,3 +1,3 @@ -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,unserved_energy_stats_threshold_mw -Zone1,0,0,1,40000,,0,,0,0 -Zone2,0,0,1,40000,,0,,0,0 +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,avg_unserved_load_penalty_per_mwa,export_penalty_cost_per_mwh,unserved_energy_stats_threshold_mw +Zone1,0,0,1,40000,,0,,0,0,0 +Zone2,0,0,1,40000,,0,,0,0,0 diff --git a/db/db_schema.sql b/db/db_schema.sql index 047c8c4b33..87d1f31910 100644 --- a/db/db_schema.sql +++ b/db/db_schema.sql @@ -479,17 +479,18 @@ CREATE TABLE subscenarios_geography_load_balance DROP TABLE IF EXISTS inputs_geography_load_balance; CREATE TABLE inputs_geography_load_balance ( - load_balance_scenario_id INTEGER, - load_zone VARCHAR(32), - allow_overgeneration INTEGER, - overgeneration_penalty_per_mw FLOAT, - allow_unserved_energy INTEGER, - unserved_energy_penalty_per_mwh FLOAT, - unserved_energy_limit_mwh FLOAT, -- limit on the total USE - max_unserved_load_penalty_per_mw FLOAT, - max_unserved_load_limit_mw FLOAT, -- limit on the max unserved load - export_penalty_cost_per_mwh FLOAT, - unserved_energy_stats_threshold_mw FLOAT, -- defaults to 0 + load_balance_scenario_id INTEGER, + load_zone VARCHAR(32), + allow_overgeneration INTEGER, + overgeneration_penalty_per_mw FLOAT, + allow_unserved_energy INTEGER, + unserved_energy_penalty_per_mwh FLOAT, + unserved_energy_limit_mwh FLOAT, -- limit on the total USE + max_unserved_load_penalty_per_mw FLOAT, + max_unserved_load_limit_mw FLOAT, -- limit on the max unserved load + avg_unserved_load_penalty_per_mwa FLOAT, + export_penalty_cost_per_mwh FLOAT, + unserved_energy_stats_threshold_mw FLOAT, -- defaults to 0 PRIMARY KEY (load_balance_scenario_id, load_zone), FOREIGN KEY (load_balance_scenario_id) REFERENCES subscenarios_geography_load_balance (load_balance_scenario_id) @@ -3263,20 +3264,20 @@ CREATE TABLE inputs_project_availability_exogenous_weather_bt_hrz DROP TABLE IF EXISTS subscenarios_project_availability_exogenous_monthly; CREATE TABLE subscenarios_project_availability_exogenous_monthly ( - project VARCHAR(64), + project VARCHAR(64), exogenous_availability_monthly_scenario_id INTEGER, - name VARCHAR(32), - description VARCHAR(128), + name VARCHAR(32), + description VARCHAR(128), PRIMARY KEY (project, exogenous_availability_monthly_scenario_id) ); DROP TABLE IF EXISTS inputs_project_availability_exogenous_monthly; CREATE TABLE inputs_project_availability_exogenous_monthly ( - project VARCHAR(64), + project VARCHAR(64), exogenous_availability_monthly_scenario_id INTEGER, - month INTEGER, - availability_derate_monthly FLOAT, + month INTEGER, + availability_derate_monthly FLOAT, PRIMARY KEY (project, exogenous_availability_monthly_scenario_id, month), FOREIGN KEY (project, exogenous_availability_monthly_scenario_id) @@ -8944,7 +8945,8 @@ FROM results_project_costs_capacity_agg AS a AND a.stage_id = b.stage_id AND a.period = b.period AND a.load_zone = b.load_zone - AND COALESCE(a.spinup_or_lookahead, 0) = COALESCE(b.spinup_or_lookahead, 0) + AND + COALESCE(a.spinup_or_lookahead, 0) = COALESCE(b.spinup_or_lookahead, 0) ) LEFT JOIN @@ -8962,7 +8964,8 @@ FROM results_project_costs_capacity_agg AS a AND a.stage_id = c.stage_id AND a.period = c.period AND a.load_zone = c.load_zone - AND COALESCE(a.spinup_or_lookahead, 0) = COALESCE(c.spinup_or_lookahead, 0) + AND + COALESCE(a.spinup_or_lookahead, 0) = COALESCE(c.spinup_or_lookahead, 0) ) LEFT JOIN @@ -8972,7 +8975,8 @@ FROM results_project_costs_capacity_agg AS a AND a.stage_id = d.stage_id AND a.period = d.period AND a.load_zone = d.load_zone - AND COALESCE(a.spinup_or_lookahead, 0) = COALESCE(d.spinup_or_lookahead, 0) + AND + COALESCE(a.spinup_or_lookahead, 0) = COALESCE(d.spinup_or_lookahead, 0) ) ; @@ -8998,13 +9002,13 @@ FROM (SELECT scenario_id, stage_id, period, spinup_or_lookahead, - SUM(capacity_cost) AS capacity_cost, - SUM(variable_om_cost) AS variable_om_cost, - SUM(fuel_cost) AS fuel_cost, - SUM(startup_cost) AS startup_cost, - SUM(shutdown_cost) AS shutdown_cost, - SUM(tx_capacity_cost) AS tx_capacity_cost, - SUM(tx_hurdle_cost) AS tx_hurdle_cost + SUM(capacity_cost) AS capacity_cost, + SUM(variable_om_cost) AS variable_om_cost, + SUM(fuel_cost) AS fuel_cost, + SUM(startup_cost) AS startup_cost, + SUM(shutdown_cost) AS shutdown_cost, + SUM(tx_capacity_cost) AS tx_capacity_cost, + SUM(tx_hurdle_cost) AS tx_hurdle_cost FROM results_costs_by_period_load_zone GROUP BY scenario_id, subproblem_id, stage_id, period, spinup_or_lookahead) AS a diff --git a/examples/2horizons/inputs/load_zones.tab b/examples/2horizons/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2horizons/inputs/load_zones.tab +++ b/examples/2horizons/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2horizons_w_hydro/inputs/load_zones.tab b/examples/2horizons_w_hydro/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2horizons_w_hydro/inputs/load_zones.tab +++ b/examples/2horizons_w_hydro/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2horizons_w_hydro_and_nuclear_binary_availability/inputs/load_zones.tab b/examples/2horizons_w_hydro_and_nuclear_binary_availability/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2horizons_w_hydro_and_nuclear_binary_availability/inputs/load_zones.tab +++ b/examples/2horizons_w_hydro_and_nuclear_binary_availability/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2horizons_w_hydro_w_balancing_types/inputs/load_zones.tab b/examples/2horizons_w_hydro_w_balancing_types/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2horizons_w_hydro_w_balancing_types/inputs/load_zones.tab +++ b/examples/2horizons_w_hydro_w_balancing_types/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods/inputs/load_zones.tab b/examples/2periods/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods/inputs/load_zones.tab +++ b/examples/2periods/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_gen_bin_econ_retirement/inputs/load_zones.tab b/examples/2periods_gen_bin_econ_retirement/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_gen_bin_econ_retirement/inputs/load_zones.tab +++ b/examples/2periods_gen_bin_econ_retirement/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_gen_lin_econ_retirement/inputs/load_zones.tab b/examples/2periods_gen_lin_econ_retirement/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_gen_lin_econ_retirement/inputs/load_zones.tab +++ b/examples/2periods_gen_lin_econ_retirement/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build/inputs/load_zones.tab b/examples/2periods_new_build/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build/inputs/load_zones.tab +++ b/examples/2periods_new_build/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones/inputs/load_zones.tab b/examples/2periods_new_build_2zones/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_loadcomponents/inputs/load_zones.tab b/examples/2periods_new_build_2zones_loadcomponents/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_loadcomponents/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_loadcomponents/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_new_build_transmission/inputs/load_zones.tab b/examples/2periods_new_build_2zones_new_build_transmission/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_new_build_transmission/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_new_build_transmission/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_new_build_transmission_stochastic/inputs/load_zones.tab b/examples/2periods_new_build_2zones_new_build_transmission_stochastic/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_new_build_transmission_stochastic/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_new_build_transmission_stochastic/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_singleBA/inputs/load_zones.tab b/examples/2periods_new_build_2zones_singleBA/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_singleBA/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_singleBA/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission_Tx1halfavail/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission_Tx1halfavail/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission_Tx1halfavail/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission_Tx1halfavail/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission_Tx1halfavailmonthly/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission_Tx1halfavailmonthly/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission_Tx1halfavailmonthly/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission_Tx1halfavailmonthly/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission_w_hurdle_rates/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission_w_hurdle_rates/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission_w_hurdle_rates/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission_w_hurdle_rates/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint_and_period/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint_and_period/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint_and_period/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission_w_hurdle_rates_by_timepoint_and_period/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission_w_losses/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission_w_losses/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission_w_losses/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission_w_losses/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_2zones_transmission_w_losses_opp_dir/inputs/load_zones.tab b/examples/2periods_new_build_2zones_transmission_w_losses_opp_dir/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_2zones_transmission_w_losses_opp_dir/inputs/load_zones.tab +++ b/examples/2periods_new_build_2zones_transmission_w_losses_opp_dir/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_capgroups/inputs/load_zones.tab b/examples/2periods_new_build_capgroups/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_capgroups/inputs/load_zones.tab +++ b/examples/2periods_new_build_capgroups/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_cumulative_and_vintage_min_max/inputs/load_zones.tab b/examples/2periods_new_build_cumulative_and_vintage_min_max/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_cumulative_and_vintage_min_max/inputs/load_zones.tab +++ b/examples/2periods_new_build_cumulative_and_vintage_min_max/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_cumulative_min_max/inputs/load_zones.tab b/examples/2periods_new_build_cumulative_min_max/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_cumulative_min_max/inputs/load_zones.tab +++ b/examples/2periods_new_build_cumulative_min_max/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_fin_lifetime/inputs/load_zones.tab b/examples/2periods_new_build_fin_lifetime/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_fin_lifetime/inputs/load_zones.tab +++ b/examples/2periods_new_build_fin_lifetime/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_generic_policy/inputs/load_zones.tab b/examples/2periods_new_build_generic_policy/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_generic_policy/inputs/load_zones.tab +++ b/examples/2periods_new_build_generic_policy/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_generic_policy_recs/inputs/load_zones.tab b/examples/2periods_new_build_generic_policy_recs/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_generic_policy_recs/inputs/load_zones.tab +++ b/examples/2periods_new_build_generic_policy_recs/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_horizon_energy_target/inputs/load_zones.tab b/examples/2periods_new_build_horizon_energy_target/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_horizon_energy_target/inputs/load_zones.tab +++ b/examples/2periods_new_build_horizon_energy_target/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_horizon_energy_target_halfyear/inputs/load_zones.tab b/examples/2periods_new_build_horizon_energy_target_halfyear/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_horizon_energy_target_halfyear/inputs/load_zones.tab +++ b/examples/2periods_new_build_horizon_energy_target_halfyear/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_local_capacity/inputs/load_zones.tab b/examples/2periods_new_build_local_capacity/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_local_capacity/inputs/load_zones.tab +++ b/examples/2periods_new_build_local_capacity/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_rps/inputs/load_zones.tab b/examples/2periods_new_build_rps/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_rps/inputs/load_zones.tab +++ b/examples/2periods_new_build_rps/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_rps_percent_target/inputs/load_zones.tab b/examples/2periods_new_build_rps_percent_target/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_rps_percent_target/inputs/load_zones.tab +++ b/examples/2periods_new_build_rps_percent_target/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_rps_variable_reserves/inputs/load_zones.tab b/examples/2periods_new_build_rps_variable_reserves/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_rps_variable_reserves/inputs/load_zones.tab +++ b/examples/2periods_new_build_rps_variable_reserves/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_rps_variable_reserves_subhourly_adj/inputs/load_zones.tab b/examples/2periods_new_build_rps_variable_reserves_subhourly_adj/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_rps_variable_reserves_subhourly_adj/inputs/load_zones.tab +++ b/examples/2periods_new_build_rps_variable_reserves_subhourly_adj/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_rps_w_rps_eligible_storage/inputs/load_zones.tab b/examples/2periods_new_build_rps_w_rps_eligible_storage/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_rps_w_rps_eligible_storage/inputs/load_zones.tab +++ b/examples/2periods_new_build_rps_w_rps_eligible_storage/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_rps_w_rps_ineligible_storage/inputs/load_zones.tab b/examples/2periods_new_build_rps_w_rps_ineligible_storage/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_rps_w_rps_ineligible_storage/inputs/load_zones.tab +++ b/examples/2periods_new_build_rps_w_rps_ineligible_storage/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_simple_prm/inputs/load_zones.tab b/examples/2periods_new_build_simple_prm/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_simple_prm/inputs/load_zones.tab +++ b/examples/2periods_new_build_simple_prm/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_simple_prm_2loadzones/inputs/load_zones.tab b/examples/2periods_new_build_simple_prm_2loadzones/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_simple_prm_2loadzones/inputs/load_zones.tab +++ b/examples/2periods_new_build_simple_prm_2loadzones/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers/inputs/load_zones.tab b/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers/inputs/load_zones.tab +++ b/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_costs/inputs/load_zones.tab b/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_costs/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_costs/inputs/load_zones.tab +++ b/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_costs/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/load_zones.tab b/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/load_zones.tab +++ b/examples/2periods_new_build_simple_prm_2loadzones_newtx_w_transfers_w_subsidies/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_simple_prm_w_energy_only/inputs/load_zones.tab b/examples/2periods_new_build_simple_prm_w_energy_only/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_simple_prm_w_energy_only/inputs/load_zones.tab +++ b/examples/2periods_new_build_simple_prm_w_energy_only/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_new_build_simple_prm_w_energy_only_deliv_cap_limit/inputs/load_zones.tab b/examples/2periods_new_build_simple_prm_w_energy_only_deliv_cap_limit/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_new_build_simple_prm_w_energy_only_deliv_cap_limit/inputs/load_zones.tab +++ b/examples/2periods_new_build_simple_prm_w_energy_only_deliv_cap_limit/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_nuclear_var_cost_by_period_diff/inputs/load_zones.tab b/examples/2periods_nuclear_var_cost_by_period_diff/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_nuclear_var_cost_by_period_diff/inputs/load_zones.tab +++ b/examples/2periods_nuclear_var_cost_by_period_diff/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_nuclear_var_cost_by_period_same/inputs/load_zones.tab b/examples/2periods_nuclear_var_cost_by_period_same/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_nuclear_var_cost_by_period_same/inputs/load_zones.tab +++ b/examples/2periods_nuclear_var_cost_by_period_same/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_nuclear_var_cost_by_timepoint_diff/inputs/load_zones.tab b/examples/2periods_nuclear_var_cost_by_timepoint_diff/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_nuclear_var_cost_by_timepoint_diff/inputs/load_zones.tab +++ b/examples/2periods_nuclear_var_cost_by_timepoint_diff/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_nuclear_var_cost_by_timepoint_same/inputs/load_zones.tab b/examples/2periods_nuclear_var_cost_by_timepoint_same/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_nuclear_var_cost_by_timepoint_same/inputs/load_zones.tab +++ b/examples/2periods_nuclear_var_cost_by_timepoint_same/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/2periods_subproblem_period_builtin_horizons/inputs/load_zones.tab b/examples/2periods_subproblem_period_builtin_horizons/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/2periods_subproblem_period_builtin_horizons/inputs/load_zones.tab +++ b/examples/2periods_subproblem_period_builtin_horizons/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/dsm_examples/hydro_iteration_1/inputs/load_zones.tab b/examples/dsm_examples/hydro_iteration_1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/dsm_examples/hydro_iteration_1/inputs/load_zones.tab +++ b/examples/dsm_examples/hydro_iteration_1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/generic_policy_sod_test/inputs/load_zones.tab b/examples/generic_policy_sod_test/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/generic_policy_sod_test/inputs/load_zones.tab +++ b/examples/generic_policy_sod_test/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/generic_policy_sod_test_w_annual_rps/inputs/load_zones.tab b/examples/generic_policy_sod_test_w_annual_rps/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/generic_policy_sod_test_w_annual_rps/inputs/load_zones.tab +++ b/examples/generic_policy_sod_test_w_annual_rps/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/hydro_system_exog_elev/hydro_iteration_1/inputs/load_zones.tab b/examples/hydro_system_exog_elev/hydro_iteration_1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/hydro_system_exog_elev/hydro_iteration_1/inputs/load_zones.tab +++ b/examples/hydro_system_exog_elev/hydro_iteration_1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/hydro_system_exog_elev_w_gen_ramp_limits/hydro_iteration_1/inputs/load_zones.tab b/examples/hydro_system_exog_elev_w_gen_ramp_limits/hydro_iteration_1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/hydro_system_exog_elev_w_gen_ramp_limits/hydro_iteration_1/inputs/load_zones.tab +++ b/examples/hydro_system_exog_elev_w_gen_ramp_limits/hydro_iteration_1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/hydro_system_exog_elev_w_travel_time/hydro_iteration_1/inputs/load_zones.tab b/examples/hydro_system_exog_elev_w_travel_time/hydro_iteration_1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/hydro_system_exog_elev_w_travel_time/hydro_iteration_1/inputs/load_zones.tab +++ b/examples/hydro_system_exog_elev_w_travel_time/hydro_iteration_1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/hydro_system_exog_elev_w_travel_time_and_max_halfday_flows/hydro_iteration_1/inputs/load_zones.tab b/examples/hydro_system_exog_elev_w_travel_time_and_max_halfday_flows/hydro_iteration_1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/hydro_system_exog_elev_w_travel_time_and_max_halfday_flows/hydro_iteration_1/inputs/load_zones.tab +++ b/examples/hydro_system_exog_elev_w_travel_time_and_max_halfday_flows/hydro_iteration_1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/hydro_system_w_ramp_limits/hydro_iteration_1/inputs/load_zones.tab b/examples/hydro_system_w_ramp_limits/hydro_iteration_1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/hydro_system_w_ramp_limits/hydro_iteration_1/inputs/load_zones.tab +++ b/examples/hydro_system_w_ramp_limits/hydro_iteration_1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/1/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost/1/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/1/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/1/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/1/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost/1/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/1/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/1/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/1/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost/1/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/1/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/1/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/2/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost/2/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/2/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/2/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/2/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost/2/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/2/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/2/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/2/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost/2/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/2/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/2/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/3/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost/3/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/3/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/3/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/3/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost/3/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/3/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/3/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost/3/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost/3/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost/3/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost/3/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/1/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/1/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/1/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/1/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/1/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/1/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/1/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/1/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/1/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/1/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/1/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/1/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/2/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/2/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/2/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/2/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/2/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/2/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/2/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/2/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/2/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/2/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/2/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/2/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/3/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/3/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/3/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/3/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/3/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/3/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/3/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/3/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_linked_subproblems/3/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_linked_subproblems/3/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_linked_subproblems/3/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_linked_subproblems/3/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/1/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/1/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/1/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/1/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/1/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/1/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/1/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/1/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/1/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/1/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/1/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/1/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/2/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/2/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/2/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/2/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/2/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/2/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/2/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/2/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/2/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/2/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/2/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/2/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/3/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/3/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/3/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/3/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/3/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/3/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/3/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/3/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_hydro/3/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_hydro/3/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_hydro/3/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_hydro/3/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/1/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/1/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/1/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/1/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/1/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/1/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/1/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/1/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/1/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/1/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/1/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/1/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/2/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/2/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/2/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/2/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/2/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/2/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/2/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/2/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/2/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/2/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/2/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/2/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/3/1/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/3/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/3/1/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/3/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/3/2/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/3/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/3/2/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/3/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/multi_stage_prod_cost_w_markets/3/3/inputs/load_zones.tab b/examples/multi_stage_prod_cost_w_markets/3/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/multi_stage_prod_cost_w_markets/3/3/inputs/load_zones.tab +++ b/examples/multi_stage_prod_cost_w_markets/3/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/open_data/weather_iteration_2010/hydro_iteration_2010/1/inputs/load_zones.tab b/examples/open_data/weather_iteration_2010/hydro_iteration_2010/1/inputs/load_zones.tab index a4267d020a..4cb382d806 100644 --- a/examples/open_data/weather_iteration_2010/hydro_iteration_2010/1/inputs/load_zones.tab +++ b/examples/open_data/weather_iteration_2010/hydro_iteration_2010/1/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 0 0.0 1 40000.0 . 0.0 . 0.0 -Zone2 0 0.0 1 40000.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 0 0.0 1 40000.0 . 0.0 . 0.0 0.0 +Zone2 0 0.0 1 40000.0 . 0.0 . 0.0 0.0 diff --git a/examples/open_data/weather_iteration_2010/hydro_iteration_2010/2/inputs/load_zones.tab b/examples/open_data/weather_iteration_2010/hydro_iteration_2010/2/inputs/load_zones.tab index a4267d020a..4cb382d806 100644 --- a/examples/open_data/weather_iteration_2010/hydro_iteration_2010/2/inputs/load_zones.tab +++ b/examples/open_data/weather_iteration_2010/hydro_iteration_2010/2/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 0 0.0 1 40000.0 . 0.0 . 0.0 -Zone2 0 0.0 1 40000.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 0 0.0 1 40000.0 . 0.0 . 0.0 0.0 +Zone2 0 0.0 1 40000.0 . 0.0 . 0.0 0.0 diff --git a/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab b/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab b/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_monte_carlo/weather_iteration_1/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab b/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab b/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_monte_carlo/weather_iteration_2/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2010/hydro_iteration_2011/availability_iteration_2/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/1/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/2/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2010/availability_iteration_3/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/1/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab b/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab b/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync_single_year/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab b/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab b/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync_single_year_w_hydro_instead_of_weather_profile/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab b/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2010/hydro_iteration_2010/availability_iteration_1/1/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab b/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab index 48e505952c..ed63d11cd5 100644 --- a/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab +++ b/examples/ra_toolkit_sync_temporal_structure_overwrite/weather_iteration_2011/hydro_iteration_2011/availability_iteration_4/2/inputs/load_zones.tab @@ -1,2 +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 0.0 1 1.0 . 1.0 . 0.001 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 0.0 1 1.0 . 1.0 . . 0.001 diff --git a/examples/single_stage_prod_cost/1/inputs/load_zones.tab b/examples/single_stage_prod_cost/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost/1/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost/2/inputs/load_zones.tab b/examples/single_stage_prod_cost/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost/2/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost/3/inputs/load_zones.tab b/examples/single_stage_prod_cost/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost/3/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_cycle_select/1/inputs/load_zones.tab b/examples/single_stage_prod_cost_cycle_select/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_cycle_select/1/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_cycle_select/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_cycle_select/2/inputs/load_zones.tab b/examples/single_stage_prod_cost_cycle_select/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_cycle_select/2/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_cycle_select/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_cycle_select/3/inputs/load_zones.tab b/examples/single_stage_prod_cost_cycle_select/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_cycle_select/3/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_cycle_select/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_linked_subproblems/1/inputs/load_zones.tab b/examples/single_stage_prod_cost_linked_subproblems/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_linked_subproblems/1/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_linked_subproblems/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_linked_subproblems/2/inputs/load_zones.tab b/examples/single_stage_prod_cost_linked_subproblems/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_linked_subproblems/2/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_linked_subproblems/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_linked_subproblems/3/inputs/load_zones.tab b/examples/single_stage_prod_cost_linked_subproblems/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_linked_subproblems/3/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_linked_subproblems/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_linked_subproblems_w_hydro/1/inputs/load_zones.tab b/examples/single_stage_prod_cost_linked_subproblems_w_hydro/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_linked_subproblems_w_hydro/1/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_linked_subproblems_w_hydro/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_linked_subproblems_w_hydro/2/inputs/load_zones.tab b/examples/single_stage_prod_cost_linked_subproblems_w_hydro/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_linked_subproblems_w_hydro/2/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_linked_subproblems_w_hydro/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_linked_subproblems_w_hydro/3/inputs/load_zones.tab b/examples/single_stage_prod_cost_linked_subproblems_w_hydro/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_linked_subproblems_w_hydro/3/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_linked_subproblems_w_hydro/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_w_spinup_lookahead/1/inputs/load_zones.tab b/examples/single_stage_prod_cost_w_spinup_lookahead/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_w_spinup_lookahead/1/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_w_spinup_lookahead/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_w_spinup_lookahead/2/inputs/load_zones.tab b/examples/single_stage_prod_cost_w_spinup_lookahead/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_w_spinup_lookahead/2/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_w_spinup_lookahead/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_w_spinup_lookahead/3/inputs/load_zones.tab b/examples/single_stage_prod_cost_w_spinup_lookahead/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_w_spinup_lookahead/3/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_w_spinup_lookahead/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_w_startup_limit/1/inputs/load_zones.tab b/examples/single_stage_prod_cost_w_startup_limit/1/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_w_startup_limit/1/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_w_startup_limit/1/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_w_startup_limit/2/inputs/load_zones.tab b/examples/single_stage_prod_cost_w_startup_limit/2/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_w_startup_limit/2/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_w_startup_limit/2/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/single_stage_prod_cost_w_startup_limit/3/inputs/load_zones.tab b/examples/single_stage_prod_cost_w_startup_limit/3/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/single_stage_prod_cost_w_startup_limit/3/inputs/load_zones.tab +++ b/examples/single_stage_prod_cost_w_startup_limit/3/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test/inputs/load_zones.tab b/examples/test/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test/inputs/load_zones.tab +++ b/examples/test/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_aux_cons/inputs/load_zones.tab b/examples/test_aux_cons/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_aux_cons/inputs/load_zones.tab +++ b/examples/test_aux_cons/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_cap_factor_limits/inputs/load_zones.tab b/examples/test_cap_factor_limits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_cap_factor_limits/inputs/load_zones.tab +++ b/examples/test_cap_factor_limits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_carbon_credits_purchase_limits/inputs/load_zones.tab b/examples/test_carbon_credits_purchase_limits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_carbon_credits_purchase_limits/inputs/load_zones.tab +++ b/examples/test_carbon_credits_purchase_limits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_carbon_tax_allowance/inputs/load_zones.tab b/examples/test_carbon_tax_allowance/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_carbon_tax_allowance/inputs/load_zones.tab +++ b/examples/test_carbon_tax_allowance/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_carbon_tax_allowance_with_different_fuel_groups/inputs/load_zones.tab b/examples/test_carbon_tax_allowance_with_different_fuel_groups/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_carbon_tax_allowance_with_different_fuel_groups/inputs/load_zones.tab +++ b/examples/test_carbon_tax_allowance_with_different_fuel_groups/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_cheap_fuel_blend/inputs/load_zones.tab b/examples/test_cheap_fuel_blend/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_cheap_fuel_blend/inputs/load_zones.tab +++ b/examples/test_cheap_fuel_blend/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_cheap_fuel_blend_w_limit/inputs/load_zones.tab b/examples/test_cheap_fuel_blend_w_limit/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_cheap_fuel_blend_w_limit/inputs/load_zones.tab +++ b/examples/test_cheap_fuel_blend_w_limit/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_inertia_reserves/inputs/load_zones.tab b/examples/test_inertia_reserves/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_inertia_reserves/inputs/load_zones.tab +++ b/examples/test_inertia_reserves/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_markets/inputs/load_zones.tab b/examples/test_markets/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_markets/inputs/load_zones.tab +++ b/examples/test_markets/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_markets_w_prd_total_limits/inputs/load_zones.tab b/examples/test_markets_w_prd_total_limits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_markets_w_prd_total_limits/inputs/load_zones.tab +++ b/examples/test_markets_w_prd_total_limits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_markets_w_tmp_total_limits/inputs/load_zones.tab b/examples/test_markets_w_tmp_total_limits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_markets_w_tmp_total_limits/inputs/load_zones.tab +++ b/examples/test_markets_w_tmp_total_limits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_min_max_build_trans/inputs/load_zones.tab b/examples/test_min_max_build_trans/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_min_max_build_trans/inputs/load_zones.tab +++ b/examples/test_min_max_build_trans/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_binary_build_storage/inputs/load_zones.tab b/examples/test_new_binary_build_storage/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_binary_build_storage/inputs/load_zones.tab +++ b/examples/test_new_binary_build_storage/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_binary_solar/inputs/load_zones.tab b/examples/test_new_binary_solar/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_binary_solar/inputs/load_zones.tab +++ b/examples/test_new_binary_solar/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_build_gen_var_stor_hyb/inputs/load_zones.tab b/examples/test_new_build_gen_var_stor_hyb/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_build_gen_var_stor_hyb/inputs/load_zones.tab +++ b/examples/test_new_build_gen_var_stor_hyb/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_build_gen_var_stor_hyb_as_pwr_grp/inputs/load_zones.tab b/examples/test_new_build_gen_var_stor_hyb_as_pwr_grp/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_build_gen_var_stor_hyb_as_pwr_grp/inputs/load_zones.tab +++ b/examples/test_new_build_gen_var_stor_hyb_as_pwr_grp/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_build_storage/inputs/load_zones.tab b/examples/test_new_build_storage/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_build_storage/inputs/load_zones.tab +++ b/examples/test_new_build_storage/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_build_storage_cumulative_min_max/inputs/load_zones.tab b/examples/test_new_build_storage_cumulative_min_max/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_build_storage_cumulative_min_max/inputs/load_zones.tab +++ b/examples/test_new_build_storage_cumulative_min_max/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_build_storage_itc/inputs/load_zones.tab b/examples/test_new_build_storage_itc/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_build_storage_itc/inputs/load_zones.tab +++ b/examples/test_new_build_storage_itc/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.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 index 76954fdd41..3f0fb64d00 100644 --- 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 @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_build_storage_losses_limit/inputs/load_zones.tab b/examples/test_new_build_storage_losses_limit/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_build_storage_losses_limit/inputs/load_zones.tab +++ b/examples/test_new_build_storage_losses_limit/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_instantaneous_penetration/inputs/load_zones.tab b/examples/test_new_instantaneous_penetration/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_instantaneous_penetration/inputs/load_zones.tab +++ b/examples/test_new_instantaneous_penetration/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar/inputs/load_zones.tab b/examples/test_new_solar/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar/inputs/load_zones.tab +++ b/examples/test_new_solar/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_cap/inputs/load_zones.tab b/examples/test_new_solar_carbon_cap/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_cap/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_cap/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_cap_2zones_dont_count_tx/inputs/load_zones.tab b/examples/test_new_solar_carbon_cap_2zones_dont_count_tx/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_new_solar_carbon_cap_2zones_dont_count_tx/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_cap_2zones_dont_count_tx/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_cap_2zones_tx/inputs/load_zones.tab b/examples/test_new_solar_carbon_cap_2zones_tx/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_new_solar_carbon_cap_2zones_tx/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_cap_2zones_tx/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod/inputs/load_zones.tab b/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod_new/inputs/load_zones.tab b/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod_new/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod_new/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_cap_2zones_tx_hydrogen_prod_new/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_cap_2zones_tx_low_carbon_fuel_blend/inputs/load_zones.tab b/examples/test_new_solar_carbon_cap_2zones_tx_low_carbon_fuel_blend/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_new_solar_carbon_cap_2zones_tx_low_carbon_fuel_blend/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_cap_2zones_tx_low_carbon_fuel_blend/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_cap_dac/inputs/load_zones.tab b/examples/test_new_solar_carbon_cap_dac/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_cap_dac/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_cap_dac/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_credits/inputs/load_zones.tab b/examples/test_new_solar_carbon_credits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_credits/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_credits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_credits_w_buy/inputs/load_zones.tab b/examples/test_new_solar_carbon_credits_w_buy/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_credits_w_buy/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_credits_w_buy/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_credits_w_buy_and_sell/inputs/load_zones.tab b/examples/test_new_solar_carbon_credits_w_buy_and_sell/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_credits_w_buy_and_sell/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_credits_w_buy_and_sell/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_credits_w_sell/inputs/load_zones.tab b/examples/test_new_solar_carbon_credits_w_sell/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_credits_w_sell/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_credits_w_sell/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_tax/inputs/load_zones.tab b/examples/test_new_solar_carbon_tax/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_tax/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_tax/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_carbon_tax_w_carbon_credits/inputs/load_zones.tab b/examples/test_new_solar_carbon_tax_w_carbon_credits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_carbon_tax_w_carbon_credits/inputs/load_zones.tab +++ b/examples/test_new_solar_carbon_tax_w_carbon_credits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_fuel_burn_limit/inputs/load_zones.tab b/examples/test_new_solar_fuel_burn_limit/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_fuel_burn_limit/inputs/load_zones.tab +++ b/examples/test_new_solar_fuel_burn_limit/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_fuel_burn_limit_relative/inputs/load_zones.tab b/examples/test_new_solar_fuel_burn_limit_relative/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_fuel_burn_limit_relative/inputs/load_zones.tab +++ b/examples/test_new_solar_fuel_burn_limit_relative/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_itc/inputs/load_zones.tab b/examples/test_new_solar_itc/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_itc/inputs/load_zones.tab +++ b/examples/test_new_solar_itc/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_reserve_prj_contribution/inputs/load_zones.tab b/examples/test_new_solar_reserve_prj_contribution/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_reserve_prj_contribution/inputs/load_zones.tab +++ b/examples/test_new_solar_reserve_prj_contribution/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_new_solar_w_relative_capacity_instead_of_potential/inputs/load_zones.tab b/examples/test_new_solar_w_relative_capacity_instead_of_potential/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_new_solar_w_relative_capacity_instead_of_potential/inputs/load_zones.tab +++ b/examples/test_new_solar_w_relative_capacity_instead_of_potential/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_no_fuels/inputs/load_zones.tab b/examples/test_no_fuels/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_no_fuels/inputs/load_zones.tab +++ b/examples/test_no_fuels/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_no_overgen_allowed/inputs/load_zones.tab b/examples/test_no_overgen_allowed/inputs/load_zones.tab index 47caf39d06..1fba76e252 100644 --- a/examples/test_no_overgen_allowed/inputs/load_zones.tab +++ b/examples/test_no_overgen_allowed/inputs/load_zones.tab @@ -1,2 +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 0 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 0 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_no_reserves/inputs/load_zones.tab b/examples/test_no_reserves/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_no_reserves/inputs/load_zones.tab +++ b/examples/test_no_reserves/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_performance_standard/inputs/load_zones.tab b/examples/test_performance_standard/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_performance_standard/inputs/load_zones.tab +++ b/examples/test_performance_standard/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_performance_standard_both/inputs/load_zones.tab b/examples/test_performance_standard_both/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_performance_standard_both/inputs/load_zones.tab +++ b/examples/test_performance_standard_both/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_performance_standard_carbon_credits/inputs/load_zones.tab b/examples/test_performance_standard_carbon_credits/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_performance_standard_carbon_credits/inputs/load_zones.tab +++ b/examples/test_performance_standard_carbon_credits/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_performance_standard_carbon_credits_w_cap_no_credits_mapping/inputs/load_zones.tab b/examples/test_performance_standard_carbon_credits_w_cap_no_credits_mapping/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_performance_standard_carbon_credits_w_cap_no_credits_mapping/inputs/load_zones.tab +++ b/examples/test_performance_standard_carbon_credits_w_cap_no_credits_mapping/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_performance_standard_power/inputs/load_zones.tab b/examples/test_performance_standard_power/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_performance_standard_power/inputs/load_zones.tab +++ b/examples/test_performance_standard_power/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_ramp_up_and_down_constraints/inputs/load_zones.tab b/examples/test_ramp_up_and_down_constraints/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_ramp_up_and_down_constraints/inputs/load_zones.tab +++ b/examples/test_ramp_up_and_down_constraints/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_ramp_up_constraints/inputs/load_zones.tab b/examples/test_ramp_up_constraints/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_ramp_up_constraints/inputs/load_zones.tab +++ b/examples/test_ramp_up_constraints/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_startup_shutdown_rates/inputs/load_zones.tab b/examples/test_startup_shutdown_rates/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_startup_shutdown_rates/inputs/load_zones.tab +++ b/examples/test_startup_shutdown_rates/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_subproblem_builtin_horizons/inputs/load_zones.tab b/examples/test_subproblem_builtin_horizons/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_subproblem_builtin_horizons/inputs/load_zones.tab +++ b/examples/test_subproblem_builtin_horizons/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_supplemental_firing/inputs/load_zones.tab b/examples/test_supplemental_firing/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_supplemental_firing/inputs/load_zones.tab +++ b/examples/test_supplemental_firing/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_capacity_groups/inputs/load_zones.tab b/examples/test_tx_capacity_groups/inputs/load_zones.tab index 25f6402b2b..6dd78d0a35 100644 --- a/examples/test_tx_capacity_groups/inputs/load_zones.tab +++ b/examples/test_tx_capacity_groups/inputs/load_zones.tab @@ -1,3 +1,3 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_dcopf/inputs/load_zones.tab b/examples/test_tx_dcopf/inputs/load_zones.tab index 1f2c0f632f..0f4cf99e3e 100644 --- a/examples/test_tx_dcopf/inputs/load_zones.tab +++ b/examples/test_tx_dcopf/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 -Zone3 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone3 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_flow/inputs/load_zones.tab b/examples/test_tx_flow/inputs/load_zones.tab index 1f2c0f632f..0f4cf99e3e 100644 --- a/examples/test_tx_flow/inputs/load_zones.tab +++ b/examples/test_tx_flow/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 -Zone3 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone3 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_flow_w_simflow/inputs/load_zones.tab b/examples/test_tx_flow_w_simflow/inputs/load_zones.tab index 1f2c0f632f..0f4cf99e3e 100644 --- a/examples/test_tx_flow_w_simflow/inputs/load_zones.tab +++ b/examples/test_tx_flow_w_simflow/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 -Zone3 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone3 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_simple/inputs/load_zones.tab b/examples/test_tx_simple/inputs/load_zones.tab index 1f2c0f632f..0f4cf99e3e 100644 --- a/examples/test_tx_simple/inputs/load_zones.tab +++ b/examples/test_tx_simple/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 -Zone3 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone3 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_simple_additive/inputs/load_zones.tab b/examples/test_tx_simple_additive/inputs/load_zones.tab index 1f2c0f632f..0f4cf99e3e 100644 --- a/examples/test_tx_simple_additive/inputs/load_zones.tab +++ b/examples/test_tx_simple_additive/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 -Zone3 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone3 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_simple_tmp_emissions/inputs/load_zones.tab b/examples/test_tx_simple_tmp_emissions/inputs/load_zones.tab index 1f2c0f632f..0f4cf99e3e 100644 --- a/examples/test_tx_simple_tmp_emissions/inputs/load_zones.tab +++ b/examples/test_tx_simple_tmp_emissions/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 -Zone3 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone3 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_tx_targets_max/inputs/load_zones.tab b/examples/test_tx_targets_max/inputs/load_zones.tab index 1f2c0f632f..0f4cf99e3e 100644 --- a/examples/test_tx_targets_max/inputs/load_zones.tab +++ b/examples/test_tx_targets_max/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 -Zone2 1 99999999.0 1 99999999.0 . 0.0 . 0.0 -Zone3 1 99999999.0 1 99999999.0 . 0.0 . 0.0 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone2 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 +Zone3 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_variable_gen_reserves/inputs/load_zones.tab b/examples/test_variable_gen_reserves/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_variable_gen_reserves/inputs/load_zones.tab +++ b/examples/test_variable_gen_reserves/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_variable_om_curves/inputs/load_zones.tab b/examples/test_variable_om_curves/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_variable_om_curves/inputs/load_zones.tab +++ b/examples/test_variable_om_curves/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_bt_hrz_avl/inputs/load_zones.tab b/examples/test_w_bt_hrz_avl/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_bt_hrz_avl/inputs/load_zones.tab +++ b/examples/test_w_bt_hrz_avl/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_energy_products/inputs/load_zones.tab b/examples/test_w_energy_products/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_energy_products/inputs/load_zones.tab +++ b/examples/test_w_energy_products/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_energy_products_group_limits/inputs/load_zones.tab b/examples/test_w_energy_products_group_limits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_energy_products_group_limits/inputs/load_zones.tab +++ b/examples/test_w_energy_products_group_limits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_flex_load/inputs/load_zones.tab b/examples/test_w_flex_load/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_flex_load/inputs/load_zones.tab +++ b/examples/test_w_flex_load/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_hydro/inputs/load_zones.tab b/examples/test_w_hydro/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_hydro/inputs/load_zones.tab +++ b/examples/test_w_hydro/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_hydro_as_energy_no_reserves/inputs/load_zones.tab b/examples/test_w_hydro_as_energy_no_reserves/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_hydro_as_energy_no_reserves/inputs/load_zones.tab +++ b/examples/test_w_hydro_as_energy_no_reserves/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_hydro_as_slice_candidate/inputs/load_zones.tab b/examples/test_w_hydro_as_slice_candidate/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_hydro_as_slice_candidate/inputs/load_zones.tab +++ b/examples/test_w_hydro_as_slice_candidate/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_hydro_no_reserves/inputs/load_zones.tab b/examples/test_w_hydro_no_reserves/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_hydro_no_reserves/inputs/load_zones.tab +++ b/examples/test_w_hydro_no_reserves/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_hydro_ramp_limits/inputs/load_zones.tab b/examples/test_w_hydro_ramp_limits/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_hydro_ramp_limits/inputs/load_zones.tab +++ b/examples/test_w_hydro_ramp_limits/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_lf/inputs/load_zones.tab b/examples/test_w_lf/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_lf/inputs/load_zones.tab +++ b/examples/test_w_lf/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_lf_down_percent_req/inputs/load_zones.tab b/examples/test_w_lf_down_percent_req/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_lf_down_percent_req/inputs/load_zones.tab +++ b/examples/test_w_lf_down_percent_req/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_lf_only/inputs/load_zones.tab b/examples/test_w_lf_only/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_lf_only/inputs/load_zones.tab +++ b/examples/test_w_lf_only/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_lf_only_and_prices/inputs/load_zones.tab b/examples/test_w_lf_only_and_prices/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_lf_only_and_prices/inputs/load_zones.tab +++ b/examples/test_w_lf_only_and_prices/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_lf_only_energy_potential_limit/inputs/load_zones.tab b/examples/test_w_lf_only_energy_potential_limit/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_lf_only_energy_potential_limit/inputs/load_zones.tab +++ b/examples/test_w_lf_only_energy_potential_limit/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_lf_w_demand_charges/inputs/load_zones.tab b/examples/test_w_lf_w_demand_charges/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_lf_w_demand_charges/inputs/load_zones.tab +++ b/examples/test_w_lf_w_demand_charges/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_monthly_prj_derates/inputs/load_zones.tab b/examples/test_w_monthly_prj_derates/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_monthly_prj_derates/inputs/load_zones.tab +++ b/examples/test_w_monthly_prj_derates/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_no_prj_av_sid_specified/inputs/load_zones.tab b/examples/test_w_no_prj_av_sid_specified/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_no_prj_av_sid_specified/inputs/load_zones.tab +++ b/examples/test_w_no_prj_av_sid_specified/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_nonfuel_emissions/inputs/load_zones.tab b/examples/test_w_nonfuel_emissions/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_nonfuel_emissions/inputs/load_zones.tab +++ b/examples/test_w_nonfuel_emissions/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_solver_options/inputs/load_zones.tab b/examples/test_w_solver_options/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_solver_options/inputs/load_zones.tab +++ b/examples/test_w_solver_options/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_storage/inputs/load_zones.tab b/examples/test_w_storage/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_storage/inputs/load_zones.tab +++ b/examples/test_w_storage/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_storage_starting_soc/inputs/load_zones.tab b/examples/test_w_storage_starting_soc/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_storage_starting_soc/inputs/load_zones.tab +++ b/examples/test_w_storage_starting_soc/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_storage_w_soc_last_tmp_penalty/inputs/load_zones.tab b/examples/test_w_storage_w_soc_last_tmp_penalty/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_storage_w_soc_last_tmp_penalty/inputs/load_zones.tab +++ b/examples/test_w_storage_w_soc_last_tmp_penalty/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_storage_w_soc_penalty/inputs/load_zones.tab b/examples/test_w_storage_w_soc_penalty/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_storage_w_soc_penalty/inputs/load_zones.tab +++ b/examples/test_w_storage_w_soc_penalty/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/examples/test_w_storage_wind_as_energy/inputs/load_zones.tab b/examples/test_w_storage_wind_as_energy/inputs/load_zones.tab index 76954fdd41..3f0fb64d00 100644 --- a/examples/test_w_storage_wind_as_energy/inputs/load_zones.tab +++ b/examples/test_w_storage_wind_as_energy/inputs/load_zones.tab @@ -1,2 +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 +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999.0 1 99999999.0 . 0.0 . . 0.0 diff --git a/gridpath/geography/load_zones.py b/gridpath/geography/load_zones.py index cd6698241a..212fc12611 100644 --- a/gridpath/geography/load_zones.py +++ b/gridpath/geography/load_zones.py @@ -50,7 +50,9 @@ def add_model_components( m.allow_unserved_energy = Param(m.LOAD_ZONES, within=Boolean) - m.unserved_energy_penalty_per_mwh = Param(m.LOAD_ZONES, within=NonNegativeReals) + m.unserved_energy_penalty_per_mwh = Param( + m.LOAD_ZONES, within=NonNegativeReals, default=0 + ) m.unserved_energy_limit_mwh = Param( m.LOAD_ZONES, within=NonNegativeReals, default=float("inf") ) @@ -62,6 +64,10 @@ def add_model_components( m.LOAD_ZONES, within=NonNegativeReals, default=float("inf") ) + m.avg_unserved_load_penalty_per_mwa = Param( + m.LOAD_ZONES, within=NonNegativeReals, default=0 + ) + # Can only be applied if transmission is included m.export_penalty_cost_per_mwh = Param( m.LOAD_ZONES, within=NonNegativeReals, default=0 @@ -115,6 +121,7 @@ def load_model_data( m.unserved_energy_limit_mwh, m.max_unserved_load_penalty_per_mw, m.max_unserved_load_limit_mw, + m.avg_unserved_load_penalty_per_mwa, m.export_penalty_cost_per_mwh, ), ) @@ -143,7 +150,8 @@ def get_inputs_from_database( SELECT 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 + max_unserved_load_limit_mw, avg_unserved_load_penalty_per_mwa, + export_penalty_cost_per_mwh FROM inputs_geography_load_balance WHERE load_balance_scenario_id = {subscenarios.LOAD_BALANCE_SCENARIO_ID} AND load_zone in ( @@ -249,6 +257,7 @@ def write_model_inputs( "unserved_energy_limit_mwh", "max_unserved_load_penalty_per_mw", "max_unserved_load_limit_mw", + "avg_unserved_load_penalty_per_mwa", "export_penalty_cost_per_mwh", ] ) diff --git a/gridpath/objective/system/aggregate_load_balance_penalties.py b/gridpath/objective/system/aggregate_load_balance_penalties.py index 9badd89321..c5025a1dd5 100644 --- a/gridpath/objective/system/aggregate_load_balance_penalties.py +++ b/gridpath/objective/system/aggregate_load_balance_penalties.py @@ -46,42 +46,67 @@ def add_model_components( Here, we aggregate total unserved-energy and overgeneration costs as well as any penalties on max unserved load by load zone, and add them as a dynamic component to the objective function. + + Note these are aggregated over the entire optimization, not per period. """ - m.Max_Unserved_Load_Penalty = Var( - m.LOAD_ZONES, within=NonNegativeReals, initialize=0 - ) + m.Max_Unserved_Load_MW = Var(m.LOAD_ZONES, within=NonNegativeReals, initialize=0) def max_unserved_load_penalty_constraint_rule(mod, lz, tmp): if mod.max_unserved_load_penalty_per_mw[lz] == 0: return Constraint.Skip else: return ( - mod.Max_Unserved_Load_Penalty[lz] + mod.Max_Unserved_Load_MW[lz] >= mod.Unserved_Energy_MW_Expression[lz, tmp] ) - m.Max_Unserved_Load_Penalty_Constraint = Constraint( + m.Max_Unserved_Load_Constraint = Constraint( m.LOAD_ZONES, m.TMPS, rule=max_unserved_load_penalty_constraint_rule ) - def total_penalty_costs_rule(mod): + def avg_unserved_load(mod, lz): return sum( - ( - mod.Unserved_Energy_MW_Expression[z, tmp] - * mod.unserved_energy_penalty_per_mwh[z] - + mod.Overgeneration_MW_Expression[z, tmp] - * mod.overgeneration_penalty_per_mw[z] - ) + mod.Unserved_Energy_MW_Expression[lz, tmp] * mod.hrs_in_tmp[tmp] * mod.tmp_weight[tmp] * mod.number_years_represented[mod.period[tmp]] * mod.discount_factor[mod.period[tmp]] - for z in mod.LOAD_ZONES for tmp in mod.TMPS - ) + sum( - mod.Max_Unserved_Load_Penalty[z] * mod.max_unserved_load_penalty_per_mw[z] - for z in mod.LOAD_ZONES + ) / sum( + mod.hrs_in_tmp[tmp] + * mod.tmp_weight[tmp] + * mod.number_years_represented[mod.period[tmp]] + * mod.discount_factor[mod.period[tmp]] + for tmp in mod.TMPS + ) + + m.Avg_Unserved_Load_MWa = Expression(m.LOAD_ZONES, rule=avg_unserved_load) + + def total_penalty_costs_rule(mod): + return ( + sum( + ( + mod.Unserved_Energy_MW_Expression[z, tmp] + * mod.unserved_energy_penalty_per_mwh[z] + + mod.Overgeneration_MW_Expression[z, tmp] + * mod.overgeneration_penalty_per_mw[z] + ) + * mod.hrs_in_tmp[tmp] + * mod.tmp_weight[tmp] + * mod.number_years_represented[mod.period[tmp]] + * mod.discount_factor[mod.period[tmp]] + for z in mod.LOAD_ZONES + for tmp in mod.TMPS + ) + + sum( + mod.Max_Unserved_Load_MW[z] * mod.max_unserved_load_penalty_per_mw[z] + for z in mod.LOAD_ZONES + ) + + sum( + mod.Avg_Unserved_Load_MWa[z] * mod.avg_unserved_load_penalty_per_mwa[z] + for z in mod.LOAD_ZONES + ) ) m.Total_Load_Balance_Penalty_Costs = Expression(rule=total_penalty_costs_rule) diff --git a/tests/test_data/inputs/load_zones.tab b/tests/test_data/inputs/load_zones.tab index 736d49c7a2..18849205e5 100644 --- a/tests/test_data/inputs/load_zones.tab +++ b/tests/test_data/inputs/load_zones.tab @@ -1,5 +1,5 @@ -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 1 99999999 . 0 1000 0 -Zone2 1 99999999 1 99999999 . 0 . 0 -Zone3 1 99999999 1 99999999 100000 0 . 0 -Zone4 1 99999999 1 99999999 100000 0 . 0 \ No newline at end of file +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999 1 99999999 . 0 1000 . 0 +Zone2 1 99999999 1 99999999 . 0 . . 0 +Zone3 1 99999999 1 99999999 100000 0 . . 0 +Zone4 1 99999999 1 99999999 100000 0 . . 0 \ No newline at end of file diff --git a/tests/test_data/subproblems/202001/2/inputs/load_zones.tab b/tests/test_data/subproblems/202001/2/inputs/load_zones.tab index bf52451c13..cfbfa5f296 100644 --- a/tests/test_data/subproblems/202001/2/inputs/load_zones.tab +++ b/tests/test_data/subproblems/202001/2/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 1 99999999 . 0 1000 0 -Zone2 1 99999999 1 99999999 . 0 . 0 -Zone3 1 99999999 1 99999999 100000 0 . 0 \ No newline at end of file +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999 1 99999999 . 0 1000 . 0 +Zone2 1 99999999 1 99999999 . 0 . . 0 +Zone3 1 99999999 1 99999999 100000 0 . . 0 \ No newline at end of file diff --git a/tests/test_data/subproblems/202002/inputs/load_zones.tab b/tests/test_data/subproblems/202002/inputs/load_zones.tab index bf52451c13..cfbfa5f296 100644 --- a/tests/test_data/subproblems/202002/inputs/load_zones.tab +++ b/tests/test_data/subproblems/202002/inputs/load_zones.tab @@ -1,4 +1,4 @@ -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 1 99999999 . 0 1000 0 -Zone2 1 99999999 1 99999999 . 0 . 0 -Zone3 1 99999999 1 99999999 100000 0 . 0 \ No newline at end of file +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 avg_unserved_load_penalty_per_mwa export_penalty_cost_per_mwh +Zone1 1 99999999 1 99999999 . 0 1000 . 0 +Zone2 1 99999999 1 99999999 . 0 . . 0 +Zone3 1 99999999 1 99999999 100000 0 . . 0 \ No newline at end of file