-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #103 from switch-model/v2.0.0b4
Update to 2.0.0
- Loading branch information
Showing
90 changed files
with
3,890 additions
and
1,240 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,4 @@ | |
gurobi.log | ||
switch_model.egg-info/ | ||
venv | ||
build/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/3zone_toy_stochastic_PySP/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/discrete_and_min_build/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/1plant/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/3plants/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/4plants/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/4plants_with_unserved_load/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/discrete_unit_commit/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/spinning_reserves/inputs/gen_inc_heat_rates.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/spinning_reserves/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
4 changes: 4 additions & 0 deletions
4
examples/production_cost_models/spinning_reserves_advanced/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
SYNOPSIS | ||
switch solve --verbose --log-run | ||
|
||
This example extends unit_commit by adding spinning reserve requirements. |
3 changes: 3 additions & 0 deletions
3
examples/production_cost_models/spinning_reserves_advanced/inputs/financials.dat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
param base_financial_year := 2015; | ||
param interest_rate := .07; | ||
param discount_rate := .05; |
2 changes: 2 additions & 0 deletions
2
examples/production_cost_models/spinning_reserves_advanced/inputs/fuel_cost.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
load_zone fuel period fuel_cost | ||
South NaturalGas 2010 4 |
2 changes: 2 additions & 0 deletions
2
examples/production_cost_models/spinning_reserves_advanced/inputs/fuels.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
fuel co2_intensity upstream_co2_intensity | ||
NaturalGas 0.05306 0 |
6 changes: 6 additions & 0 deletions
6
examples/production_cost_models/spinning_reserves_advanced/inputs/gen_build_costs.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
GENERATION_PROJECT build_year gen_overnight_cost gen_fixed_om | ||
S-Geothermal 1998 5524200 0 | ||
S-NG_CC 2000 1143900 5868.3 | ||
S-NG_GT 1990 605430 4891.8 | ||
S-NG_GT 2002 605430 4891.8 | ||
S-Central_PV-1 2001 2334300 41850 |
6 changes: 6 additions & 0 deletions
6
...ples/production_cost_models/spinning_reserves_advanced/inputs/gen_build_predetermined.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
GENERATION_PROJECT build_year gen_predetermined_cap | ||
S-Geothermal 1998 2.0 | ||
S-NG_CC 2000 7.0 | ||
S-NG_GT 1990 3.0 | ||
S-NG_GT 2002 4.0 | ||
S-Central_PV-1 2001 3 |
5 changes: 5 additions & 0 deletions
5
examples/production_cost_models/spinning_reserves_advanced/inputs/gen_inc_heat_rates.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
GENERATION_PROJECT power_start_mw power_end_mw incremental_heat_rate_mbtu_per_mwhr fuel_use_rate_mmbtu_per_h | ||
S-NG_CC 40 . . 269.4069 | ||
S-NG_CC 40 100.0 6.684885 . | ||
S-NG_GT 0 . . 0.1039 | ||
S-NG_GT 0 1.0 10.2861 . |
5 changes: 5 additions & 0 deletions
5
...les/production_cost_models/spinning_reserves_advanced/inputs/generation_projects_info.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
GENERATION_PROJECT gen_dbid gen_tech gen_load_zone gen_connect_cost_per_mw gen_capacity_limit_mw gen_max_age gen_min_build_capacity gen_scheduled_outage_rate gen_forced_outage_rate gen_is_variable gen_is_baseload gen_is_cogen gen_variable_om gen_energy_source gen_full_load_heat_rate gen_unit_size gen_min_load_fraction gen_startup_fuel gen_startup_om gen_min_downtime gen_can_provide_spinning_reserves | ||
S-Geothermal 33 Geothermal South 134222 3 30 0 0.0075 0.0241 0 1 0 28.83 Geothermal . . . . . . 0 | ||
S-NG_CC 34 NG_CC South 57566.6 . 20 0 0.04 0.06 0 0 0 3.4131 NaturalGas 6.705 1 0.4 9.16 10.3 12 1 | ||
S-NG_GT 36 NG_GT South 57566.6 . 20 0 0.04 0.06 0 0 0 27.807 NaturalGas 10.39 . 0 0.22 0.86 . 1 | ||
S-Central_PV-1 41 Central_PV South 74881.9 4 20 0 0 0.02 1 0 0 0 Solar . . 0 . 0 . 0 |
3 changes: 3 additions & 0 deletions
3
..._cost_models/spinning_reserves_advanced/inputs/generation_projects_reserve_capability.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
GENERATION_PROJECT SPINNING_RESERVE_TYPES | ||
S-NG_CC spinning | ||
S-NG_GT spinning |
2 changes: 2 additions & 0 deletions
2
examples/production_cost_models/spinning_reserves_advanced/inputs/load_zones.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
LOAD_ZONE existing_local_td local_td_annual_cost_per_mw | ||
South 10 128040 |
5 changes: 5 additions & 0 deletions
5
examples/production_cost_models/spinning_reserves_advanced/inputs/loads.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
LOAD_ZONE TIMEPOINT zone_demand_mw | ||
South 1 3 | ||
South 2 8 | ||
South 3 10 | ||
South 4 7 |
17 changes: 17 additions & 0 deletions
17
examples/production_cost_models/spinning_reserves_advanced/inputs/modules.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Core Modules | ||
switch_model | ||
switch_model.timescales | ||
switch_model.financials | ||
switch_model.balancing.load_zones | ||
switch_model.energy_sources.properties | ||
switch_model.generators.core.build | ||
switch_model.generators.core.dispatch | ||
switch_model.reporting | ||
# Custom Modules | ||
switch_model.transmission.local_td | ||
switch_model.generators.core.commit.operate | ||
switch_model.generators.core.commit.fuel_use | ||
switch_model.energy_sources.fuel_costs.simple | ||
switch_model.balancing.operating_reserves.areas | ||
switch_model.balancing.operating_reserves.spinning_reserves_advanced | ||
#switch_model.reporting.dump |
3 changes: 3 additions & 0 deletions
3
...ples/production_cost_models/spinning_reserves_advanced/inputs/non_fuel_energy_sources.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
energy_source | ||
Geothermal | ||
Solar |
2 changes: 2 additions & 0 deletions
2
examples/production_cost_models/spinning_reserves_advanced/inputs/periods.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
INVESTMENT_PERIOD period_start period_end | ||
2010 2008 2012 |
1 change: 1 addition & 0 deletions
1
...ples/production_cost_models/spinning_reserves_advanced/inputs/spinning_reserve_params.dat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
param contingency_safety_factor := 1; |
1 change: 1 addition & 0 deletions
1
examples/production_cost_models/spinning_reserves_advanced/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2.0.0b4 |
5 changes: 5 additions & 0 deletions
5
examples/production_cost_models/spinning_reserves_advanced/inputs/timepoints.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
timepoint_id timestamp timeseries | ||
1 2010011500 2010_all | ||
2 2010011506 2010_all | ||
3 2010011512 2010_all | ||
4 2010011518 2010_all |
2 changes: 2 additions & 0 deletions
2
examples/production_cost_models/spinning_reserves_advanced/inputs/timeseries.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
TIMESERIES ts_period ts_duration_of_tp ts_num_tps ts_scale_to_period | ||
2010_all 2010 6 1 1826.25 |
5 changes: 5 additions & 0 deletions
5
...es/production_cost_models/spinning_reserves_advanced/inputs/variable_capacity_factors.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
GENERATION_PROJECT timepoint gen_max_capacity_factor | ||
S-Central_PV-1 1 0.0 | ||
S-Central_PV-1 2 0.61 | ||
S-Central_PV-1 3 1 | ||
S-Central_PV-1 4 0.4 |
2 changes: 2 additions & 0 deletions
2
.../production_cost_models/spinning_reserves_advanced/inputs/zone_coincident_peak_demand.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
LOAD_ZONE PERIOD zone_expected_coincident_peak_demand | ||
South 2010 10 |
2 changes: 2 additions & 0 deletions
2
examples/production_cost_models/spinning_reserves_advanced/options.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
--spinning-requirement-rule 3+5 | ||
--unit-contingency |
1 change: 1 addition & 0 deletions
1
examples/production_cost_models/spinning_reserves_advanced/outputs/total_cost.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
28606194.7452 |
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/unit_commit/inputs/gen_inc_heat_rates.tab
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/production_cost_models/unit_commit/inputs/switch_inputs_version.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.0.0b2 | ||
2.0.0b4 |
Oops, something went wrong.