Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change technology inputs and replace solar + wind technologies in tools.costs #206

Merged
merged 19 commits into from
Sep 26, 2024
Merged

Change technology inputs and replace solar + wind technologies in tools.costs #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
40ec2f9
Made changes to inputs related to storage, CSP, hydrogen, and industr…
measrainsey Jul 5, 2024
2be77ec
Replace solar_pv_ppl with new solar technologies
measrainsey Jul 16, 2024
54493fa
Replace wind_ppl with new onshore wind technologies
measrainsey Jul 16, 2024
2c11820
Replace wind_ppf with new offshore wind technologies
measrainsey Jul 16, 2024
3e7d607
Sort all energy module input CSVs alphabetically
measrainsey Jul 16, 2024
9deda88
Update doc/whatsnew
measrainsey Jul 16, 2024
5e7e25d
Replace old wind and solar technologies in tests
measrainsey Jul 24, 2024
055aaba
Add solar_res8, solar_res_hist, wind_res_hist, and wind_ref_hist to d…
measrainsey Jul 24, 2024
82e7153
Change number of technologies from 377 to 381 in `tests.model`
measrainsey Jul 24, 2024
3586163
Add year bins for _res_hist technologies in input CSVs
measrainsey Jul 31, 2024
7a8e437
Add binned technologies to data/technology.yaml
measrainsey Jul 31, 2024
16b9a5f
Update number of technologies in `tests.model` to 390
measrainsey Jul 31, 2024
25ed322
Add PR number to doc/whatsnew
measrainsey Aug 1, 2024
1428a7e
Remove wind_ppf technology from input
measrainsey Aug 13, 2024
96da4e0
Move whatsnew to next release
measrainsey Aug 21, 2024
9ae6cda
Update doc/whatsnew
measrainsey Sep 2, 2024
aaccd3f
Remove entry from previous release in doc/whatsnew
measrainsey Sep 11, 2024
74a8051
Remove duplicate entry in doc/whatsnew
measrainsey Sep 11, 2024
1788b18
Update doc/whatsnew again after rebasing
measrainsey Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions doc/whatsnew.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ Next release
- Add :doc:`/project/circeular` project code and documentation (:pull:`232`).
- Update water availability data and major code editing to allow a new test suite for the water module (:pull:`106`).
- Expand :doc:`repro` with sections on :ref:`repro-doc` and :ref:`versioning`, including :ref:`a list of external model names and ‘versions’ <model-names>` like “MESSAGEix-GLOBIOM 2.0” (:issue:`224`, :pull:`226`).
- Fix and update :doc:`/api/tools-costs` (:pull:`219`)

- Fix naming of GDP and population columns in SSP data aggregation.

- Update :doc:`/transport/index` (:pull:`213`).
- Add "LED", "SSP4", and "SSP5" as values for the :program:`--ssp=…` option in :func:`.common_params` (:pull:`233`).
- Fix and update :doc:`/api/tools-costs` (:pull:`219`, :pull:`206`)

- Fix naming of GDP and population columns in SSP data aggregation (:pull:`219`).
- Edit inputs for storage, CSP, hydrogen, and industry technologies (:pull:`206`).
- Replace solar and wind technologies with new ones (:pull:`206`).

