Skip to content

Commit 971c211

Browse files
authored
Merge pull request #221 from iiasa/costs/reconfig-modules
Reconfigure usage of technology modules in `tools.costs`
2 parents 4d8ec92 + df31a55 commit 971c211

11 files changed

+439
-605
lines changed

doc/whatsnew.rst

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ Next release
99
- 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`).
1010
- Update :doc:`/transport/index` (:pull:`213`).
1111
- Add "LED", "SSP4", and "SSP5" as values for the :program:`--ssp=…` option in :func:`.common_params` (:pull:`233`).
12-
- Fix and update :doc:`/api/tools-costs` (:pull:`219`, :pull:`206`)
12+
- Fix and update :doc:`/api/tools-costs` (:pull:`219`, :pull:`206`, :pull:`221`)
1313

1414
- Fix naming of GDP and population columns in SSP data aggregation (:pull:`219`).
1515
- Edit inputs for storage, CSP, hydrogen, and industry technologies (:pull:`206`).
1616
- Replace solar and wind technologies with new ones (:pull:`206`).
17+
- Reorganize input files and incorporate `first_year.csv` data into `tech_map.csv` (:pull:`221`).
18+
- Reconfigure use and implementation of technology variants/modules to be more agnostic (:pull:`221`).
1719

1820
v2024.8.6
1921
=========

message_ix_models/data/costs/energy/first_year_energy.csv

-91
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# The base year costs and WEO mappings are taken from the following file: ,,,,,
2+
# https://github.com/iiasa/message_data/blob/dev/data/model/investment_cost/doc/NAM_technology_cost_input_20200507.xlsx,,,,,
3+
# If base_year_reference_region_cost is blank then the 2021 WEO cost from the mapped technology is used in its place.,,,,,
4+
# Data on the first year was directly copied from the NAM_SSP2 sheet in https://github.com/iiasa/message_data/blob/dev/data/model/investment_cost/SSP1_techinput.xlsx,,,,,
5+
message_technology,reg_diff_source,reg_diff_technology,base_year_reference_region_cost,fix_ratio,first_year_original
6+
bio_hpl,weo,bioenergy_medium_chp,275,,
7+
bio_istig,weo,igcc,4064,,2010
8+
bio_istig_ccs,weo,igcc_ccs,5883,,2030
9+
bio_ppl,weo,bioenergy_large,2025,,2005
10+
bio_ppl_co2scr,weo,igcc_ccs,1466,,2030
11+
biomass_i,weo,bioenergy_medium_chp,250,,1985
12+
c_ppl_co2scr,weo,pulverized_coal_ccs,1222,,2030
13+
coal_adv,weo,steam_coal_supercritical,1701,,2010
14+
coal_adv_ccs,weo,pulverized_coal_ccs,4536,,2030
15+
coal_gas,weo,igcc,850,,
16+
coal_hpl,weo,steam_coal_subcritical,275,,
17+
coal_i,weo,steam_coal_subcritical,170,,1985
18+
coal_ppl,weo,steam_coal_subcritical,1458,,2005
19+
coal_ppl_u,weo,steam_coal_subcritical,1016,,2005
20+
csp_sm1_ppl,weo,csp,4609,,2010
21+
csp_sm3_ppl,weo,csp,9932,,2010
22+
elec_i,weo,ccgt_chp,50,,1985
23+
eth_bio,weo,igcc,2614,,2005
24+
eth_bio_ccs,weo,igcc_ccs,3941,,2030
25+
eth_i,weo,bioenergy_medium_chp,93,,2010
26+
foil_hpl,weo,ccgt_chp,155,,
27+
foil_i,weo,ccgt_chp,107,,1985
28+
foil_ppl,weo,ccgt_chp,730,,
29+
g_ppl_co2scr,weo,ccgt_ccs,751,,2030
30+
gas_bio,weo,bioenergy_large,670,,
31+
gas_cc,weo,ccgt,810,,2005
32+
gas_cc_ccs,weo,ccgt_ccs,2511,,2030
33+
gas_ct,weo,gas_turbine,405,,2005
34+
gas_hpl,weo,gas_turbine,95,,
35+
gas_i,weo,gas_turbine,97,,1985
36+
gas_ppl,weo,gas_turbine,1205,,2005
37+
geo_hpl,weo,geothermal,1500,,1986
38+
geo_ppl,weo,geothermal,2928,,2005
39+
h2_bio,weo,igcc,3744,,2020
40+
h2_bio_ccs,weo,igcc,3824,,2030
41+
h2_coal,weo,igcc,2163,,2010
42+
h2_coal_ccs,weo,igcc,2252,,2030
43+
h2_elec,weo,csp,1139,,2010
44+
h2_fc_I,weo,fuel_cell,3500,,
45+
h2_fc_RC,weo,fuel_cell,3500,,
46+
h2_fc_trp,weo,fuel_cell,3500,,
47+
h2_i,weo,ccgt_chp,97,,2030
48+
h2_liq,weo,igcc,820,,
49+
h2_smr,weo,igcc,737,,2010
50+
h2_smr_ccs,weo,igcc_ccs,1361,,2030
51+
heat_i,weo,ccgt_chp,50,,1985
52+
hp_el_i,weo,ccgt_chp,800,,2010
53+
hp_gas_i,weo,ccgt_chp,880,,2010
54+
hydro_hc,weo,hydropower_small,3280,,2005
55+
hydro_lc,weo,hydropower_large,2187,,2005
56+
igcc,weo,igcc,2106,,2010
57+
igcc_ccs,weo,igcc_ccs,4819,,2030
58+
liq_bio,weo,igcc,4264,,2020
59+
liq_bio_ccs,weo,igcc,4344,,2030
60+
loil_cc,weo,igcc,800,,
61+
loil_i,weo,ccgt_chp,93,,1985
62+
loil_ppl,weo,igcc,600,,
63+
meth_coal,weo,igcc,2348,,2020
64+
meth_coal_ccs,weo,igcc,2385,,2030
65+
meth_i,weo,gas_turbine,93,,2010
66+
meth_ng,weo,igcc,1234,,2020
67+
meth_ng_ccs,weo,igcc,1339,,2030
68+
nuc_hc,weo,nuclear,5000,,2005
69+
nuc_lc,weo,nuclear,3800,,2005
70+
solar_i,weo,solarpv_buildings,737,,2010
71+
solar_pv_I,weo,solarpv_buildings,1189,,2005
72+
solar_pv_RC,weo,solarpv_buildings,,,2005
73+
solar_res1,weo,solarpv_large,,,2020
74+
solar_res2,weo,solarpv_large,,,2020
75+
solar_res3,weo,solarpv_large,,,2020
76+
solar_res4,weo,solarpv_large,,,2020
77+
solar_res5,weo,solarpv_large,,,2020
78+
solar_res6,weo,solarpv_large,,,2020
79+
solar_res7,weo,solarpv_large,,,2020
80+
solar_res8,weo,solarpv_large,,,2020
81+
solar_res_hist_2005,weo,solarpv_large,,,2020
82+
solar_res_hist_2010,weo,solarpv_large,,,2020
83+
solar_res_hist_2015,weo,solarpv_large,,,2020
84+
solar_res_hist_2020,weo,solarpv_large,,,2020
85+
solar_th_ppl,weo,csp,969,,2005
86+
stor_ppl,weo,csp,800,,2005
87+
syn_liq,weo,igcc,3224,,2020
88+
syn_liq_ccs,weo,igcc,3268,,2030
89+
wind_ref1,weo,wind_offshore,1771,,2020
90+
wind_ref2,weo,wind_offshore,1771,,2020
91+
wind_ref3,weo,wind_offshore,1771,,2020
92+
wind_ref4,weo,wind_offshore,1771,,2020
93+
wind_ref5,weo,wind_offshore,1771,,2020
94+
wind_ref_hist_2005,weo,wind_offshore,1771,,2020
95+
wind_ref_hist_2010,weo,wind_offshore,1771,,2020
96+
wind_ref_hist_2015,weo,wind_offshore,1771,,2020
97+
wind_ref_hist_2020,weo,wind_offshore,1771,,2020
98+
wind_res1,weo,wind_onshore,1181,,2020
99+
wind_res2,weo,wind_onshore,1181,,2020
100+
wind_res3,weo,wind_onshore,1181,,2020
101+
wind_res4,weo,wind_onshore,1181,,2020
102+
wind_res_hist_2005,weo,wind_onshore,1181,,2020
103+
wind_res_hist_2010,weo,wind_onshore,1181,,2020
104+
wind_res_hist_2015,weo,wind_onshore,1181,,2020
105+
wind_res_hist_2020,weo,wind_onshore,1181,,2020

message_ix_models/data/costs/energy/tech_map_energy.csv

-104
This file was deleted.

0 commit comments

Comments
 (0)