Move WECC-specific database and papers folder into WECC folder

switch-model · Jan 28, 2023 · 2eae434 · 2eae434
1 parent 137983c
commit 2eae434
Show file tree

Hide file tree

Showing 88 changed files with 337,145 additions and 337,145 deletions.
diff --git a/...e_creation/Canada_Mexico_data/old and new generator ids from AMPL Canada and Mex gen.xlsx b/...e_creation/Canada_Mexico_data/old and new generator ids from AMPL Canada and Mex gen.xlsx
diff --git a/database/2021-06-11_add_ALL_load_zone.sql → ...database/2021-06-11_add_ALL_load_zone.sql b/database/2021-06-11_add_ALL_load_zone.sql → ...database/2021-06-11_add_ALL_load_zone.sql
diff --git a/database/2021-06-11_add_storage_params.sql → ...atabase/2021-06-11_add_storage_params.sql b/database/2021-06-11_add_storage_params.sql → ...atabase/2021-06-11_add_storage_params.sql
diff --git a/...21-06-15_add_generation_plants_groups.sql → ...21-06-15_add_generation_plants_groups.sql b/...21-06-15_add_generation_plants_groups.sql → ...21-06-15_add_generation_plants_groups.sql
diff --git a/...8_add_gen_store_energy_to_power_ratio.sql → ...8_add_gen_store_energy_to_power_ratio.sql b/...8_add_gen_store_energy_to_power_ratio.sql → ...8_add_gen_store_energy_to_power_ratio.sql
diff --git a/...e/2021-06-24_add_transmission_options.sql → ...e/2021-06-24_add_transmission_options.sql b/...e/2021-06-24_add_transmission_options.sql → ...e/2021-06-24_add_transmission_options.sql
diff --git a/...021-06-29_add_transmission_options_v2.sql → ...021-06-29_add_transmission_options_v2.sql b/...021-06-29_add_transmission_options_v2.sql → ...021-06-29_add_transmission_options_v2.sql
diff --git a/...021-07-07_add_wind_solar_ratio_column.sql → ...021-07-07_add_wind_solar_ratio_column.sql b/...021-07-07_add_wind_solar_ratio_column.sql → ...021-07-07_add_wind_solar_ratio_column.sql
diff --git a/...e/2021-07-29_create_low_hydro_scenario.py → ...e/2021-07-29_create_low_hydro_scenario.py b/...e/2021-07-29_create_low_hydro_scenario.py → ...e/2021-07-29_create_low_hydro_scenario.py
diff --git a/...se/2021-07-30_create_no_hydro_scenario.py → ...se/2021-07-30_create_no_hydro_scenario.py b/...se/2021-07-30_create_no_hydro_scenario.py → ...se/2021-07-30_create_no_hydro_scenario.py
diff --git a/.../2021-08-02_create_half_hydro_scenario.py → .../2021-08-02_create_half_hydro_scenario.py b/.../2021-08-02_create_half_hydro_scenario.py → .../2021-08-02_create_half_hydro_scenario.py
diff --git a/...base/2021-11-24_add_DOE_wave_scenario.sql → ...base/2021-11-24_add_DOE_wave_scenario.sql b/...base/2021-11-24_add_DOE_wave_scenario.sql → ...base/2021-11-24_add_DOE_wave_scenario.sql
diff --git a/.../2022-10-12_Transmission_scenario_fix.sql → .../2022-10-12_Transmission_scenario_fix.sql b/.../2022-10-12_Transmission_scenario_fix.sql → .../2022-10-12_Transmission_scenario_fix.sql
diff --git a/...ave_energy_and_offshore_wind_data_DOE.sql → ...ave_energy_and_offshore_wind_data_DOE.sql b/...ave_energy_and_offshore_wind_data_DOE.sql → ...ave_energy_and_offshore_wind_data_DOE.sql
diff --git a/...9_new_wave_energy_offshore_wind_sites.sql → ...9_new_wave_energy_offshore_wind_sites.sql b/...9_new_wave_energy_offshore_wind_sites.sql → ...9_new_wave_energy_offshore_wind_sites.sql
diff --git a/.../2022_04_20_wave_offshore_data_switch.sql → .../2022_04_20_wave_offshore_data_switch.sql b/.../2022_04_20_wave_offshore_data_switch.sql → .../2022_04_20_wave_offshore_data_switch.sql
diff --git a/...ve_energy_offshore_wind_data_high_res.sql → ...ve_energy_offshore_wind_data_high_res.sql b/...ve_energy_offshore_wind_data_high_res.sql → ...ve_energy_offshore_wind_data_high_res.sql
diff --git a/...e_energy_offshore_wind_cost_scenarios.sql → ...e_energy_offshore_wind_cost_scenarios.sql b/...e_energy_offshore_wind_cost_scenarios.sql → ...e_energy_offshore_wind_cost_scenarios.sql
diff --git a/...e_energy_offshore_wind_cost_scenarios.sql → ...e_energy_offshore_wind_cost_scenarios.sql b/...e_energy_offshore_wind_cost_scenarios.sql → ...e_energy_offshore_wind_cost_scenarios.sql
diff --git a/...ase/2022_09_09_GridLab_scenarios_2035.sql → ...ase/2022_09_09_GridLab_scenarios_2035.sql b/...ase/2022_09_09_GridLab_scenarios_2035.sql → ...ase/2022_09_09_GridLab_scenarios_2035.sql
diff --git a/database/2022_09_23_new_demands_gridlab.sql → ...tabase/2022_09_23_new_demands_gridlab.sql b/database/2022_09_23_new_demands_gridlab.sql → ...tabase/2022_09_23_new_demands_gridlab.sql
diff --git a/database/README.md → switch_model/wecc/database/README.md b/database/README.md → switch_model/wecc/database/README.md
diff --git a/database/TEMPLATE.sql → switch_model/wecc/database/TEMPLATE.sql b/database/TEMPLATE.sql → switch_model/wecc/database/TEMPLATE.sql
diff --git a/...d_proposed_generation_to_existing_gen.sql → ...d_proposed_generation_to_existing_gen.sql b/...d_proposed_generation_to_existing_gen.sql → ...d_proposed_generation_to_existing_gen.sql
diff --git a/..._and_hydro_for_retirements_full_model.Rmd → ..._and_hydro_for_retirements_full_model.Rmd b/..._and_hydro_for_retirements_full_model.Rmd → ..._and_hydro_for_retirements_full_model.Rmd
diff --git a/...C_and_Alberta_Total_Monthly_Hydro_gen.csv → ...C_and_Alberta_Total_Monthly_Hydro_gen.csv b/...C_and_Alberta_Total_Monthly_Hydro_gen.csv → ...C_and_Alberta_Total_Monthly_Hydro_gen.csv
diff --git a/...a/Canada_installed_capacity_2006_2017.csv → ...a/Canada_installed_capacity_2006_2017.csv b/...a/Canada_installed_capacity_2006_2017.csv → ...a/Canada_installed_capacity_2006_2017.csv
diff --git a/...da Installed Capacity with AMPL data.xlsx → ...da Installed Capacity with AMPL data.xlsx b/...da Installed Capacity with AMPL data.xlsx → ...da Installed Capacity with AMPL data.xlsx
diff --git a/...co_data/existing_plants_from_AMPL.tab.csv → ...co_data/existing_plants_from_AMPL.tab.csv b/...co_data/existing_plants_from_AMPL.tab.csv → ...co_data/existing_plants_from_AMPL.tab.csv
diff --git a/...co_data/hydro_repeat_median_yr_query.xlsx → ...co_data/hydro_repeat_median_yr_query.xlsx b/...co_data/hydro_repeat_median_yr_query.xlsx → ...co_data/hydro_repeat_median_yr_query.xlsx
diff --git a/...exico_data/old and new generator ids .csv → ...exico_data/old and new generator ids .csv b/...exico_data/old and new generator ids .csv → ...exico_data/old and new generator ids .csv
diff --git a/...e_creation/Canada_Mexico_data/old and new generator ids from AMPL Canada and Mex gen.xlsx b/...e_creation/Canada_Mexico_data/old and new generator ids from AMPL Canada and Mex gen.xlsx
diff --git a/...reation/Make_new_baseline_scenario_id.sql → ...reation/Make_new_baseline_scenario_id.sql b/...reation/Make_new_baseline_scenario_id.sql → ...reation/Make_new_baseline_scenario_id.sql
diff --git a/database/baseline_creation/New_scenarios.sql → ...abase/baseline_creation/New_scenarios.sql b/database/baseline_creation/New_scenarios.sql → ...abase/baseline_creation/New_scenarios.sql
diff --git a/...anada_Mex_attributes_to_new_gen_plant.sql → ...anada_Mex_attributes_to_new_gen_plant.sql b/...anada_Mex_attributes_to_new_gen_plant.sql → ...anada_Mex_attributes_to_new_gen_plant.sql
diff --git a/...eries_to_copy_hydro_avg_gen_2010_2070.sql → ...eries_to_copy_hydro_avg_gen_2010_2070.sql b/...eries_to_copy_hydro_avg_gen_2010_2070.sql → ...eries_to_copy_hydro_avg_gen_2010_2070.sql
diff --git a/...s_to_copy_hydro_median_year_2010_2070.sql → ...s_to_copy_hydro_median_year_2010_2070.sql b/...s_to_copy_hydro_median_year_2010_2070.sql → ...s_to_copy_hydro_median_year_2010_2070.sql
diff --git a/..._creation/Query_to_add_Canada_Mex_gen.sql → ..._creation/Query_to_add_Canada_Mex_gen.sql b/..._creation/Query_to_add_Canada_Mex_gen.sql → ..._creation/Query_to_add_Canada_Mex_gen.sql
diff --git a/database/baseline_creation/README.md → ...wecc/database/baseline_creation/README.md b/database/baseline_creation/README.md → ...wecc/database/baseline_creation/README.md
diff --git a/...maining_gen_plant_data_cleaning_steps.sql → ...maining_gen_plant_data_cleaning_steps.sql b/...maining_gen_plant_data_cleaning_steps.sql → ...maining_gen_plant_data_cleaning_steps.sql
diff --git a/...tion/Remove_CAES_generators_and_costs.sql → ...tion/Remove_CAES_generators_and_costs.sql b/...tion/Remove_CAES_generators_and_costs.sql → ...tion/Remove_CAES_generators_and_costs.sql
diff --git a/...names_between_EIA_and_AMPL_generators.sql → ...names_between_EIA_and_AMPL_generators.sql b/...names_between_EIA_and_AMPL_generators.sql → ...names_between_EIA_and_AMPL_generators.sql
diff --git a/...ble_for_WECC_avg_hydropower_2004_2018.sql → ...ble_for_WECC_avg_hydropower_2004_2018.sql b/...ble_for_WECC_avg_hydropower_2004_2018.sql → ...ble_for_WECC_avg_hydropower_2004_2018.sql
diff --git a/...ation/Table_for_WECC_hydropower_years.sql → ...ation/Table_for_WECC_hydropower_years.sql b/...ation/Table_for_WECC_hydropower_years.sql → ...ation/Table_for_WECC_hydropower_years.sql
diff --git a/...ity_factors with candidate generators.sql → ...ity_factors with candidate generators.sql b/...ity_factors with candidate generators.sql → ...ity_factors with candidate generators.sql
diff --git a/...ne_creation/Update_costs_for_baseline.sql → ...ne_creation/Update_costs_for_baseline.sql b/...ne_creation/Update_costs_for_baseline.sql → ...ne_creation/Update_costs_for_baseline.sql
diff --git a/...eline_creation/carbon_cap_scenario_90.csv → ...eline_creation/carbon_cap_scenario_90.csv b/...eline_creation/carbon_cap_scenario_90.csv → ...eline_creation/carbon_cap_scenario_90.csv
diff --git a/...eline_creation/carbon_cap_scenario_91.csv → ...eline_creation/carbon_cap_scenario_91.csv b/...eline_creation/carbon_cap_scenario_91.csv → ...eline_creation/carbon_cap_scenario_91.csv
diff --git a/..._creation/carbon_cap_scenario_91_new.xlsx → ..._creation/carbon_cap_scenario_91_new.xlsx b/..._creation/carbon_cap_scenario_91_new.xlsx → ..._creation/carbon_cap_scenario_91_new.xlsx
diff --git a/...on/get_inputs_good_JS_python2_baseline.py → ...on/get_inputs_good_JS_python2_baseline.py b/...on/get_inputs_good_JS_python2_baseline.py → ...on/get_inputs_good_JS_python2_baseline.py
diff --git a/...creation/make_new_carbon_cap_scenario.sql → ...creation/make_new_carbon_cap_scenario.sql b/...creation/make_new_carbon_cap_scenario.sql → ...creation/make_new_carbon_cap_scenario.sql
diff --git a/...seline_creation/make_new_rps_scenario.sql → ...seline_creation/make_new_rps_scenario.sql b/...seline_creation/make_new_rps_scenario.sql → ...seline_creation/make_new_rps_scenario.sql
diff --git a/...y_to_build_variable_cap_factor_inputs.sql → ...y_to_build_variable_cap_factor_inputs.sql b/...y_to_build_variable_cap_factor_inputs.sql → ...y_to_build_variable_cap_factor_inputs.sql
diff --git a/...e/baseline_creation/rps_scenario_id_6.csv → ...e/baseline_creation/rps_scenario_id_6.csv b/...e/baseline_creation/rps_scenario_id_6.csv → ...e/baseline_creation/rps_scenario_id_6.csv
diff --git a/...seline_creation/rps_scenario_id_7_new.csv → ...seline_creation/rps_scenario_id_7_new.csv b/...seline_creation/rps_scenario_id_7_new.csv → ...seline_creation/rps_scenario_id_7_new.csv
diff --git a/...eline_creation/rps_scenario_id_7_new.xlsx → ...eline_creation/rps_scenario_id_7_new.xlsx b/...eline_creation/rps_scenario_id_7_new.xlsx → ...eline_creation/rps_scenario_id_7_new.xlsx
diff --git a/...line_creation/switch_costs_1_ptcitx_2.csv → ...line_creation/switch_costs_1_ptcitx_2.csv b/...line_creation/switch_costs_1_ptcitx_2.csv → ...line_creation/switch_costs_1_ptcitx_2.csv
diff --git a/...base/baseline_creation/switch_costs_2.csv → ...base/baseline_creation/switch_costs_2.csv b/...base/baseline_creation/switch_costs_2.csv → ...base/baseline_creation/switch_costs_2.csv
@@ -1,10 +1,10 @@
-gen_tech,variable_om
-Battery_Storage,0
-Wind,0
-Central_PV,0
-Commercial_PV,0
-Residential_PV,0
-CSP_Trough_6h_Storage,3.5854875
-CCGT,4.499017682
-Gas_Combustion_Turbine,2.161100196
+gen_tech,variable_om
+Battery_Storage,0
+Wind,0
+Central_PV,0
+Commercial_PV,0
+Residential_PV,0
+CSP_Trough_6h_Storage,3.5854875
+CCGT,4.499017682
+Gas_Combustion_Turbine,2.161100196
 Geothermal,0
