Merge branch 'wecc' into update_transmission_lifetime

Author: pesap

REAM Model Changelog.md

@@ -1,7 +1,7 @@
 # REAM Model Breaking Changes
 
 This file specifies the breaking changes that we have done to the model.
-A breaking change is any change that would change the results of previously
+A breaking change is any change that might change the results of previously
 completed runs.
 
 ## List of breaking changes to model
@@ -18,4 +18,5 @@ Changes are listed from oldest (first line) to newest (last line of table).
 | #68 | June 2021 | Change financial params to 2018 dollars & 5% interest rate. Start using terrain multipliers (which now include the economic multiplier). |
 | #72 | July 2021 | Drop build and O&M costs of existing transmission lines. |
 | #89 | August 2021 | Change hydro module average flow constraint to a monthly constraint rather than per timeseries and change it to a <= rather than ==. |
-| #90 | August 2021 | Change the lifetime of transmission lines from 20yr to 85yr |
+| #90 | August 2021 | Change the lifetime of transmission lines from 20yr to 85yr |
+| #117 | January 2022 | Revert hydro module change (#89) to disallow curtailment of hydro (see #114). |

database/2021-11-24_add_DOE_wave_scenario.sql

@@ -0,0 +1,142 @@
+
+
+-- Shiny + PHG, Nov 24th, 2021
+-- New scenario that includes wave energy candidates (23 locations from 2017 data)
+
+
+-- Ran:
+-- insert into switch.generation_plant_cost_scenario
+-- values(26,'SWITCH 2020 Baseline costs from id 25. DOE_wave', 
+-- 			  'same costs as id 25, and added costs for wave candidates from 2017 data (Deborah S., Brian, PHG), 
+-- 			  Shinys runs');
+
+-- Ran:
+-- select * from switch.generation_plant_cost_scenario;
+
+-- Ran:
+-- insert into switch.generation_plant_cost
+-- select 26 as generation_plant_cost_scenario_id, generation_plant_id, build_year, fixed_o_m, overnight_cost,
+-- storage_energy_capacity_cost_per_mwh
+-- from switch.generation_plant_cost
+-- where generation_plant_cost_scenario_id = 25 -- 25 is the previous baseline scenario used for CEC LDES 2020-2022
+-- union
+-- select 26 as generation_plant_cost_scenario_id, t."GENERATION_PROJECT" as generation_plant_id,
+-- build_year, gen_fixed_om as fixed_o_m, gen_overnight_cost as  overnight_cost,
+-- NULL as storage_energy_capacity_cost_per_mwh
+-- from public.gen_build_costs_wave as t;
+
+-- reality check: -----------------------------------------------------------------------
+-----------------------------------------------------------------------------------------
+-- select *  from switch.generation_plant_cost
+-- join switch.generation_plant using(generation_plant_id)
+-- where generation_plant_cost_scenario_id=25;
+-- and energy_source not in ('Wave');
+
+-- select * 
+-- from switch.generation_plant_cost
+-- where generation_plant_cost_scenario_id = 26;
+
+
+-- -- 303495 rows
+-- select 26 as generation_plant_cost_scenario_id, generation_plant_id, build_year, fixed_o_m, overnight_cost,
+-- storage_energy_capacity_cost_per_mwh
+-- from switch.generation_plant_cost
+-- where generation_plant_cost_scenario_id = 25;
+
+-- -- 828 rows
+-- select 26 as generation_plant_cost_scenario_id, t."GENERATION_PROJECT" as generation_plant_id,
+-- build_year, gen_fixed_om as fixed_o_m, gen_overnight_cost as  overnight_cost,
+-- NULL as storage_energy_capacity_cost_per_mwh
+-- from public.gen_build_costs_wave as t;
+
+
+-- id 25: 303495 rows (2050-2010+1)
+
+-- wave (gen_ids, year) should be 828 rows
+
+-- id 26 should have 303495 + 828 = 304323
+
+-- end of reality check -----------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------------
+
+-- Summary: tables updated: generation_plant_cost_scenario, generation_plant_cost
+
+-- delete from switch.generation_plant_scenario where generation_plant_scenario_id = 24;
+
+-- Ran:
+-- insert into switch.generation_plant_scenario
+-- values(24,
+-- 'EIA-WECC Existing and Proposed 2018 + wave, AMPL Basecase for Canada and Mex, AMPL proposed non-wind plants (only best of solar), Env Screen Wind Cat 3, No CAES',
+-- 	'same as id 22 adding wave energy data from 2017 (Deborah, PHG, Brian), but no Compressed Air Energy Storage gen_tech among candidate generators'
+-- );
+
+select * from switch.generation_plant_scenario;
+
+
+-- 10349 rows
+-- insert into switch.generation_plant_scenario_member
+-- select 24 as generation_plant_scenario_id, t1."GENERATION_PROJECT" as generation_plant_id
+-- from public.generation_projects_info_wave as t1
+-- union
+-- select 24 as generation_plant_scenario_id, generation_plant_id
+-- from switch.generation_plant_scenario_member
+-- where generation_plant_scenario_id=23;
+
+
+select * from switch.generation_plant_scenario_member where generation_plant_scenario_id = 24;
+
+
+
+
+
+
+
+
+-- __________________________________________________________________________________________________
+-- __________________________________________________________________________________________________
+
+-- Ran: new table with wave capacity factors duplicated from 2006 for 2010-2060
+-- drop table public.test_variable_capacity_factors_wave;
+-- create table public.test_variable_capacity_factors_wave(
+-- 	generation_plant_id double precision,
+-- 	capacity_factor double precision,
+-- 	time_stamp_utc text);
+
+
+-- Ran:
+-- do 
+-- $$
+-- begin
+--    for year in 2010..2060 loop
+-- 	raise notice 'year: %', year;
+	
+-- 	insert into public.test_variable_capacity_factors_wave
+-- 	select t."GENERATION_PROJECT" as generation_plant_id, 
+-- 	gen_max_capacity_factor as capacity_factor, 
+-- 	CONCAT(year, TRIM(LEADING '2006' FROM timestamp)) as new_stamp
+-- 	from public.variable_capacity_factors_wave as t;
+--    end loop;
+-- end; 
+-- $$
+
+-- 26280 rows (=(2012-2010+1)*8760)
+-- 10275480 rows ( = (2060-2010+1) * 8760 * 23 )
+-- select * from public.test_variable_capacity_factors_wave;
+
+
+
+
+-- 359,400 (2011 - 2051)
+-- select * from switch.variable_capacity_factors_exist_and_candidate_gen 
+-- where generation_plant_id = 1191183122
+-- order by timestamp_utc asc;
+
+-- continue here:
+-- 8,260,680 rows  = (2051-2011+1) * 8760 * 23 
+insert into switch.variable_capacity_factors_exist_and_candidate_gen
+select t.generation_plant_id as generation_plant_id, raw_timepoint_id, t2.timestamp_utc,
+t.capacity_factor as capacity_factor, 1 as is_new_cap_factor
+from public.test_variable_capacity_factors_wave as t
+join switch.variable_capacity_factors_exist_and_candidate_gen as t2 on (t.time_stamp_utc=to_char(t2.timestamp_utc, 'YYYY-MM-DD HH24:MI:SS'))
+where t2.generation_plant_id=1191183122 -- random plant_id chosen to match raw_timepoint_id
+order by 1,2 desc;

docs/Database.md

@@ -41,8 +41,18 @@ The command to enter PostgreSQL while SSH'd into the server is `psql wecc`.
 
 ## Making changes to the database
 
-Whether it's adding data to the database or changing its schema, it's important
-to proceed carefully when making changes to the database. Always make sure to
+### Common operations
+
+Some database changes are common operations that are used repeatedly.
+For these operations, it's helpful to make a command line tool to make the process easy.
+
+For example, adding a scenario to the database is a common operation. Therefore, we have built
+the `switch db save_scenario` command to easily do this. (Run `switch db save_scenario --help` for details).
+
+### Custom operations
+
+When running custom operations on the database it's very important
+to proceed carefully. Always make sure to
 **test and keep track of your changes**.
 
 Here are the steps to make a change.
@@ -61,9 +71,7 @@ to the convention `YYYY-MM-DD_<script_name>`.
 5. Open a pull request to add your script to the repository (see [`docs/Contribute.md`](Contribute.md))
 so we can keep track of the changes that have been made.
 
-### Bigger changes
-
-Sometimes, it isn't feasible to have your entire change as a single SQL script.
+Note that sometimes, it isn't feasible to have your entire change as a single SQL script.
 One way to make bigger changes is to use a Python script. Use the same process
 as for the SQL scripts. That is save your Python scripts in the `/database` folder.