Improve superstructure

.github/workflows/main.yml

@@ -47,13 +47,14 @@ jobs:
                                libncurses-dev tk-dev
 
       - name: Install python version
-        uses: gabrielfalcao/pyenv-action@v13
+        uses: gabrielfalcao/pyenv-action@v18
         with:
-          default: 3.10.6
+          default: 3.11
           command: pip install -U pip  # upgrade pip after installing python
 
       - name: create environment
-        run: pyenv local 3.10.6 && python -mvenv .venv390
+        run: |
+          pyenv install 3.11.5 && python -mvenv .venv390
 
       - name: Install dependencies
         run: |
@@ -90,8 +91,6 @@ jobs:
           python -m
           pip install
           build
-          --user
-          --break-system-packages
 
       - name: Build a binary wheel and a source tarball
         run: >-
@@ -104,13 +103,15 @@ jobs:
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
           skip-existing: true
+          verbose: true
 
       - name: Publish distribution 📦 to Test PyPI if Push
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.TEST_PYPI_API_TOKEN }}
           repository-url: https://test.pypi.org/legacy/
           skip-existing: true
+          verbose: true
 
   conda:
     name: (${{ matrix.python-version }}, ubuntu-latest)

README.md

@@ -52,6 +52,10 @@ The tool currently supports the following IAMs:
 | TIAM-UCL | TIAM-UCL (TIMES Integrated Assessment Model by University College London) is a global energy system model based on the TIMES (The Integrated MARKAL-EFOM System) framework, developed to evaluate long-term decarbonization pathways for global energy systems. It provides detailed insights into energy technology options, resource availability, and emission reduction strategies under various climate policy scenarios. The model focuses on the trade-offs and synergies between energy security, economic costs, and environmental outcomes. TIAM-UCL is frequently used to analyze scenarios consistent with the Paris Agreement and examine technological innovation's role in mitigating climate change globally. |
 
 
+What's new in 2.2.0?
+====================
+
+- `IncrementalDatabase`: allows distinguishing the contribution of each sector to the total impact.
 
 What's new in 2.1.4?
 ====================

conda/meta.yaml

@@ -35,7 +35,7 @@ requirements:
     - schema
     - sparse>=0.14.0
     - wurst>=0.4
-    - xarray
+    - xarray<=2024.2.0
     - tqdm
     - unfold
 

docs/conf.py

@@ -24,7 +24,7 @@
 author = "Romain Sacchi, Alois Dirnaichner, Chris Mutel"
 
 # The full version, including alpha/beta/rc tags
-release = "2.1.9"
+release = "2.2.0"
 
 # -- General configuration ---------------------------------------------------
 

premise/data/additional_inventories/migration_map.csv

@@ -423,6 +423,7 @@ from,to,name_from,ref_prod_from,location_from,name_to,ref_prod_to,location_to
 38,39,maize grain production,maize grain,BR-RS,"maize grain production, first crop",maize grain,BR-RS
 38,39,"market for acrylic binder, without water, in 34% solution state","acrylic binder, without water, in 34% solution state",GLO,"market for acrylic binder, with water, in 54% solution state","acrylic binder, with water, in 54% solution state",GLO
 38,39,"market for acrylic binder, without water, in 34% solution state","acrylic binder, without water, in 34% solution state",RER,"market for acrylic binder, with water, in 54% solution state","acrylic binder, with water, in 54% solution state",RER
+310,37,"market for acrylic binder, with water, in 54% solution state","acrylic binder, with water, in 54% solution state",RER,"market for acrylic binder, without water, in 34% solution state","acrylic binder, without water, in 34% solution state",RER
 38,39,"market for acrylic dispersion, without water, in 65% solution state","acrylic dispersion, without water, in 65% solution state",GLO,"market for acrylic dispersion, with water, in 58% solution","acrylic dispersion, with water, in 58% solution state",GLO
 38,39,"market for acrylic dispersion, without water, in 65% solution state","acrylic dispersion, without water, in 65% solution state",RER,"market for acrylic dispersion, with water, in 58% solution","acrylic dispersion, with water, in 58% solution state",RER
 38,39,"market for acrylic varnish, without water, in 87.5% solution state","acrylic varnish, without water, in 87.5% solution state",GLO,"market for acrylic varnish, with water, in 53% solution state","acrylic varnish, with water, in 53% solution state",GLO