v2024.8.6
=========
Expand Down
122 changes: 74 additions & 48 deletions message_ix_models/data/costs/energy/cost_reduction_energy.csv
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,64 +7,90 @@
# The initial copied data can be found in gea_reduction_rates.csv,,,,,,
# This file renames the learning rates from GEAL to low and GEAM to medium and GEAH to high,,,,,,
message_technology,technology_type,very_low,low,medium,high,very_high
coal_ppl,Coal,0,0,0.2,0.5,0.7
gas_ppl,Gas/Oil,0.1,0.2,0.29,0.38,0.5
gas_ct,Gas/Oil,0.1,0.2,0.29,0.38,0.5
gas_cc,Gas/Oil,0.1,0.2,0.29,0.38,0.5
bio_istig,Biomass,0,0.1,0.3,0.4,0.5
bio_istig_ccs,CCS,0,0.1,0.3,0.4,0.6
bio_ppl,Biomass,0,0.1,0.2,0.3,0.4
bio_ppl_co2scr,CCS,0,0,0,0.3,0.4
biomass_i,Biomass,0,0,0,0,0
c_ppl_co2scr,CCS,0,0,0,0.3,0.4
coal_adv,Coal,0,0.1,0.3,0.5,0.7
igcc,Coal,0,0.1,0.3,0.5,0.7
bio_istig,Biomass,0,0.1,0.3,0.4,0.5
coal_adv_ccs,CCS,0,0.1,0.3,0.5,0.7
igcc_ccs,CCS,0,0.1,0.3,0.5,0.7
gas_cc_ccs,CCS,0.1,0.2,0.29,0.5,0.7
bio_istig_ccs,CCS,0,0.1,0.3,0.4,0.6
syn_liq,Coal,0,0.05,0.1,0.15,0.2
meth_coal,Coal,0,0.05,0.1,0.15,0.2
syn_liq_ccs,CCS,0,0.05,0.1,0.15,0.2
meth_coal_ccs,CCS,0,0.05,0.1,0.15,0.2
h2_coal,Coal,0,0.25,0.4,0.4,0.5
h2_smr,Gas/Oil,0,0.25,0.4,0.5,0.7
h2_bio,Biomass,0,0.25,0.4,0.5,0.7
h2_coal_ccs,CCS,0,0.25,0.4,0.4,0.5
h2_smr_ccs,CCS,0,0.25,0.4,0.5,0.7
h2_bio_ccs,CCS,0,0.25,0.4,0.5,0.7
coal_i,Coal,0,0,0,0,0
coal_ppl,Coal,0,0,0.2,0.5,0.7
coal_ppl_u,Coal,0,0,0,0,0
csp_sm1_ppl,Renewable,0.15,0.3,0.3,0.5,0.7
csp_sm3_ppl,Renewable,0.15,0.3,0.3,0.5,0.7
elec_i,NA,0,0,0,0,0
eth_bio,Biomass,0,0.27,0.27,0.4,0.55
eth_bio_ccs,CCS,0,0.27,0.27,0.4,0.55
c_ppl_co2scr,CCS,0,0,0,0.3,0.4
eth_i,Biomass,0,0,0,0,0
foil_i,Gas/Oil,0,0,0,0,0
g_ppl_co2scr,CCS,0,0,0,0.3,0.4
bio_ppl_co2scr,CCS,0,0,0,0.3,0.4
wind_ppl,Renewable,0.15,0.3,0.53,0.65,0.75
solar_th_ppl,Renewable,0.15,0.3,0.3,0.5,0.7
solar_pv_I,Renewable,0.15,0.3,0.7,0.9,0.95
solar_pv_RC,Renewable,0.15,0.3,0.7,0.9,0.95
solar_pv_ppl,Renewable,0.15,0.3,0.7,0.9,0.95
gas_cc,Gas/Oil,0.1,0.2,0.29,0.38,0.5
gas_cc_ccs,CCS,0.1,0.2,0.29,0.5,0.7
gas_ct,Gas/Oil,0.1,0.2,0.29,0.38,0.5
gas_i,Gas/Oil,0,0,0,0,0
gas_ppl,Gas/Oil,0.1,0.2,0.29,0.38,0.5
geo_hpl,Renewable,0.1,0.15,0.18,0.25,0.35
geo_ppl,Renewable,0,0.1,0.18,0.25,0.35
hydro_lc,Renewable,0,0,0,0,0
hydro_hc,Renewable,0,0,0,0,0
meth_ng,Gas/Oil,0,0.05,0.1,0.15,0.2
meth_ng_ccs,CCS,0,0.05,0.1,0.15,0.2
coal_ppl_u,Coal,0,0,0,0,0
stor_ppl,Renewable,0.1,0.2,0.25,0.4,0.5
h2_bio,Biomass,0,0.25,0.4,0.5,0.7
h2_bio_ccs,CCS,0,0.25,0.4,0.5,0.7
h2_coal,Coal,0,0.25,0.4,0.4,0.5
h2_coal_ccs,CCS,0,0.25,0.4,0.4,0.5
h2_elec,Renewable,0,0,0.1,0.2,0.3
h2_i,NA,0,0,0,0,0
h2_smr,Gas/Oil,0,0.25,0.4,0.5,0.7
h2_smr_ccs,CCS,0,0.25,0.4,0.5,0.7
heat_i,NA,0,0,0,0,0
hp_el_i,Renewable,0.1,0.2,0.5,0.5,0.6
hp_gas_i,Gas/Oil,0.1,0.2,0.4,0.4,0.5
hydro_hc,Renewable,0,0,0,0,0
hydro_lc,Renewable,0,0,0,0,0
igcc,Coal,0,0.1,0.3,0.5,0.7
igcc_ccs,CCS,0,0.1,0.3,0.5,0.7
liq_bio,Biomass,0.15,0.27,0.27,0.4,0.55
liq_bio_ccs,CCS,0.15,0.27,0.27,0.4,0.55
coal_i,Coal,0,0,0,0,0
foil_i,Gas/Oil,0,0,0,0,0
loil_i,Gas/Oil,0,0,0,0,0
gas_i,Gas/Oil,0,0,0,0,0
biomass_i,Biomass,0,0,0,0,0
eth_i,Biomass,0,0,0,0,0
meth_coal,Coal,0,0.05,0.1,0.15,0.2
meth_coal_ccs,CCS,0,0.05,0.1,0.15,0.2
meth_i,Coal,0,0,0,0,0
elec_i,NA,0,0,0,0,0
h2_i,NA,0,0,0,0,0
hp_el_i,Renewable,0.1,0.2,0.5,0.5,0.6
hp_gas_i,Gas/Oil,0.1,0.2,0.4,0.4,0.5
solar_i,Renewable,0.1,0.2,0.6,0.9,0.95
heat_i,NA,0,0,0,0,0
geo_hpl,Renewable,0.1,0.15,0.18,0.25,0.35
nuc_lc,Nuclear,0,0,0,0,0
meth_ng,Gas/Oil,0,0.05,0.1,0.15,0.2
meth_ng_ccs,CCS,0,0.05,0.1,0.15,0.2
nuc_hc,Nuclear,0,0,0.15,0.3,0.45
wind_ppf,Renewable,0.15,0.3,0.53,0.65,0.75
csp_sm1_ppl,NA,0,0,0,0,0
csp_sm3_ppl,NA,0,0,0,0,0
nuc_lc,Nuclear,0,0,0,0,0
solar_i,Renewable,0.1,0.2,0.6,0.9,0.95
solar_pv_I,Renewable,0.15,0.3,0.7,0.9,0.95
solar_pv_RC,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res_hist_2005,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res_hist_2010,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res_hist_2015,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res_hist_2020,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res1,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res2,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res3,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res4,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res5,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res6,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res7,Renewable,0.15,0.3,0.7,0.9,0.95
solar_res8,Renewable,0.15,0.3,0.7,0.9,0.95
solar_th_ppl,Renewable,0.15,0.3,0.3,0.5,0.7
stor_ppl,Renewable,0.15,0.3,0.7,0.9,0.95
syn_liq,Coal,0,0.05,0.1,0.15,0.2
syn_liq_ccs,CCS,0,0.05,0.1,0.15,0.2
wind_ref_hist_2005,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref_hist_2010,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref_hist_2015,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref_hist_2020,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref1,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref2,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref3,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref4,Renewable,0.15,0.3,0.53,0.65,0.75
wind_ref5,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res_hist_2005,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res_hist_2010,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res_hist_2015,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res_hist_2020,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res1,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res2,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res3,Renewable,0.15,0.3,0.53,0.65,0.75
wind_res4,Renewable,0.15,0.3,0.53,0.65,0.75
122 changes: 74 additions & 48 deletions message_ix_models/data/costs/energy/first_year_energy.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,90 @@
#,
"# This data was directly copied from the ""NAM_SSP2"" sheet in https://github.com/iiasa/message_data/blob/dev/data/model/investment_cost/SSP1_techinput.xlsx",
message_technology,first_year_original
coal_ppl,2005
gas_ppl,2005
gas_ct,2005
gas_cc,2005
bio_istig,2010
bio_istig_ccs,2030
bio_ppl,2005
bio_ppl_co2scr,2030
biomass_i,1985
c_ppl_co2scr,2030
coal_adv,2010
igcc,2010
bio_istig,2010
coal_adv_ccs,2030
igcc_ccs,2030
gas_cc_ccs,2030
bio_istig_ccs,2030
syn_liq,2020
meth_coal,2020
syn_liq_ccs,2030
meth_coal_ccs,2030
h2_coal,2010
h2_smr,2010
h2_bio,2020
h2_coal_ccs,2030
h2_smr_ccs,2030
h2_bio_ccs,2030
coal_i,1985
coal_ppl,2005
coal_ppl_u,2005
csp_sm1_ppl,2010
csp_sm3_ppl,2010
elec_i,1985
eth_bio,2005
eth_bio_ccs,2030
c_ppl_co2scr,2030
eth_i,2010
foil_i,1985
g_ppl_co2scr,2030
bio_ppl_co2scr,2030
wind_ppl,2020
wind_ppf,2020
solar_th_ppl,2005
solar_pv_I,2005
solar_pv_RC,2005
solar_pv_ppl,2020
gas_cc,2005
gas_cc_ccs,2030
gas_ct,2005
gas_i,1985
gas_ppl,2005
geo_hpl,1986
geo_ppl,2005
hydro_lc,2005
hydro_hc,2005
meth_ng,2020
meth_ng_ccs,2030
coal_ppl_u,2005
stor_ppl,2005
h2_bio,2020
h2_bio_ccs,2030
h2_coal,2010
h2_coal_ccs,2030
h2_elec,2010
h2_i,2030
h2_smr,2010
h2_smr_ccs,2030
heat_i,1985
hp_el_i,2010
hp_gas_i,2010
hydro_hc,2005
hydro_lc,2005
igcc,2010
igcc_ccs,2030
liq_bio,2020
liq_bio_ccs,2030
coal_i,1985
foil_i,1985
loil_i,1985
gas_i,1985
biomass_i,1985
eth_i,2010
meth_coal,2020
meth_coal_ccs,2030
meth_i,2010
elec_i,1985
h2_i,2030
hp_el_i,2010
hp_gas_i,2010
solar_i,2010
heat_i,1985
geo_hpl,1986
nuc_lc,2005
meth_ng,2020
meth_ng_ccs,2030
nuc_hc,2005
csp_sm1_ppl,2010
csp_sm3_ppl,2010
nuc_lc,2005
solar_i,2010
solar_pv_I,2005
solar_pv_RC,2005
solar_res_hist_2005,2020
solar_res_hist_2010,2020
solar_res_hist_2015,2020
solar_res_hist_2020,2020
solar_res1,2020
solar_res2,2020
solar_res3,2020
solar_res4,2020
solar_res5,2020
solar_res6,2020
solar_res7,2020
solar_res8,2020
solar_th_ppl,2005
stor_ppl,2005
syn_liq,2020
syn_liq_ccs,2030
wind_ref_hist_2005,2020
wind_ref_hist_2010,2020
wind_ref_hist_2015,2020
wind_ref_hist_2020,2020
wind_ref1,2020
wind_ref2,2020
wind_ref3,2020
wind_ref4,2020
wind_ref5,2020
wind_res_hist_2005,2020
wind_res_hist_2010,2020
wind_res_hist_2015,2020
wind_res_hist_2020,2020
wind_res1,2020
wind_res2,2020
wind_res3,2020
wind_res4,2020
Loading
Loading