diff --git a/..._candidate_generator_list_by_scenario.csv → ..._candidate_generator_list_by_scenario.csv b/..._candidate_generator_list_by_scenario.csv → ..._candidate_generator_list_by_scenario.csv
diff --git a/...or_list_by_scenario_additional_params.csv → ...or_list_by_scenario_additional_params.csv b/...or_list_by_scenario_additional_params.csv → ...or_list_by_scenario_additional_params.csv
diff --git a/...tech_energy_source_existing_candidate.csv → ...tech_energy_source_existing_candidate.csv b/...tech_energy_source_existing_candidate.csv → ...tech_energy_source_existing_candidate.csv
diff --git a/...n/testing/compare variable o m costs.xlsx → ...n/testing/compare variable o m costs.xlsx b/...n/testing/compare variable o m costs.xlsx → ...n/testing/compare variable o m costs.xlsx
diff --git a/...gen_tech_energy_source_EIA_AMPL_names.csv → ...gen_tech_energy_source_EIA_AMPL_names.csv b/...gen_tech_energy_source_EIA_AMPL_names.csv → ...gen_tech_energy_source_EIA_AMPL_names.csv
@@ -1,30 +1,30 @@
-gen_tech_EIA,energy_source_EIA,gen_tech_AMPL,energy_source_AMPL
-Battery_Storage,Electricity,,
-BT,Geothermal,,
-CC,Bio_Gas,,
-CC,Gas,,
-CP,Solar,,
-FC,Bio_Gas,,
-FC,Gas,,
-GT,Bio_Gas,,
-GT,DistillateFuelOil,,
-GT,Gas,,
-GT,ResidualFuelOil,,
-HY,Water,,
-IC,Bio_Gas,,
-IC,DistillateFuelOil,,
-IC,Gas,,
-OT,Gas,,
-OT,Waste_Heat,,
-PS,Water,,
-PV,Solar,,
-ST,Bio_Gas,,
-ST,Bio_Liquid,,
-ST,Bio_Solid,,
-ST,Coal,,
-ST,Gas,,
-ST,Geothermal,,
-ST,Solar,,
-ST,Uranium,,
-ST,Waste_Heat,,
+gen_tech_EIA,energy_source_EIA,gen_tech_AMPL,energy_source_AMPL
+Battery_Storage,Electricity,,
+BT,Geothermal,,
+CC,Bio_Gas,,
+CC,Gas,,
+CP,Solar,,
+FC,Bio_Gas,,
+FC,Gas,,
+GT,Bio_Gas,,
+GT,DistillateFuelOil,,
+GT,Gas,,
+GT,ResidualFuelOil,,
+HY,Water,,
+IC,Bio_Gas,,
+IC,DistillateFuelOil,,
+IC,Gas,,
+OT,Gas,,
+OT,Waste_Heat,,
+PS,Water,,
+PV,Solar,,
+ST,Bio_Gas,,
+ST,Bio_Liquid,,
+ST,Bio_Solid,,
+ST,Coal,,
+ST,Gas,,
+ST,Geothermal,,
+ST,Solar,,
+ST,Uranium,,
+ST,Waste_Heat,,
 WT,Wind,,
