Skip to content

Commit 1777f9a

Browse files
josiahjohnstonjosiahjohnston
committed
Updating quickstart module & test case to v2.0.5+ (using csv files)
1 parent 5e75bc3 commit 1777f9a

34 files changed

+62
-57
lines changed

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/financials.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
base_financial_year,interest_rate,discount_rate
2+
2015,0.07,0.05

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/financials.dat

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuel_cost.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
load_zone,fuel,period,fuel_cost
2+
South,NaturalGas,2010,4

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuel_cost.tab

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuels.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fuel,co2_intensity,upstream_co2_intensity
2+
NaturalGas,0.05306,0

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuels.tab

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_costs.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
GENERATION_PROJECT,build_year,gen_overnight_cost,gen_fixed_om
2+
S-Geothermal,1998,5524200,0.0
3+
S-NG_CC,2000,1143900,5868.3
4+
S-NG_GT,1990,605430,4891.8
5+
S-NG_GT,2002,605430,4891.8
6+
S-Central_PV-1,2001,2334300,41850.0

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_costs.tab

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_predetermined.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
GENERATION_PROJECT,build_year,gen_predetermined_cap
2+
S-Geothermal,1998,2.0
3+
S-NG_CC,2000,7.0
4+
S-NG_GT,1990,3.0
5+
S-NG_GT,2002,4.0
6+
S-Central_PV-1,2001,3.0

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_predetermined.tab

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_inc_heat_rates.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
GENERATION_PROJECT,power_start_mw,power_end_mw,incremental_heat_rate_mbtu_per_mwhr,fuel_use_rate_mmbtu_per_h
2+
S-NG_CC,40,.,.,269.4069
3+
S-NG_CC,40,100.0,6.684885,.
4+
S-NG_GT,0,.,.,0.1039
5+
S-NG_GT,0,1.0,10.2861,.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_inc_heat_rates.tab

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_part_load_heat_rates.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
GENERATION_PROJECT,gen_loading_level,gen_heat_rate_at_loading_level
2+
S-NG_CC,0.4,2.694069
3+
S-NG_CC,1,6.705
4+
S-NG_GT,0,0.1039
5+
S-NG_GT,1,10.39

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/generation_projects_info.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
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
2+
S-Geothermal,33,Geothermal,South,134222.0,3.0,30,0,0.0075,0.0241,0,1,0,28.83,Geothermal,.,.,.,.,.,.,0
3+
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,0.4,9.16,10.3,12.0,1
4+
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,0.22,0.86,.,1
5+
S-Central_PV-1,41,Central_PV,South,74881.9,4.0,20,0,0.0,0.02,1,0,0,0.0,Solar,.,.,0.0,.,0.0,.,0

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/generation_projects_info.tab

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/load_zones.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
LOAD_ZONE,existing_local_td,local_td_annual_cost_per_mw
2+
South,10,128040

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/load_zones.tab

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/loads.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
LOAD_ZONE,TIMEPOINT,zone_demand_mw
2+
South,1,3
3+
South,2,8
4+
South,3,10
5+
South,4,7

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/loads.tab

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/non_fuel_energy_sources.tab renamed to ‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/non_fuel_energy_sources.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
energy_source
22
Geothermal
3-
Solar
3+
Solar

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/periods.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
INVESTMENT_PERIOD,period_start,period_end
2+
2010,2008,2012

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/periods.tab

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/spinning_reserve_params.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
contingency_safety_factor
2+
1

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/spinning_reserve_params.dat

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/switch_inputs_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.4
1+
2.0.5

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timepoints.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
timepoint_id,timestamp,timeseries
2+
1,2010011500,2010_all
3+
2,2010011506,2010_all
4+
3,2010011512,2010_all
5+
4,2010011518,2010_all

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timepoints.tab

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timeseries.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
TIMESERIES,ts_period,ts_duration_of_tp,ts_num_tps,ts_scale_to_period
2+
2010_all,2010,6,1,1826.25

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timeseries.tab

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/variable_capacity_factors.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
GENERATION_PROJECT,timepoint,gen_max_capacity_factor
2+
S-Central_PV-1,1,0.0
3+
S-Central_PV-1,2,0.61
4+
S-Central_PV-1,3,1.0
5+
S-Central_PV-1,4,0.4

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/variable_capacity_factors.tab

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/zone_coincident_peak_demand.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
LOAD_ZONE,PERIOD,zone_expected_coincident_peak_demand
2+
South,2010,10

‎examples/production_cost_models/spinning_and_quickstart_reserves/inputs/zone_coincident_peak_demand.tab

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎switch_model/balancing/operating_reserves/quickstart.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ def load_inputs(mod, switch_data, inputs_dir):
200200
"""
201201
All files & columns are optional. See notes above for default values.
202202
203-
generation_projects_info.tab
203+
generation_projects_info.csv
204204
GENERATION_PROJECTS, ... gen_can_provide_quickstart_reserves
205205
"""
206206
switch_data.load_aug(
207-
filename=os.path.join(inputs_dir, 'generation_projects_info.tab'),
207+
filename=os.path.join(inputs_dir, 'generation_projects_info.csv'),
208208
auto_select=True,
209209
optional_params=['gen_can_provide_quickstart_reserves'],
210210
param=(mod.gen_can_provide_quickstart_reserves)

0 commit comments

Comments
 (0)