Skip to content
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
e8ab7e3
Add new materials and industry reporting
macflo8 Nov 5, 2024
78c833f
Correct syntax for materials reporting to change units
OFR-IIASA Nov 7, 2024
9f89779
Extend and rename variable mappings
macflo8 Nov 7, 2024
c54688a
Silence pandas FutureWarnings in reporting
macflo8 Jun 3, 2024
9e7af8a
Improve materials reporting
macflo8 Jun 3, 2024
33a577e
Fix bug in refactored materials reporting function
macflo8 Jun 6, 2024
19a5516
Remove unused context from materials reporting
macflo8 Sep 5, 2024
859044a
Fix methanol final energy allocation bug
macflo8 Nov 21, 2024
2ae90ba
Add exception for LED methanol reporting
macflo8 Dec 9, 2024
af94c79
Exclude pre-firstmodelyear years from material rep
macflo8 Dec 12, 2024
6ccbf03
Fix materials reporting bugs
macflo8 Jan 19, 2025
af99816
Fix Other Sector string manipulation bug
macflo8 Feb 17, 2025
283b045
Fix aggregation of Final Energy Methanol
macflo8 Feb 17, 2025
5b98332
Fix typo in chemicals biomass aggregation
macflo8 Feb 17, 2025
6a1a81f
Set Liquids|Other to 0 after re-allocation
macflo8 Feb 17, 2025
6477e5f
Fix Industry Electricity components
macflo8 Feb 17, 2025
0f78d42
Update reporting to new meth_h2 modes
macflo8 Feb 17, 2025
f54df26
Adjust Materials reporter computation
macflo8 Feb 19, 2025
5a69a35
Fix industry reporting issues
macflo8 Mar 4, 2025
0f9313e
Add missing electricity in ammonia aggregate
macflo8 Mar 4, 2025
b0e6a3f
Fix double counting of high-value chemicals
macflo8 Mar 4, 2025
9bf48d3
Add new rooftop solar technology to reporting
macflo8 Apr 28, 2025
c0596a4
Update Final Energy|Industry|Other Sector
OFR-IIASA Apr 30, 2025
462f622
Add rooftop solar to Industry|Electricity|Solar
OFR-IIASA Apr 30, 2025
84b3e97
Add missing component in ammonia aggregate
macflo8 Apr 30, 2025
4924648
Fix code quality issues in materials reporter
macflo8 Aug 8, 2025
ac3d693
Address mypy error
macflo8 Aug 8, 2025
1a894ba
Test new materials reporter config parser
macflo8 Aug 11, 2025
bb62f52
Simplify materials reporter config parser
macflo8 Aug 11, 2025
74fcd57
Fix materials reporting mapping errors
macflo8 Aug 14, 2025
766849e
Extend docstrings and type hints
macflo8 Aug 21, 2025
700bde5
Update docs
macflo8 Aug 21, 2025
67dba2b
Add "pydantic" to "material" optional dependencies
macflo8 Aug 25, 2025
66b87af
Address inline comments
macflo8 Sep 1, 2025
1f6bfab
Rename materials reporting configs
macflo8 Sep 1, 2025
a28f2a7
Improve methanol Reporter Key definition functions
macflo8 Sep 1, 2025
2690fe6
Extend materials reporter tests
macflo8 Sep 1, 2025
c35c835
Ignore flake8 rules in test_run_reporting
macflo8 Sep 2, 2025
d6eadab
Expand docs for #395
macflo8 Sep 2, 2025
9fae454
Make methanol reporting test pass
macflo8 Sep 2, 2025
dfa5a3b
Resolve formatting issues in docstrings
macflo8 Sep 2, 2025
8a9ebd9
Add guard close in format_reporting_df
macflo8 Sep 2, 2025
20ba0e5
Adjust fe_methanol_ammonia_aggregates.yaml
khaeru Sep 2, 2025
58e3734
Improve .material.report.run_reporting.Config
khaeru Sep 2, 2025
21084b7
Add more test stubs of .material…run_reporting
khaeru Sep 2, 2025
7bf714d
Temporarily XFAIL one test for iiasa/ixmp#595
khaeru Sep 2, 2025
780c8f4
Revise material docs
macflo8 Sep 2, 2025
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
6 changes: 6 additions & 0 deletions doc/material/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ They can be turned on and off individually under ``DATA_FUNCTIONS`` in :mod:`__i
.. automodule:: message_ix_models.model.material.data_methanol
:members:

.. automodule:: message_ix_models.model.material.report.run_reporting
:members:

.. automodule:: message_ix_models.model.material.report.reporter_utils
:members:

Build and solve the model from CLI
==================================

Expand Down
20 changes: 15 additions & 5 deletions doc/material/v1.2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Extensions
- Use of :doc:`/api/tools-costs` for iron/steel production technologies
- New steel projections derived from relationship of macro-economic investment to per capita steel demand
- Regionally differentiated scrap availability from steel finishing and manufacturing based on statistics

Non metallic minerals sector
----------------------------

Expand Down Expand Up @@ -80,16 +81,25 @@ CLI changes
Deprecations
============

- Functionalities of :mod:`.model.material.report.reporting` was replaced by :mod:`.model.material.report.run_reporting`. *Will be removed in the next release.*

New features
============

The following xlsx files have been replaced by multiple csv files for each sheet to facilitate version control and readability:
- The following xlsx files have been replaced by multiple csv files for each sheet to facilitate version control and readability:

- :file:`aluminum_techno_economic.xlsx`
- :file:`Global_cement_MESSAGE.xlsx`
- :file:`Global_steel_MESSAGE.xlsx`

The files are currently still available for reference, but will be removed in a future release.

- :file:`aluminum_techno_economic.xlsx`
- :file:`Global_cement_MESSAGE.xlsx`
- :file:`Global_steel_MESSAGE.xlsx`
- New post-processing module for the industry sector in :mod:`.model.material.report.run_reporting` providing:

The files are currently still available for reference, but will be removed in a future release.
- More generalized method of post-processing MESSAGEix-Materials results
- Configuration with YAML files in :file:`material/model/material/reporting/`
- Higher resolution of post-processed results
- Data model validatation with pydantic

Bug Fixes
---------
Expand Down
4 changes: 4 additions & 0 deletions doc/whatsnew.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Next release
:doc:`project/newpathways` (:pull:`385`).


- Improve and extend :doc:`/material/index` (:pull:`395`),
specifically :mod:`.material.report`.
See :doc:`/material/v1.2.0` for details.

v2025.8.7
=========

Expand Down
98 changes: 98 additions & 0 deletions message_ix_models/data/material/reporting/ch4_emi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# collection of industry specific final energy reporting variables
# grouped by sector
# each variable specifies a list of filter

var:
emi

iamc_prefix:
Emissions|CH4|

unit: Mt CH4/yr

vars:
Industrial Processes|Chemicals:
filter:
{ technology: [meth_ng, meth_ng_ccs], mode: feedstock }
short:
emi_ch4_ind_proc_chem

Energy|Demand|Industry|Chemicals:
filter:
{ technology: [furnace_coal_petro, furnace_gas_petro, furnace_biomass_petro, furnace_foil_petro], mode: [high_temp, low_temp] }
short:
emi_ch4_ind_en_chem


# cement
# Industrial Processes|Non-Metallic Minerals|Cement:
# filter:
# { technology: [clinker_wet_cement, clinker_dry_cement], mode: M1}
# short:
# emi_ch4_ind_proc_cement
# not parametrized at the moment

Energy|Demand|Industry|Non-Metallic Minerals|Cement:
filter:
{ technology: [furnace_coal_cement, furnace_gas_cement, furnace_biomass_cement, furnace_foil_cement], mode: [high_temp, low_temp] }
short:
emi_ch4_ind_en_cement


# aluminum
Industrial Processes|Non-Ferrous Metals|Aluminium:
filter:
{ technology: [prebake_aluminum, soderberg_aluminum], mode: M1}
short:
emi_ch4_ind_proc_alu

Energy|Demand|Industry|Non-Ferrous Metals|Aluminium:
filter:
{ technology: [furnace_coal_aluminum, furnace_gas_aluminum, furnace_biomass_aluminum, furnace_foil_aluminum], mode: [high_temp, low_temp] }
short:
emi_ch4_ind_en_alu


# iron and steel
Industrial Processes|Iron and Steel:
filter:
{ technology: [DUMMY_limestone_supply_steel, prod_charcoal_steel, sinter_steel, pellet_steel, bf_steel, bof_steel, eaf_steel, finishing_steel], mode: [M1, M2, M3, M4]}
short:
emi_ch4_ind_proc_steel

# Energy|Demand|Industry|Iron and Steel:
# filter:
# { technology: [furnace_coal_steel, furnace_gas_steel, furnace_biomass_steel, furnace_foil_steel], mode: [high_temp, low_temp] }
# short:
# emi_ch4_ind_en_steel


# refinery
# Oil Refining|Electricity|Heat:
# filter:
# { technology: [furnace_elec_refining, hp_elec_refining, hp_gas_refining], mode: [high_temp, low_temp], commodity: electr, level: secondary }
# short:
# fe_pe_refining_el_ht
#
# Oil Refining|Liquids|Oil|Light:
# filter:
# { technology: furnace_foil_refining, mode: high_temp, commodity: fueloil, level: secondary }
# short:
# fe_pe_refining_oil_l
# TODO: add refinery non co2 emission accounting


# ???: do we need this in the modular Materials reporting
# Residual industry

# Other Sector|Electricity|Thermal|Resistance:
# filter:
# { technology: elec_i, mode: M1, commodity: electr, level: final }
# short:
# fe_pe_other_el_th_res
#
# Other Sector|Electricity|Thermal|Heat Pumps:
# filter:
# { technology: hp_el_I, mode: M1, commodity: electr, level: final }
# short:
# fe_pe_other_el_th_hp
Loading
Loading