@@ -987,6 +988,7 @@ from,to,name_from,ref_prod_from,location_from,name_to,ref_prod_to,location_to
 39,310,sodium chloride electrolysis,sodium,RER,"sodium production, sodium chloride electrolysis, molten salt cell",sodium,RER
 310,39,"sodium production, sodium chloride electrolysis, molten salt cell",sodium,RER,sodium chloride electrolysis,sodium,RER
 310,38,"sodium production, sodium chloride electrolysis, molten salt cell",sodium,RER,sodium chloride electrolysis,sodium,RER
+310,37,"sodium production, sodium chloride electrolysis, molten salt cell",sodium,RER,sodium chloride electrolysis,sodium,RER
 39,310,market for inert waste,inert waste,CH,"market for inert waste, for final disposal","inert waste, for final disposal",CH
 35,310,"market for sodium hydroxide, without water, in 50% solution state","sodium hydroxide, without water, in 50% solution state",GLO,,,RoW
 36,310,"market for sodium hydroxide, without water, in 50% solution state","sodium hydroxide, without water, in 50% solution state",GLO,,,RoW
@@ -1192,6 +1194,7 @@ from,to,name_from,ref_prod_from,location_from,name_to,ref_prod_to,location_to
 38,310,"treatment of waste, from silicon wafer production, inorganic, residual material landfill","waste, from silicon wafer production, inorganic",CH,"treatment of waste, from silicon wafer production, inorganic, residual material landfill","waste, from silicon wafer production, inorganic",RoE
 39,310,"treatment of waste, from silicon wafer production, inorganic, residual material landfill","waste, from silicon wafer production, inorganic",CH,"treatment of waste, from silicon wafer production, inorganic, residual material landfill","waste, from silicon wafer production, inorganic",RoE
 310,38,"treatment of wastewater from wafer fabrication, wastewater treatment",wastewater from wafer fabrication,RoW,"treatment of wastewater from wafer fabrication, capacity 1.1E10l/year",wastewater from wafer fabrication,RoW
+310,37,"treatment of wastewater from wafer fabrication, wastewater treatment",wastewater from wafer fabrication,RoW,"treatment of wastewater from wafer fabrication, capacity 1.1E10l/year",wastewater from wafer fabrication,RoW
 35,310,"treatment of waste paperboard, municipal incineration",waste paperboard,CH,"treatment of waste paperboard, municipal incineration FAE",waste paperboard,CH
 36,310,"treatment of waste paperboard, municipal incineration",waste paperboard,CH,"treatment of waste paperboard, municipal incineration FAE",waste paperboard,CH
 37,310,"treatment of waste paperboard, municipal incineration",waste paperboard,CH,"treatment of waste paperboard, municipal incineration FAE",waste paperboard,CH
@@ -1285,12 +1288,15 @@ from,to,name_from,ref_prod_from,location_from,name_to,ref_prod_to,location_to
 39,310,"market for neutralising agent, sodium hydroxide-equivalent","neutralising agent, sodium hydroxide-equivalent",GLO,,,RoW
 310,39,"market for diethylene glycol","diethylene glycol","RER","market for diethylene glycol","diethylene glycol","GLO"
 310,38,"market for diethylene glycol","diethylene glycol","RER","market for diethylene glycol","diethylene glycol","GLO"
+310,37,"market for diethylene glycol","diethylene glycol","RER","market for diethylene glycol","diethylene glycol","GLO"
 310,39,"unsaturated hydrocarbons production, steam cracking operation, average","hydrogen, gaseous, low pressure","RER","hydrogen production, steam reforming","hydrogen, gaseous","RER"
 310,38,"unsaturated hydrocarbons production, steam cracking operation, average","hydrogen, gaseous, low pressure","RER","hydrogen production, gaseous, petroleum refinery operation","hydrogen, gaseous","Europe without Switzerland"
 310,39,"market for methanol","methanol","RER","market for methanol","methanol","GLO"
 310,38,"market for methanol","methanol","RER","market for methanol","methanol","GLO"
+310,37,"market for methanol","methanol","RER","market for methanol","methanol","GLO"
 310,39,"market for waste aluminium","waste aluminium","RoW","market for waste aluminium","waste aluminium","GLO"
 310,38,"market for waste aluminium","waste aluminium","RoW","market for waste aluminium","waste aluminium","GLO"
+310,37,"market for waste aluminium","waste aluminium","RoW","market for waste aluminium","waste aluminium","GLO"
 310,37,"market for hydrogen, gaseous, low pressure","hydrogen, gaseous, low pressure",RER,"market for hydrogen, gaseous","hydrogen, gaseous",GLO
 310,38,"market for hydrogen, gaseous, low pressure","hydrogen, gaseous, low pressure",RER,"market for hydrogen, gaseous","hydrogen, gaseous",GLO
 310,39,"market for hydrogen, gaseous, low pressure","hydrogen, gaseous, low pressure",RER,"market for hydrogen, gaseous","hydrogen, gaseous",GLO
