Updating quickstart module & test case to v2.0.5+ (using csv files)

switch-model · Aug 16, 2019 · 1777f9a · 1777f9a
1 parent 5e75bc3
commit 1777f9a
Show file tree

Hide file tree

Showing 34 changed files with 62 additions and 57 deletions.
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/financials.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/financials.csv
@@ -0,0 +1,2 @@
+base_financial_year,interest_rate,discount_rate
+2015,0.07,0.05
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/financials.dat b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/financials.dat
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuel_cost.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuel_cost.csv
@@ -0,0 +1,2 @@
+load_zone,fuel,period,fuel_cost
+South,NaturalGas,2010,4
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuel_cost.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuel_cost.tab
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuels.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuels.csv
@@ -0,0 +1,2 @@
+fuel,co2_intensity,upstream_co2_intensity
+NaturalGas,0.05306,0
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuels.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/fuels.tab
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_costs.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_costs.csv
@@ -0,0 +1,6 @@
+GENERATION_PROJECT,build_year,gen_overnight_cost,gen_fixed_om
+S-Geothermal,1998,5524200,0.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.0
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_costs.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_costs.tab
diff --git a/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_predetermined.csv b/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_predetermined.csv
@@ -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.0
diff --git a/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_predetermined.tab b/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/gen_build_predetermined.tab
diff --git a/...les/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_inc_heat_rates.csv b/...les/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_inc_heat_rates.csv
@@ -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,.
diff --git a/...les/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_inc_heat_rates.tab b/...les/production_cost_models/spinning_and_quickstart_reserves/inputs/gen_inc_heat_rates.tab
diff --git a/...oduction_cost_models/spinning_and_quickstart_reserves/inputs/gen_part_load_heat_rates.csv b/...oduction_cost_models/spinning_and_quickstart_reserves/inputs/gen_part_load_heat_rates.csv
@@ -0,0 +1,5 @@
+GENERATION_PROJECT,gen_loading_level,gen_heat_rate_at_loading_level
+S-NG_CC,0.4,2.694069
+S-NG_CC,1,6.705
+S-NG_GT,0,0.1039
+S-NG_GT,1,10.39
diff --git a/...oduction_cost_models/spinning_and_quickstart_reserves/inputs/generation_projects_info.csv b/...oduction_cost_models/spinning_and_quickstart_reserves/inputs/generation_projects_info.csv
@@ -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.0,3.0,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,0.4,9.16,10.3,12.0,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,0.22,0.86,.,1
+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
diff --git a/...oduction_cost_models/spinning_and_quickstart_reserves/inputs/generation_projects_info.tab b/...oduction_cost_models/spinning_and_quickstart_reserves/inputs/generation_projects_info.tab
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/load_zones.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/load_zones.csv
@@ -0,0 +1,2 @@
+LOAD_ZONE,existing_local_td,local_td_annual_cost_per_mw
+South,10,128040
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/load_zones.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/load_zones.tab
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/loads.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/loads.csv
@@ -0,0 +1,5 @@
+LOAD_ZONE,TIMEPOINT,zone_demand_mw
+South,1,3
+South,2,8
+South,3,10
+South,4,7
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/loads.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/loads.tab
diff --git a/...serves/inputs/non_fuel_energy_sources.tab → ...serves/inputs/non_fuel_energy_sources.csv b/...serves/inputs/non_fuel_energy_sources.tab → ...serves/inputs/non_fuel_energy_sources.csv
@@ -1,3 +1,3 @@
 energy_source
 Geothermal
-Solar
+Solar
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/periods.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/periods.csv
@@ -0,0 +1,2 @@
+INVESTMENT_PERIOD,period_start,period_end
+2010,2008,2012
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/periods.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/periods.tab
diff --git a/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/spinning_reserve_params.csv b/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/spinning_reserve_params.csv
@@ -0,0 +1,2 @@
+contingency_safety_factor
+1
diff --git a/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/spinning_reserve_params.dat b/...roduction_cost_models/spinning_and_quickstart_reserves/inputs/spinning_reserve_params.dat
diff --git a/.../production_cost_models/spinning_and_quickstart_reserves/inputs/switch_inputs_version.txt b/.../production_cost_models/spinning_and_quickstart_reserves/inputs/switch_inputs_version.txt
@@ -1 +1 @@
-2.0.4
+2.0.5
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timepoints.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timepoints.csv
@@ -0,0 +1,5 @@
+timepoint_id,timestamp,timeseries
+1,2010011500,2010_all
+2,2010011506,2010_all
+3,2010011512,2010_all
+4,2010011518,2010_all
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timepoints.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timepoints.tab
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timeseries.csv b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timeseries.csv
@@ -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
diff --git a/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timeseries.tab b/examples/production_cost_models/spinning_and_quickstart_reserves/inputs/timeseries.tab
diff --git a/...duction_cost_models/spinning_and_quickstart_reserves/inputs/variable_capacity_factors.csv b/...duction_cost_models/spinning_and_quickstart_reserves/inputs/variable_capacity_factors.csv
@@ -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.0
+S-Central_PV-1,4,0.4
diff --git a/...duction_cost_models/spinning_and_quickstart_reserves/inputs/variable_capacity_factors.tab b/...duction_cost_models/spinning_and_quickstart_reserves/inputs/variable_capacity_factors.tab
diff --git a/...ction_cost_models/spinning_and_quickstart_reserves/inputs/zone_coincident_peak_demand.csv b/...ction_cost_models/spinning_and_quickstart_reserves/inputs/zone_coincident_peak_demand.csv
@@ -0,0 +1,2 @@
+LOAD_ZONE,PERIOD,zone_expected_coincident_peak_demand
+South,2010,10
diff --git a/...ction_cost_models/spinning_and_quickstart_reserves/inputs/zone_coincident_peak_demand.tab b/...ction_cost_models/spinning_and_quickstart_reserves/inputs/zone_coincident_peak_demand.tab
diff --git a/switch_model/balancing/operating_reserves/quickstart.py b/switch_model/balancing/operating_reserves/quickstart.py
@@ -200,11 +200,11 @@ def load_inputs(mod, switch_data, inputs_dir):
     """
     All files & columns are optional. See notes above for default values.
 
-    generation_projects_info.tab
+    generation_projects_info.csv
         GENERATION_PROJECTS, ... gen_can_provide_quickstart_reserves
     """
     switch_data.load_aug(
-        filename=os.path.join(inputs_dir, 'generation_projects_info.tab'),
+        filename=os.path.join(inputs_dir, 'generation_projects_info.csv'),
         auto_select=True,
         optional_params=['gen_can_provide_quickstart_reserves'],
         param=(mod.gen_can_provide_quickstart_reserves)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		base_financial_year,interest_rate,discount_rate
		2015,0.07,0.05
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		load_zone,fuel,period,fuel_cost
		South,NaturalGas,2010,4
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fuel,co2_intensity,upstream_co2_intensity
		NaturalGas,0.05306,0
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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		INVESTMENT_PERIOD,period_start,period_end
		2010,2008,2012
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
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