diff --git a/...en_tech_energy_source_EIA_AMPL_names.xlsx → ...en_tech_energy_source_EIA_AMPL_names.xlsx b/...en_tech_energy_source_EIA_AMPL_names.xlsx → ...en_tech_energy_source_EIA_AMPL_names.xlsx
diff --git a/...reation/testing/orig_cost_scenario_23.csv → ...reation/testing/orig_cost_scenario_23.csv b/...reation/testing/orig_cost_scenario_23.csv → ...reation/testing/orig_cost_scenario_23.csv
diff --git a/...eation/testing/orig_cost_scenario_23.xlsx → ...eation/testing/orig_cost_scenario_23.xlsx b/...eation/testing/orig_cost_scenario_23.xlsx → ...eation/testing/orig_cost_scenario_23.xlsx
diff --git a/...se/baseline_creation/testing/scenario.csv → ...se/baseline_creation/testing/scenario.csv b/...se/baseline_creation/testing/scenario.csv → ...se/baseline_creation/testing/scenario.csv
diff --git a/database/utils/Create a Test Database.md → .../database/utils/Create a Test Database.md b/database/utils/Create a Test Database.md → .../database/utils/Create a Test Database.md
diff --git a/database/utils/get_tables_and_row_count.sql → ...tabase/utils/get_tables_and_row_count.sql b/database/utils/get_tables_and_row_count.sql → ...tabase/utils/get_tables_and_row_count.sql
diff --git a/.../Martin_Staadecker_et_al_2022/__init__.py → .../Martin_Staadecker_et_al_2022/__init__.py b/.../Martin_Staadecker_et_al_2022/__init__.py → .../Martin_Staadecker_et_al_2022/__init__.py
diff --git a/.../Martin_Staadecker_et_al_2022/analysis.py → .../Martin_Staadecker_et_al_2022/analysis.py b/.../Martin_Staadecker_et_al_2022/analysis.py → .../Martin_Staadecker_et_al_2022/analysis.py
diff --git a/...taadecker_et_al_2022/figure-1-baseline.py → ...taadecker_et_al_2022/figure-1-baseline.py b/...taadecker_et_al_2022/figure-1-baseline.py → ...taadecker_et_al_2022/figure-1-baseline.py
diff --git a/...al_2022/figure-2-analysis-of-4-factors.py → ...al_2022/figure-2-analysis-of-4-factors.py b/...al_2022/figure-2-analysis-of-4-factors.py → ...al_2022/figure-2-analysis-of-4-factors.py
diff --git a/...cker_et_al_2022/figure-3-wind-vs-solar.py → ...cker_et_al_2022/figure-3-wind-vs-solar.py b/...cker_et_al_2022/figure-3-wind-vs-solar.py → ...cker_et_al_2022/figure-3-wind-vs-solar.py
diff --git a/...2022/figure-4-baseline-vs-unlimited-tx.py → ...2022/figure-4-baseline-vs-unlimited-tx.py b/...2022/figure-4-baseline-vs-unlimited-tx.py → ...2022/figure-4-baseline-vs-unlimited-tx.py
diff --git a/...l_2022/figure-5-impact-of-ldes-on-grid.py → ...l_2022/figure-5-impact-of-ldes-on-grid.py b/...l_2022/figure-5-impact-of-ldes-on-grid.py → ...l_2022/figure-5-impact-of-ldes-on-grid.py
diff --git a/...l_2022/figure-6-impact-of-ldes-on-cost.py → ...l_2022/figure-6-impact-of-ldes-on-cost.py b/...l_2022/figure-6-impact-of-ldes-on-cost.py → ...l_2022/figure-6-impact-of-ldes-on-cost.py
diff --git a/...al_2022/figure-s1-impact-of-half-hydro.py → ...al_2022/figure-s1-impact-of-half-hydro.py b/...al_2022/figure-s1-impact-of-half-hydro.py → ...al_2022/figure-s1-impact-of-half-hydro.py
diff --git a/..._et_al_2022/figure-s2-impact-of-10x-tx.py → ..._et_al_2022/figure-s2-impact-of-10x-tx.py b/..._et_al_2022/figure-s2-impact-of-10x-tx.py → ..._et_al_2022/figure-s2-impact-of-10x-tx.py
diff --git a/...-state-of-charge-under-different-costs.py → ...-state-of-charge-under-different-costs.py b/...-state-of-charge-under-different-costs.py → ...-state-of-charge-under-different-costs.py
diff --git a/...l_2022/figure-s4-analysis-of-4-factors.py → ...l_2022/figure-s4-analysis-of-4-factors.py b/...l_2022/figure-s4-analysis-of-4-factors.py → ...l_2022/figure-s4-analysis-of-4-factors.py
diff --git a/...et_al_2022/figure-s5-map-of-load-zones.py → ...et_al_2022/figure-s5-map-of-load-zones.py b/...et_al_2022/figure-s5-map-of-load-zones.py → ...et_al_2022/figure-s5-map-of-load-zones.py
diff --git a/.../figure-x1-duration-cdf-cost-scenarios.py → .../figure-x1-duration-cdf-cost-scenarios.py b/.../figure-x1-duration-cdf-cost-scenarios.py → .../figure-x1-duration-cdf-cost-scenarios.py
diff --git a/...x2-duration-cdf-cost-scenarios-ca-only.py → ...x2-duration-cdf-cost-scenarios-ca-only.py b/...x2-duration-cdf-cost-scenarios-ca-only.py → ...x2-duration-cdf-cost-scenarios-ca-only.py
diff --git a/...r_et_al_2022/table-s2-capacity-by-tech.py → ...r_et_al_2022/table-s2-capacity-by-tech.py b/...r_et_al_2022/table-s2-capacity-by-tech.py → ...r_et_al_2022/table-s2-capacity-by-tech.py
diff --git a/..._al_2022/table-s3-lifetime-and-outages.py → ..._al_2022/table-s3-lifetime-and-outages.py b/..._al_2022/table-s3-lifetime-and-outages.py → ..._al_2022/table-s3-lifetime-and-outages.py
diff --git a/...ble-s4-average-candidate-capital-costs.py → ...ble-s4-average-candidate-capital-costs.py b/...ble-s4-average-candidate-capital-costs.py → ...ble-s4-average-candidate-capital-costs.py
diff --git a/papers/Martin_Staadecker_et_al_2022/util.py → ...pers/Martin_Staadecker_et_al_2022/util.py b/papers/Martin_Staadecker_et_al_2022/util.py → ...pers/Martin_Staadecker_et_al_2022/util.py