@@ -1307,6 +1313,19 @@ from,to,name_from,ref_prod_from,location_from,name_to,ref_prod_to,location_to
 310,38,"market for benzene","benzene","RER","market for benzene","benzene","GLO"
 310,39,"market for benzene","benzene","RER","market for benzene","benzene","GLO"
 310,38,"market for natural gas, low pressure","natural gas, low pressure",DE,"market for natural gas, low pressure","natural gas, low pressure",RoW
+310,37,"market for natural gas, low pressure","natural gas, low pressure",DE,"market for natural gas, low pressure","natural gas, low pressure",RoW
 310,38,"treatment of wastewater from PV cell production, wastewater treatment",wastewater from PV cell production,CH,"treatment of wastewater from PV cell production, capacity 5E9l/year",wastewater from PV cell production,CH
 310,39,"market for iron(III) chloride, without water, in 40% solution state","iron(III) chloride, without water, in 40% solution state",GLO,"market for iron(III) chloride, without water, in 40% solution state","iron (III) chloride, without water, in 40% solution state",GLO
-310,38,"market for iron(III) chloride, without water, in 40% solution state","iron(III) chloride, without water, in 40% solution state",GLO,"market for iron (III) chloride, without water, in 40% solution state","iron (III) chloride, without water, in 40% solution state",GLO
+310,38,"market for iron(III) chloride, without water, in 40% solution state","iron(III) chloride, without water, in 40% solution state",GLO,"market for iron (III) chloride, without water, in 40% solution state","iron (III) chloride, without water, in 40% solution state",GLO
+310,37,"market for iron(III) chloride, without water, in 40% solution state","iron(III) chloride, without water, in 40% solution state",GLO,"market for iron (III) chloride, without water, in 40% solution state","iron (III) chloride, without water, in 40% solution state",GLO
+39,37,"vanadium-titanomagnetite mine operation and beneficiation","iron ore concentrate","CN","market for iron ore concentrate","iron ore concentrate","GLO"
+39,37,"market for aluminium collector foil, for Li-ion battery","aluminium collector foil, for Li-ion battery","GLO","market for aluminium, wrought alloy","aluminium, wrought alloy","GLO"
+310,37,"market for photovoltaics, electric installation for 3kWp module, at building","photovoltaics, electric installation for 3kWp module, at building","GLO","market for photovoltaics, electric installation for 3kWp module, at building","photovoltaic plant, electric installation for 3kWp module","GLO"
+310,37,"market for battery, Li-ion, NMC811, rechargeable, prismatic","battery, Li-ion, NMC811, rechargeable, prismatic","GLO","market for battery, Li-ion, rechargeable, prismatic","battery, Li-ion, rechargeable, prismatic",GLO
+310,37,"market for battery, Li-ion, NMC111, rechargeable, prismatic","battery, Li-ion, NMC111, rechargeable, prismatic","GLO","market for battery, Li-ion, rechargeable, prismatic","battery, Li-ion, rechargeable, prismatic",GLO
+310,37,"market for battery, Li-ion, NCA, rechargeable, prismatic","battery, Li-ion, NCA, rechargeable, prismatic","GLO","market for battery, Li-ion, rechargeable, prismatic","battery, Li-ion, rechargeable, prismatic",GLO
+310,37,"market for battery, Li-ion, LiMn2O4, rechargeable, prismatic","battery, Li-ion, LiMn2O4, rechargeable, prismatic","GLO","market for battery, Li-ion, rechargeable, prismatic","battery, Li-ion, rechargeable, prismatic",GLO
+310,37,"market for battery, lead acid, rechargeable, stationary","battery, lead acid, rechargeable, stationary","GLO","market for battery, Li-ion, rechargeable, prismatic","battery, Li-ion, rechargeable, prismatic",GLO
+38,37,"market for battery module packaging, Li-ion","battery module packaging, Li-ion",GLO,"market for aluminium, wrought alloy","aluminium, wrought alloy","GLO"
+38,37,"market for anode, graphite, for Li-ion battery","anode, graphite, for Li-ion battery",RoW,"market for anode, graphite, for lithium-ion battery","anode, graphite, for lithium-ion battery",GLO
+38,37,"market for anode, silicon coated graphite, for Li-ion battery","anode, silicon coated graphite, for Li-ion battery",CN,"market for anode, graphite, for lithium-ion battery","anode, graphite, for lithium-ion battery",GLO