From 919ad9d7527ba1ebe1d4c5d1107b70841ccc3594 Mon Sep 17 00:00:00 2001 From: romainsacchi Date: Fri, 29 Nov 2024 09:32:38 +0100 Subject: [PATCH] Improve superstructure --- .github/workflows/main.yml | 11 +- README.md | 4 + conda/meta.yaml | 2 +- docs/conf.py | 2 +- .../additional_inventories/migration_map.csv | 21 +- premise/data/transport/vehicles_map.yaml | 34 ++ .../data/utils/export/simapro_categories.csv | 26 +- premise/export.py | 69 +++- .../biomass_variables.yaml | 2 + .../carbon_capture_variables.yaml | 13 + .../cement_variables.yaml | 3 + premise/iam_variables_mapping/constants.yaml | 24 ++ .../crops_variables.yaml | 15 + .../direct_air_capture_variables.yaml | 1 + .../electricity_variables.yaml | 34 ++ .../fuels_variables.yaml | 40 +++ .../gains_regions_mapping.yaml | 25 ++ .../iam_region_to_climate.yaml | 23 ++ .../missing_geography_equivalences.yaml | 182 +++++++++++ .../other_variables.yaml | 4 + .../steel_variables.yaml | 6 + .../topologies/remind-eu-topology.json | 294 ++++++++++++++++++ .../transport_bus_variables.yaml | 8 + .../transport_passenger_cars_variables.yaml | 60 ++++ .../transport_railfreight_variables.yaml | 10 + .../transport_roadfreight_variables.yaml | 40 +++ .../transport_two_wheelers_variables.yaml | 4 + premise/incremental.py | 177 +++++++++++ premise/inventory_imports.py | 3 + premise/new_database.py | 5 +- premise/utils.py | 7 +- requirements.txt | 2 +- 32 files changed, 1116 insertions(+), 35 deletions(-) create mode 100644 premise/iam_variables_mapping/topologies/remind-eu-topology.json create mode 100644 premise/incremental.py diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 440ec4f6..debee11b 100644 --- a/.github/workflows/main.yml +++ b/.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,6 +103,7 @@ 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 @@ -111,6 +111,7 @@ jobs: 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) diff --git a/README.md b/README.md index 6b06a54f..3836bcec 100644 --- a/README.md +++ b/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? ==================== diff --git a/conda/meta.yaml b/conda/meta.yaml index b8c9078b..bdd0c573 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -35,7 +35,7 @@ requirements: - schema - sparse>=0.14.0 - wurst>=0.4 - - xarray + - xarray<=2024.2.0 - tqdm - unfold diff --git a/docs/conf.py b/docs/conf.py index cc9b0419..30bb15ca 100644 --- a/docs/conf.py +++ b/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 --------------------------------------------------- diff --git a/premise/data/additional_inventories/migration_map.csv b/premise/data/additional_inventories/migration_map.csv index 1ef73916..23ad5589 100644 --- a/premise/data/additional_inventories/migration_map.csv +++ b/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 \ No newline at end of file +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 \ No newline at end of file diff --git a/premise/data/transport/vehicles_map.yaml b/premise/data/transport/vehicles_map.yaml index 9fc41bef..406c95d6 100644 --- a/premise/data/transport/vehicles_map.yaml +++ b/premise/data/transport/vehicles_map.yaml @@ -45,138 +45,172 @@ truck: old_trucks: transport, freight, lorry 16-32 metric ton, EURO1: remind: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 3.5-7.5 metric ton, EURO3: remind: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul transport, freight, lorry 16-32 metric ton, EURO5: remind: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry >32 metric ton, EURO1: remind: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul transport, freight, lorry 3.5-7.5 metric ton, EURO4: remind: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul transport, freight, lorry, all sizes, EURO1 to generic market for transport, freight, lorry, unspecified: remind: transport, freight, lorry, unspecified, long haul + remind-eu: transport, freight, lorry, unspecified, long haul image: transport, freight, lorry, unspecified, long haul tiam-ucl: transport, freight, lorry, unspecified, long haul transport, freight, lorry 7.5-16 metric ton, EURO6: remind: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 7.5-16 metric ton, EURO1: remind: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry, all sizes, EURO3 to generic market for transport, freight, lorry, unspecified: remind: transport, freight, lorry, unspecified, long haul + remind-eu: transport, freight, lorry, unspecified, long haul image: transport, freight, lorry, unspecified, long haul tiam-ucl: transport, freight, lorry, unspecified, long haul transport, freight, lorry 16-32 metric ton, EURO6: remind: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 7.5-16 metric ton, EURO2: remind: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 7.5-16 metric ton, EURO3: remind: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 7.5-16 metric ton, EURO4: remind: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 16-32 metric ton, EURO2: remind: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry >32 metric ton, EURO6: remind: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul transport, freight, lorry 3.5-7.5 metric ton, EURO2: remind: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul transport, freight, lorry 3.5-7.5 metric ton, EURO1: remind: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul transport, freight, lorry, all sizes, EURO2 to generic market for transport, freight, lorry, unspecified: remind: transport, freight, lorry, unspecified, long haul + remind-eu: transport, freight, lorry, unspecified, long haul image: transport, freight, lorry, unspecified, long haul tiam-ucl: transport, freight, lorry, unspecified, long haul transport, freight, lorry 16-32 metric ton, unregulated: remind: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry >32 metric ton, unregulated: remind: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul transport, freight, lorry >32 metric ton, EURO3: remind: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul transport, freight, lorry 3.5-7.5 metric ton, unregulated: remind: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul transport, freight, lorry 7.5-16 metric ton, EURO5: remind: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 3.5-7.5 metric ton, EURO6: remind: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul transport, freight, lorry 7.5-16 metric ton, unregulated: remind: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry 3.5-7.5 metric ton, EURO5: remind: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 7.5t gross weight, unspecified powertrain, long haul transport, freight, lorry >32 metric ton, EURO2: remind: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul transport, freight, lorry 16-32 metric ton, EURO3: remind: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry, all sizes, EURO5 to generic market for transport, freight, lorry, unspecified: remind: transport, freight, lorry, unspecified, long haul + remind-eu: transport, freight, lorry, unspecified, long haul image: transport, freight, lorry, unspecified, long haul tiam-ucl: transport, freight, lorry, unspecified, long haul transport, freight, lorry, all sizes, EURO6 to generic market for transport, freight, lorry, unspecified: remind: transport, freight, lorry, unspecified, long haul + remind-eu: transport, freight, lorry, unspecified, long haul image: transport, freight, lorry, unspecified, long haul tiam-ucl: transport, freight, lorry, unspecified, long haul transport, freight, lorry 16-32 metric ton, EURO4: remind: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 26t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 18t gross weight, unspecified powertrain, long haul transport, freight, lorry >32 metric ton, EURO4: remind: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul transport, freight, lorry >32 metric ton, EURO5: remind: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul + remind-eu: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul image: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul tiam-ucl: transport, freight, lorry, 40t gross weight, unspecified powertrain, long haul transport, freight, lorry, all sizes, unregulated to generic market for transport, freight, lorry, unspecified: remind: transport, freight, lorry, unspecified, long haul + remind-eu: transport, freight, lorry, unspecified, long haul image: transport, freight, lorry, unspecified, long haul tiam-ucl: transport, freight, lorry, unspecified, long haul diff --git a/premise/data/utils/export/simapro_categories.csv b/premise/data/utils/export/simapro_categories.csv index 1c10cb4a..196f2830 100644 --- a/premise/data/utils/export/simapro_categories.csv +++ b/premise/data/utils/export/simapro_categories.csv @@ -1631,8 +1631,8 @@ disodium disulphite,disodium disulphite,material,Others\Obsolete disodium disulphite production,disodium disulphite,material,Chemicals\Inorganic\Transformation "display production, cathode ray tube, 17 inches","display, cathode ray tube, 17 inches",material,Electronics\Devices\Transformation "display production, liquid crystal, 17 inches","display, liquid crystal, 17 inches",material,Electronics\Devices\Transformation -Distiller's Dried Grains with Solubles to generic market for protein feed,"energy feed, gross",material,Agricultural\Animal feed\Market -Distiller's Dried Grains with Solubles to generic market for protein feed,"protein feed, 100% crude",material,Agricultural\Animal feed\Market +Distiller"s Dried Grains with Solubles to generic market for protein feed,"energy feed, gross",material,Agricultural\Animal feed\Market +Distiller"s Dried Grains with Solubles to generic market for protein feed,"protein feed, 100% crude",material,Agricultural\Animal feed\Market "distribution network construction, electricity, low voltage","distribution network, electricity, low voltage",transport,Electricity\Transformation\Infrastructure distribution sheds,distribution sheds,transport,Road\Transformation\Infrastructure dithiocarbamate-compound production,dithiocarbamate-compound,material,Chemicals\Pesticides\Transformation @@ -2073,11 +2073,11 @@ ethanol fermentation plant construction,ethanol fermentation plant,material,Fuel ethanol production from grass,grass fibre,material,Agricultural\Animal feed\Transformation ethanol production from grass,"protein feed, 100% crude",material,Agricultural\Animal feed\Transformation ethanol production from grass,"ethanol, without water, in 95% solution state, from fermentation",material,Fuels\Biofuels\Ethanol\Transformation -ethanol production from maize,distiller's Dried Grains with Solubles,material,Agricultural\Animal feed\Transformation +ethanol production from maize,distiller"s Dried Grains with Solubles,material,Agricultural\Animal feed\Transformation ethanol production from maize,"ethanol, without water, in 95% solution state, from fermentation",material,Fuels\Biofuels\Ethanol\Transformation -ethanol production from potatoes,distiller's Dried Grains with Solubles,material,Agricultural\Animal feed\Transformation +ethanol production from potatoes,distiller"s Dried Grains with Solubles,material,Agricultural\Animal feed\Transformation ethanol production from potatoes,"ethanol, without water, in 95% solution state, from fermentation",material,Fuels\Biofuels\Ethanol\Transformation -ethanol production from rye,distiller's Dried Grains with Solubles,material,Agricultural\Animal feed\Transformation +ethanol production from rye,distiller"s Dried Grains with Solubles,material,Agricultural\Animal feed\Transformation ethanol production from rye,"ethanol, without water, in 95% solution state, from fermentation",material,Fuels\Biofuels\Ethanol\Transformation ethanol production from sugar beet,sugar beet pulp,material,Agricultural\Plant production\Sugar beets\Transformation ethanol production from sugar beet,"ethanol, without water, in 95% solution state, from fermentation",material,Fuels\Biofuels\Ethanol\Transformation @@ -5367,8 +5367,8 @@ market for dishwasher,dishwasher,material,Appliances\Market\Infrastructure market for disodium disulphite,disodium disulphite,material,Chemicals\Inorganic\Market "market for display, cathode ray tube, 17 inches","display, cathode ray tube, 17 inches",material,Electronics\Devices\Market "market for display, liquid crystal, 17 inches","display, liquid crystal, 17 inches",material,Electronics\Devices\Market -market for Distiller's Dried Grains with Solubles,distiller's Dried Grains with Solubles,material,Agricultural\Animal feed\Market -market for Distiller's Dried Grains with Solubles_obsolete,distiller's Dried Grains with Solubles,waste treatment,Others\Obsolete +market for Distiller"s Dried Grains with Solubles,distiller"s Dried Grains with Solubles,material,Agricultural\Animal feed\Market +market for Distiller"s Dried Grains with Solubles_obsolete,distiller"s Dried Grains with Solubles,waste treatment,Others\Obsolete "market for distribution network, electricity, low voltage","distribution network, electricity, low voltage",transport,Electricity\Market\Infrastructure market for dithiocarbamate-compound,dithiocarbamate-compound,material,Chemicals\Pesticides\Market market for dodecanol,dodecanol,material,Chemicals\Organic\Market @@ -7719,7 +7719,7 @@ market for stone wool,stone wool,material,Construction\Insulation\Market market for stone wool factory,stone wool factory,material,Construction\Insulation\Market\Infrastructure "market for stone wool, packed","stone wool, packed",material,Construction\Insulation\Market "market for storage building, chemicals, solid","storage building, chemicals, solid",material,Chemicals\Others\Market\Infrastructure -"market for storage, 10'000 l","storage, 10'000 l",energy,Cogeneration\Gas\Market\Infrastructure +"market for storage, 10"000 l","storage, 10"000 l",energy,Cogeneration\Gas\Market\Infrastructure "market for storage, 650 l mini CHP plant","storage, 650 l mini CHP plant",energy,Cogeneration\Gas\Market\Infrastructure market for straw,straw,material,Agricultural\Plant production\Roughage\Market "market for straw, organic","straw, organic",material,Agricultural\Plant production\Roughage\Market @@ -8772,8 +8772,8 @@ miscanthus production,"miscanthus, chopped",material,Agricultural\Plant producti "miscanthus rhizome production, for planting","miscanthus rhizome, for planting",material,Agricultural\Plant seeds\Transformation "mischmetal production, primary",mischmetal,material,Metals\Non ferro\Transformation "mixed natural gas and biomethane production, high pressure","mixed natural gas and biomethane, high pressure",material,Fuels\Natural gas\Transformation -"modified Solvay process, Hou's process",ammonium chloride,material,Chemicals\Inorganic\Transformation -"modified Solvay process, Hou's process","soda ash, dense",material,Chemicals\Inorganic\Transformation +"modified Solvay process, Hou"s process",ammonium chloride,material,Chemicals\Inorganic\Transformation +"modified Solvay process, Hou"s process","soda ash, dense",material,Chemicals\Inorganic\Transformation "module packaging, for li-o2 battery",module packaging,material,Electronics\Battery\Transformation moisture separator-reheater HTP-LPT EPR,moisture separator-reheater HTP-LPT EPR,energy,Heat\Others\Transformation "molasses, from sugar beet, to generic market for energy feed","energy feed, gross",material,Agricultural\Animal feed\Market @@ -10656,8 +10656,8 @@ smelting and refining of nickel ore,"ammonium sulfate, as N",material,Others\Obs "sng from wood, production plant","sng from wood, production plant",material,Others\Obsolete sng production plant,sng production plant,material,Others\Obsolete soap production,soap,material,Chemicals\Washing agents\Tensides\Transformation -"soda ash production, dense, Hou's process",ammonium chloride,waste treatment,Landfill\Slag compartment\Transformation -"soda ash production, dense, Hou's process","soda ash, dense",waste treatment,Landfill\Slag compartment\Transformation +"soda ash production, dense, Hou"s process",ammonium chloride,waste treatment,Landfill\Slag compartment\Transformation +"soda ash production, dense, Hou"s process","soda ash, dense",waste treatment,Landfill\Slag compartment\Transformation "soda ash, dense, to generic market for neutralising agent","neutralising agent, sodium hydroxide-equivalent",material,Chemicals\Inorganic\Market "soda ash, light, crystalline, heptahydrate, to generic market for neutralising agent","neutralising agent, sodium hydroxide-equivalent",material,Chemicals\Inorganic\Market "soda production, solvay process",calcium chloride,material,Chemicals\Inorganic\Transformation @@ -10842,7 +10842,7 @@ stone wool production,stone wool,material,Construction\Insulation\Transformation "stone wool production, packed","stone wool, packed",material,Construction\Insulation\Transformation storage battery,storage battery,transport,Road\Transformation\Infrastructure "storage building construction, chemicals, solid","storage building, chemicals, solid",material,Chemicals\Others\Transformation\Infrastructure -"storage production, 10'000 l","storage, 10'000 l",energy,Cogeneration\Gas\Transformation\Infrastructure +"storage production, 10"000 l","storage, 10"000 l",energy,Cogeneration\Gas\Transformation\Infrastructure "storage production, 650 l mini CHP plant","storage, 650 l mini CHP plant",energy,Cogeneration\Gas\Transformation\Infrastructure "straw production, stand-alone production","straw, stand-alone production",material,Agricultural\Plant production\Roughage\Transformation "strawberry production, in heated greenhouse",strawberry,material,Agricultural\Plant production\Fruits\Transformation diff --git a/premise/export.py b/premise/export.py index 95e243dd..2690a017 100644 --- a/premise/export.py +++ b/premise/export.py @@ -45,6 +45,16 @@ DIR_DATAPACKAGE_TEMP = Path.cwd() / "export" / "temp" +def replace_unsupported_characters(text): + if text: + if isinstance(text, str): + return text.encode("latin-1", errors="replace").decode("latin-1") + else: + return text + else: + return "" + + def get_simapro_units() -> Dict[str, str]: """ Load a dictionary that maps brightway2 unit to Simapro units. @@ -602,7 +612,12 @@ def generate_new_activities(args): def generate_scenario_difference_file( - db_name, origin_db, scenarios, version, scenario_list, biosphere_name + db_name, + origin_db, + scenarios, + version, + scenario_list, + biosphere_name, ) -> tuple[DataFrame, list[dict], set[Any]]: """ Generate a scenario difference file for a given list of databases @@ -780,7 +795,6 @@ def generate_scenario_difference_file( df.loc[df["flow type"].isin(["technosphere", "production"]), "from categories"] = ( None ) - # df.loc[df["flow type"] == "production", list_scenarios] = 1.0 df.loc[df["flow type"] == "biosphere", "from database"] = biosphere_name @@ -841,6 +855,7 @@ def generate_superstructure_db( version, scenario_list, file_format="excel", + preserve_original_column: bool = False, ) -> List[dict]: """ Build a superstructure database from a list of databases @@ -850,6 +865,9 @@ def generate_superstructure_db( :param filepath: the filepath of the new database :param version: the version of the new database :param file_format: the format of the scenario difference file. Can be "excel", "csv" or "feather". + :param preserve_original_column: whether to keep the original column in the scenario difference file + :param scenario_list: a list of external scenarios + :return: a superstructure database """ @@ -872,7 +890,11 @@ def generate_superstructure_db( df = df.rename(columns={"from unit": "unit"}) # remove the column `original` - df = df.drop(columns=["original"]) + if not preserve_original_column: + df = df.drop(columns=["original"]) + else: + scenario_list = ["original"] + scenario_list + if "unit" in df.columns: df = df.drop(columns=["unit"]) @@ -893,6 +915,9 @@ def generate_superstructure_db( after = len(df) print(f"Dropped {before - after} duplicate(s).") + for scenario in scenario_list: + df.loc[(df["flow type"] == "production") & (df[scenario] == 0), scenario] = 1 + # if df is longer than the row limit of Excel, # the export to Excel is not an option if len(df) > 1048576: @@ -1003,6 +1028,12 @@ def _prepare_database( return scenario +def get_uuids(db): + return { + (ds["name"], ds["reference product"], ds["location"]): ds["code"] for ds in db + } + + class Export: """ Class that exports the transformed data into matrices: @@ -1361,6 +1392,8 @@ def export_db_to_simapro(self, olca_compartments=False): dict_bio = get_simapro_biosphere_dictionnary() + uuids = get_uuids(self.db) + headers = [ "{SimaPro 9.1.1.7}", "{processes}", @@ -1428,7 +1461,6 @@ def export_db_to_simapro(self, olca_compartments=False): filename = f"simapro_export_{self.model}_{self.scenario}_{self.year}.csv" dict_cat_simapro = get_simapro_category_of_exchange() - dict_cat = self.get_category_of_exchange() dict_refs = load_references() unlinked_biosphere_flows = [] @@ -1501,11 +1533,14 @@ def export_db_to_simapro(self, olca_compartments=False): dict_refs[ds["name"]]["description"], ) - writer.writerow([string]) else: if "comment" in ds: string = re.sub("[^a-zA-Z0-9 .,]", "", ds["comment"]) - writer.writerow([string]) + + # Add dataset UUID to comment filed + string += f" | ID: {ds['code']}" + + writer.writerow([string]) if item in ( "Cut off rules", @@ -1544,6 +1579,7 @@ def export_db_to_simapro(self, olca_compartments=False): 1.0, "not defined", sub_category, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {uuids[(e['name'],e['product'],e['location'])]}", ] ) @@ -1556,6 +1592,7 @@ def export_db_to_simapro(self, olca_compartments=False): "100%", "not defined", sub_category, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {uuids[(e['name'], e['product'], e['location'])]}", ] ) e["used"] = True @@ -1580,6 +1617,7 @@ def export_db_to_simapro(self, olca_compartments=False): 0, 0, 0, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {uuids[(e['name'], e['product'], e['location'])]}", ] ) e["used"] = True @@ -1612,6 +1650,7 @@ def export_db_to_simapro(self, olca_compartments=False): 0, 0, 0, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {self.bio_dict.get((e['name'],e['categories'][0],'unspecified' if len(e['categories']) == 1 else e['categories'][1], e['unit']))}", ] ) e["used"] = True @@ -1626,9 +1665,12 @@ def export_db_to_simapro(self, olca_compartments=False): sub_compartment = "" if e["name"].lower() == "water": - e["unit"] = "kilogram" + unit = "kilogram" + # e["unit"] = "kilogram" # going from cubic meters to kilograms e["amount"] *= 1000 + else: + unit = e["unit"] if e["name"] not in dict_bio: unlinked_biosphere_flows.append( @@ -1639,12 +1681,13 @@ def export_db_to_simapro(self, olca_compartments=False): [ dict_bio.get(e["name"], e["name"]), sub_compartment, - simapro_units[e["unit"]], + simapro_units[unit], f"{e['amount']:.3E}", "undefined", 0, 0, 0, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {self.bio_dict.get((e['name'], e['categories'][0], 'unspecified' if len(e['categories']) == 1 else e['categories'][1], e['unit']))}", ] ) e["used"] = True @@ -1662,8 +1705,11 @@ def export_db_to_simapro(self, olca_compartments=False): sub_compartment = "" if e["name"].lower() == "water": - e["unit"] = "kilogram" + unit = "kilogram" + # e["unit"] = "kilogram" e["amount"] /= 1000 + else: + unit = e["unit"] if e["name"] not in dict_bio: unlinked_biosphere_flows.append( @@ -1674,12 +1720,13 @@ def export_db_to_simapro(self, olca_compartments=False): [ dict_bio.get(e["name"], e["name"]), sub_compartment, - simapro_units[e["unit"]], + simapro_units[unit], f"{e['amount']:.3E}", "undefined", 0, 0, 0, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {self.bio_dict.get((e['name'], e['categories'][0], 'unspecified' if len(e['categories']) == 1 else e['categories'][1], e['unit']))}", ] ) e["used"] = True @@ -1711,6 +1758,7 @@ def export_db_to_simapro(self, olca_compartments=False): 0, 0, 0, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {self.bio_dict.get((e['name'], e['categories'][0], 'unspecified' if len(e['categories']) == 1 else e['categories'][1], e['unit']))}", ] ) e["used"] = True @@ -1735,6 +1783,7 @@ def export_db_to_simapro(self, olca_compartments=False): 0, 0, 0, + f"{replace_unsupported_characters(e.get('comment'))} | ID = {uuids[(e['name'], e['product'], e['location'])]}", ] ) e["used"] = True diff --git a/premise/iam_variables_mapping/biomass_variables.yaml b/premise/iam_variables_mapping/biomass_variables.yaml index 54b5d98a..7f843339 100644 --- a/premise/iam_variables_mapping/biomass_variables.yaml +++ b/premise/iam_variables_mapping/biomass_variables.yaml @@ -7,6 +7,7 @@ biomass crops - purpose grown: image: Primary Energy|Biomass|Energy Crops message: Primary Energy|Biomass|Energy Crops remind: SE|Electricity|Biomass|Energy Crops + remind-eu: SE|Electricity|Biomass|Energy Crops tiam-ucl: Primary Energy|Biomass|Energy Crops gcam: Production|Energy|Biomass|Energy Crops ecoinvent_aliases: @@ -25,6 +26,7 @@ biomass - residual: message: Primary Energy|Biomass|Residues image: Primary Energy|Biomass|Residues remind: SE|Electricity|Biomass|Residues + remind-eu: SE|Electricity|Biomass|Residues tiam-ucl: Primary Energy|Biomass|Residues gcam: Production|Energy|Biomass|Residues ecoinvent_aliases: diff --git a/premise/iam_variables_mapping/carbon_capture_variables.yaml b/premise/iam_variables_mapping/carbon_capture_variables.yaml index 9aac3ab7..7b3de1fb 100644 --- a/premise/iam_variables_mapping/carbon_capture_variables.yaml +++ b/premise/iam_variables_mapping/carbon_capture_variables.yaml @@ -9,6 +9,11 @@ cement - co2: - Emi|CO2|Energy|Demand|Industry|++|Cement - Carbon Management|Carbon Capture|Industry Energy|Cement - Carbon Management|Carbon Capture|+|Industry Process + remind-eu: + - Emi|CO2|Industrial Processes|+|Cement + - Emi|CO2|Energy|Demand|Industry|++|Cement + - Carbon Management|Carbon Capture|Industry Energy|Cement + - Carbon Management|Carbon Capture|+|Industry Process image: - Emissions|CO2|Industry|Cement|Gross message: @@ -24,6 +29,9 @@ cement - cco2: remind: - Carbon Management|Carbon Capture|Industry Energy|Cement - Carbon Management|Carbon Capture|+|Industry Process + remind-eu: + - Carbon Management|Carbon Capture|Industry Energy|Cement + - Carbon Management|Carbon Capture|+|Industry Process image: - Emissions|CO2|Industry|Cement|Sequestered message: @@ -37,6 +45,9 @@ steel - co2: remind: - Emi|CO2|Energy|Demand|Industry|++|Steel - Carbon Management|Carbon Capture|Industry Energy|Steel + remind-eu: + - Emi|CO2|Energy|Demand|Industry|++|Steel + - Carbon Management|Carbon Capture|Industry Energy|Steel image: - Emissions|CO2|Industry|Steel|Gross gcam: @@ -56,6 +67,8 @@ steel - cco2: iam_aliases: remind: - Carbon Management|Carbon Capture|Industry Energy|Steel + remind-eu: + - Carbon Management|Carbon Capture|Industry Energy|Steel image: - Emissions|CO2|Industry|Steel|Sequestered gcam: diff --git a/premise/iam_variables_mapping/cement_variables.yaml b/premise/iam_variables_mapping/cement_variables.yaml index 614dbc40..4bd331da 100644 --- a/premise/iam_variables_mapping/cement_variables.yaml +++ b/premise/iam_variables_mapping/cement_variables.yaml @@ -4,6 +4,7 @@ cement, dry feed rotary kiln: iam_aliases: remind: Production|Industry|Cement + remind-eu: Production|Industry|Cement image: Production|Industry|Cement|Dry feed rotary kiln message: Production|Non-Metallic Minerals|Cement gcam: Production|Industry|Cement @@ -11,6 +12,7 @@ cement, dry feed rotary kiln: energy_use_aliases: remind: FE|Industry|+++|Cement + remind-eu: FE|Industry|+++|Cement image: - Final Energy|Industry|Cement|Dry feed rotary kiln|Coal - Final Energy|Industry|Cement|Dry feed rotary kiln|Electricity @@ -47,6 +49,7 @@ cement, dry feed rotary kiln: eff_aliases: remind: FE|Industry|Specific Energy Consumption|Cement + remind-eu: FE|Industry|Specific Energy Consumption|Cement ecoinvent_fuel_aliases: fltr: name: diff --git a/premise/iam_variables_mapping/constants.yaml b/premise/iam_variables_mapping/constants.yaml index e15ed4e4..0d60af09 100644 --- a/premise/iam_variables_mapping/constants.yaml +++ b/premise/iam_variables_mapping/constants.yaml @@ -12,6 +12,7 @@ SUPPORTED_EI_VERSIONS: SUPPORTED_MODELS: - remind + - remind-eu - image - message - tiam-ucl @@ -67,6 +68,29 @@ LIST_REMIND_REGIONS: - USA - World +LIST_REMIND-EU_REGIONS: + - OAS + - ENC + - NES + - MEA + - SSA + - LAM + - REF + - CAZ + - EWN + - ECS + - CHA + - ESC + - ECE + - FRA + - DEU + - UKI + - NEN + - IND + - JPN + - ESW + - USA + LIST_IMAGE_REGIONS: - BRA - CAN diff --git a/premise/iam_variables_mapping/crops_variables.yaml b/premise/iam_variables_mapping/crops_variables.yaml index bf4073d9..b231e61d 100644 --- a/premise/iam_variables_mapping/crops_variables.yaml +++ b/premise/iam_variables_mapping/crops_variables.yaml @@ -10,6 +10,9 @@ sugar: remind: temperate: sugarbeet tropical: sugarcane + remind-eu: + temperate: sugarbeet + tropical: sugarcane message: temperate: sugarbeet tropical: sugarcane @@ -33,6 +36,9 @@ oil: remind: temperate: rapeseed tropical: palm oil + remind-eu: + temperate: rapeseed + tropical: palm oil message: temperate: rapeseed tropical: palm oil @@ -56,6 +62,9 @@ wood: remind: temperate: poplar tropical: eucalyptus + remind-eu: + temperate: poplar + tropical: eucalyptus message: temperate: poplar tropical: eucalyptus @@ -80,6 +89,9 @@ grass: remind: temperate: switchgrass tropical: miscanthus + remind-eu: + temperate: switchgrass + tropical: miscanthus message: temperate: switchgrass tropical: miscanthus @@ -103,6 +115,9 @@ grain: remind: temperate: corn tropical: corn + remind-eu: + temperate: corn + tropical: corn message: temperate: corn tropical: corn diff --git a/premise/iam_variables_mapping/direct_air_capture_variables.yaml b/premise/iam_variables_mapping/direct_air_capture_variables.yaml index 78b4d047..7620b237 100644 --- a/premise/iam_variables_mapping/direct_air_capture_variables.yaml +++ b/premise/iam_variables_mapping/direct_air_capture_variables.yaml @@ -9,6 +9,7 @@ dac_solvent: iam_aliases: remind: 'Emi|CO2|Cumulated|CDR|DACCS' + remind-eu: 'Emi|CO2|Cumulated|CDR|DACCS' image: Carbon Capture|Storage|Direct Air Capture|Cumulative tiam-ucl: Carbon Capture|Storage|Direct Air Capture heat_use_aliases: diff --git a/premise/iam_variables_mapping/electricity_variables.yaml b/premise/iam_variables_mapping/electricity_variables.yaml index 265be65a..231a5dbc 100644 --- a/premise/iam_variables_mapping/electricity_variables.yaml +++ b/premise/iam_variables_mapping/electricity_variables.yaml @@ -28,10 +28,12 @@ Biomass CHP: eff_aliases: image: Efficiency|Electricity|Biomass|w/o CCS|3 remind: Tech|Electricity|Biomass|Combined Heat and Power w/o CC|Efficiency + remind-eu: Tech|Electricity|Biomass|Combined Heat and Power w/o CC|Efficiency tiam-ucl: Efficiency|Electricity|Biomass CHP|w/o CCS iam_aliases: image: Secondary Energy|Electricity|Biomass|w/o CCS|3 remind: SE|Electricity|Biomass|++|Combined Heat and Power w/o CC + remind-eu: SE|Electricity|Biomass|++|Combined Heat and Power w/o CC tiam-ucl: Secondary Energy|Electricity|Biomass CHP|w/o CCS max_efficiency: 0.3 Biomass CHP (existing): @@ -93,12 +95,14 @@ Biomass IGCC: image: Efficiency|Electricity|Biomass|w/o CCS|2 message: Efficiency|Electricity|Biomass|w/o CCS|1 remind: Tech|Electricity|Biomass|Gasification Combined Cycle w/o CC|Efficiency + remind-eu: Tech|Electricity|Biomass|Gasification Combined Cycle w/o CC|Efficiency tiam-ucl: Efficiency|Electricity|Biomass gasification|w/o CCS iam_aliases: gcam: Secondary Energy|Electricity|biomass (IGCC) image: Secondary Energy|Electricity|Biomass|w/o CCS|2 message: Secondary Energy|Electricity|Biomass|w/o CCS|1 remind: SE|Electricity|Biomass|++|Gasification Combined Cycle w/o CC + remind-eu: SE|Electricity|Biomass|++|Gasification Combined Cycle w/o CC tiam-ucl: Secondary Energy|Electricity|Biomass gasification|w/o CCS max_efficiency: 0.45 @@ -116,12 +120,14 @@ Biomass IGCC CCS: image: Efficiency|Electricity|Biomass|w/ CCS|1 message: Efficiency|Electricity|Biomass|w/o CCS|1 remind: Tech|Electricity|Biomass|Gasification Combined Cycle w/ CC|Efficiency + remind-eu: Tech|Electricity|Biomass|Gasification Combined Cycle w/ CC|Efficiency tiam-ucl: Efficiency|Electricity|Biomass gasification|w CCS iam_aliases: gcam: Secondary Energy|Electricity|biomass (IGCC CCS) image: Secondary Energy|Electricity|Biomass|w/ CCS|1 message: Secondary Energy|Electricity|Biomass|w/ CCS|1 remind: SE|Electricity|Biomass|++|Gasification Combined Cycle w/ CC + remind-eu: SE|Electricity|Biomass|++|Gasification Combined Cycle w/ CC tiam-ucl: Secondary Energy|Electricity|Biomass gasification|w CCS max_efficiency: 0.4 Biomass MSW: @@ -233,10 +239,12 @@ Coal CHP: eff_aliases: image: Efficiency|Electricity|Coal|w/o CCS|3 remind: Tech|Electricity|Coal|Combined Heat and Power w/o CC|Efficiency + remind-eu: Tech|Electricity|Coal|Combined Heat and Power w/o CC|Efficiency tiam-ucl: Efficiency|Electricity|CHP existing coal|w/o CCS iam_aliases: image: Secondary Energy|Electricity|Coal|w/o CCS|3 remind: SE|Electricity|Coal|++|Combined Heat and Power w/o CC + remind-eu: SE|Electricity|Coal|++|Combined Heat and Power w/o CC tiam-ucl: Secondary Energy|Electricity|CHP existing coal|w/o CCS max_efficiency: 0.45 Coal CHP CCS: @@ -273,12 +281,14 @@ Coal IGCC: image: Efficiency|Electricity|Coal|w/o CCS|2 message: Efficiency|Electricity|Coal|w/o CCS|1 remind: Tech|Electricity|Coal|Gasification Combined Cycle w/o CC|Efficiency + remind-eu: Tech|Electricity|Coal|Gasification Combined Cycle w/o CC|Efficiency tiam-ucl: Efficiency|Electricity|Coal IGCC|w/o CCS iam_aliases: gcam: Secondary Energy|Electricity|coal (IGCC) image: Secondary Energy|Electricity|Coal|w/o CCS|2 message: Secondary Energy|Electricity|Coal|w/o CCS|1 remind: SE|Electricity|Coal|++|Gasification Combined Cycle w/o CC + remind-eu: SE|Electricity|Coal|++|Gasification Combined Cycle w/o CC tiam-ucl: Secondary Energy|Electricity|Coal IGCC|w/o CCS max_efficiency: 0.55 Coal IGCC CCS: @@ -304,12 +314,14 @@ Coal IGCC CCS: image: Efficiency|Electricity|Coal|w/ CCS|1 message: Efficiency|Electricity|Coal|w/ CCS|1 remind: Tech|Electricity|Coal|Gasification Combined Cycle w/ CC|Efficiency + remind-eu: Tech|Electricity|Coal|Gasification Combined Cycle w/ CC|Efficiency tiam-ucl: Efficiency|Electricity|Coal IGCC|w CCS iam_aliases: gcam: Secondary Energy|Electricity|coal (IGCC CCS) image: Secondary Energy|Electricity|Coal|w/ CCS|1 message: Secondary Energy|Electricity|Coal|w/ CCS|1 remind: SE|Electricity|Coal|++|Gasification Combined Cycle w/ CC + remind-eu: SE|Electricity|Coal|++|Gasification Combined Cycle w/ CC tiam-ucl: Secondary Energy|Electricity|Coal IGCC|w CCS max_efficiency: 0.45 Coal PC: @@ -337,12 +349,14 @@ Coal PC: image: Efficiency|Electricity|Coal|w/o CCS|1 message: Efficiency|Electricity|Coal|w/o CCS|3 remind: Tech|Electricity|Coal|Pulverised Coal w/o CC|Efficiency + remind-eu: Tech|Electricity|Coal|Pulverised Coal w/o CC|Efficiency tiam-ucl: Efficiency|Electricity|Existing coal generation|w/o CCS iam_aliases: gcam: Secondary Energy|Electricity|coal (conv pul) image: Secondary Energy|Electricity|Coal|w/o CCS|1 message: Secondary Energy|Electricity|Coal|w/o CCS|3 remind: SE|Electricity|Coal|++|Pulverised Coal w/o CC + remind-eu: SE|Electricity|Coal|++|Pulverised Coal w/o CC tiam-ucl: Secondary Energy|Electricity|Existing coal generation|w/o CCS max_efficiency: 0.4 Coal PC CCS: @@ -496,12 +510,14 @@ Gas CC: image: Efficiency|Electricity|Gas|w/o CCS|2 message: Efficiency|Electricity|Gas|w/o CCS|1 remind: Tech|Electricity|Gas|Combined Cycle w/o CC|Efficiency + remind-eu: Tech|Electricity|Gas|Combined Cycle w/o CC|Efficiency tiam-ucl: Efficiency|Electricity|Gas CCGT|w/o CCS iam_aliases: gcam: Secondary Energy|Electricity|gas (CC) image: Secondary Energy|Electricity|Gas|w/o CCS|2 message: Secondary Energy|Electricity|Gas|w/o CCS|1 remind: SE|Electricity|Gas|++|Combined Cycle w/o CC + remind-eu: SE|Electricity|Gas|++|Combined Cycle w/o CC tiam-ucl: Secondary Energy|Electricity|Gas CCGT|w/o CCS max_efficiency: 0.65 Gas CC CCS: @@ -529,12 +545,14 @@ Gas CC CCS: image: Efficiency|Electricity|Gas|w/ CCS|1 message: Efficiency|Electricity|Gas|w/ CCS|1 remind: Tech|Electricity|Gas|Combined Cycle w/ CC|Efficiency + remind-eu: Tech|Electricity|Gas|Combined Cycle w/ CC|Efficiency tiam-ucl: Efficiency|Electricity|Gas CCGT|w CCS iam_aliases: gcam: Secondary Energy|Electricity|gas (CC CCS) image: Secondary Energy|Electricity|Gas|w/ CCS|1 message: Secondary Energy|Electricity|Gas|w/ CCS|1 remind: SE|Electricity|Gas|++|Combined Cycle w/ CC + remind-eu: SE|Electricity|Gas|++|Combined Cycle w/ CC tiam-ucl: Secondary Energy|Electricity|Gas CCGT|w CCS max_efficiency: 0.55 Gas CHP: @@ -563,10 +581,12 @@ Gas CHP: eff_aliases: image: Efficiency|Electricity|Gas|w/o CCS|3 remind: Tech|Electricity|Gas|Combined Heat and Power w/o CC|Efficiency + remind-eu: Tech|Electricity|Gas|Combined Heat and Power w/o CC|Efficiency tiam-ucl: Efficiency|Electricity|Gas CHP|w/o CCS iam_aliases: image: Secondary Energy|Electricity|Gas|w/o CCS|3 remind: SE|Electricity|Gas|++|Combined Heat and Power w/o CC + remind-eu: SE|Electricity|Gas|++|Combined Heat and Power w/o CC tiam-ucl: Secondary Energy|Electricity|Gas CHP|w/o CCS max_efficiency: 0.6 Gas CHP CCS: @@ -639,12 +659,14 @@ Gas OC: image: Efficiency|Electricity|Gas|w/o CCS|1 message: Efficiency|Electricity|Gas|w/o CCS|3 remind: Tech|Electricity|Gas|Gas Turbine|Efficiency + remind-eu: Tech|Electricity|Gas|Gas Turbine|Efficiency tiam-ucl: Efficiency|Electricity|Existing gas generation|w/o CCS iam_aliases: gcam: Secondary Energy|Electricity|gas (steam/CT) image: Secondary Energy|Electricity|Gas|w/o CCS|1 message: Secondary Energy|Electricity|Gas|w/o CCS|3 remind: SE|Electricity|Gas|++|Gas Turbine + remind-eu: SE|Electricity|Gas|++|Gas Turbine tiam-ucl: Secondary Energy|Electricity|Existing gas generation|w/o CCS max_efficiency: 0.5 Gas ST: @@ -670,10 +692,12 @@ Gas ST: image: Efficiency|Electricity|Gas|w/o CCS|1 message: Efficiency|Electricity|Gas|w/o CCS|2 remind: Tech|Electricity|Gas|Gas Turbine|Efficiency + remind-eu: Tech|Electricity|Gas|Gas Turbine|Efficiency exists in database: false iam_aliases: message: Secondary Energy|Electricity|Gas|w/o CCS|2 remind: SE|Electricity|Gas|++|Gas Turbine + remind-eu: SE|Electricity|Gas|++|Gas Turbine max_efficiency: 0.5 proxy: name: electricity production, natural gas, conventional power plant @@ -689,6 +713,7 @@ Geothermal: image: Secondary Energy|Electricity|Other message: Secondary Energy|Electricity|Geothermal remind: SE|Electricity|+|Geothermal + remind-eu: SE|Electricity|+|Geothermal tiam-ucl: Secondary Energy|Electricity|Geothermal Hydro: ecoinvent_aliases: @@ -704,6 +729,7 @@ Hydro: image: Secondary Energy|Electricity|Hydro message: Secondary Energy|Electricity|Hydro remind: SE|Electricity|+|Hydro + remind-eu: SE|Electricity|+|Hydro tiam-ucl: Secondary Energy|Electricity|Impoundment hydro Hydro, run-of-river: ecoinvent_aliases: @@ -739,6 +765,7 @@ Nuclear: image: Secondary Energy|Electricity|Nuclear message: Secondary Energy|Electricity|Nuclear remind: SE|Electricity|+|Nuclear + remind-eu: SE|Electricity|+|Nuclear tiam-ucl: Secondary Energy|Electricity|Nuclear Nuclear_EPR: ecoinvent_aliases: @@ -856,12 +883,14 @@ Oil ST: image: Efficiency|Electricity|Oil|w/o CCS|1 message: Efficiency|Electricity|Oil|w/o CCS|2 remind: Tech|Electricity|Oil|DOT|Efficiency + remind-eu: Tech|Electricity|Oil|DOT|Efficiency tiam-ucl: Efficiency|Electricity|Existing oil electric generation|w/o CCS iam_aliases: gcam: Secondary Energy|Electricity|refined liquids (steam/CT) image: Secondary Energy|Electricity|Oil|w/o CCS|1 message: Secondary Energy|Electricity|Oil|w/o CCS|2 remind: SE|Electricity|Oil|w/o CC + remind-eu: SE|Electricity|Oil|w/o CC tiam-ucl: Secondary Energy|Electricity|Existing oil electric generation|w/o CCS max_efficiency: 0.5 Solar CSP: @@ -874,6 +903,7 @@ Solar CSP: image: Secondary Energy|Electricity|Solar|CSP message: Secondary Energy|Electricity|Solar|CSP|1 remind: SE|Electricity|Solar|+|CSP + remind-eu: SE|Electricity|Solar|+|CSP tiam-ucl: Secondary Energy|Electricity|Concentrated Solar CSP centralised Solar CSP autonomous: ecoinvent_aliases: @@ -891,6 +921,7 @@ Solar PV Centralized: image: Secondary Energy|Electricity|Solar|PV|1 message: Secondary Energy|Electricity|Solar|PV remind: SE|Electricity|Solar|+|PV + remind-eu: SE|Electricity|Solar|+|PV tiam-ucl: Secondary Energy|Electricity|Concentrated Solar PV centralised Solar PV Residential: ecoinvent_aliases: @@ -914,6 +945,7 @@ Storage, Hydrogen: - electricity production, from hydrogen-fired one gigawatt gas turbine iam_aliases: remind: SE|Electricity|+|Hydrogen + remind-eu: SE|Electricity|+|Hydrogen Wave: ecoinvent_aliases: fltr: @@ -933,6 +965,7 @@ Wind Offshore: image: Secondary Energy|Electricity|Wind|2 message: Secondary Energy|Electricity|Wind|Offshore remind: SE|Electricity|Wind|+|Offshore + remind-eu: SE|Electricity|Wind|+|Offshore tiam-ucl: Secondary Energy|Electricity|Offshore wind centralised Wind Onshore: ecoinvent_aliases: @@ -949,4 +982,5 @@ Wind Onshore: image: Secondary Energy|Electricity|Wind|1 message: Secondary Energy|Electricity|Wind|Onshore remind: SE|Electricity|Wind|+|Onshore + remind-eu: SE|Electricity|Wind|+|Onshore tiam-ucl: Secondary Energy|Electricity|Onshore wind centralised diff --git a/premise/iam_variables_mapping/fuels_variables.yaml b/premise/iam_variables_mapping/fuels_variables.yaml index 264965eb..6cda73f3 100644 --- a/premise/iam_variables_mapping/fuels_variables.yaml +++ b/premise/iam_variables_mapping/fuels_variables.yaml @@ -111,6 +111,7 @@ natural gas: iam_aliases: gcam: Secondary Energy|Production|Natural Gas|Gas remind: SE|Gases|Fossil|+|Natural Gas + remind-eu: SE|Gases|Fossil|+|Natural Gas tiam-ucl: Secondary Energy|Liquids|Oil|Natural Gas Liquids message: Secondary Energy|Gases|Natural Gas ecoinvent_aliases: @@ -203,9 +204,11 @@ biomethane: iam_aliases: tiam-ucl: Secondary Energy|Liquids|Biomass|Biomethane|Biogas remind: SE|Gases|+|Biomass + remind-eu: SE|Gases|+|Biomass message: Secondary Energy|Gases|Biomass eff_aliases: remind: Tech|Gases|Biomass|w/o CC|Efficiency + remind-eu: Tech|Gases|Biomass|w/o CC|Efficiency ecoinvent_aliases: fltr: - biomethane, gaseous @@ -249,6 +252,7 @@ liquid fossil fuels: iam_aliases: gcam: Secondary Energy|Production|Refined Liquids|Oil remind: SE|Liquids|Fossil|+|Oil + remind-eu: SE|Liquids|Fossil|+|Oil image: Secondary Energy|Consumption|Liquids|Fossil message: Secondary Energy|Liquids|Oil|Fuel @@ -261,11 +265,13 @@ diesel: tiam-ucl: Secondary Energy|Liquids|Oil|Diesel gcam: Secondary Energy|Production|Refined Liquids|Oil|Diesel remind: SE|Liquids|Fossil|+|Oil|Diesel + remind-eu: SE|Liquids|Fossil|+|Oil|Diesel image: Secondary Energy|Consumption|Liquids|Fossil|Diesel message: Secondary Energy|Liquids|Oil|Fuel|Diesel eff_aliases: gcam: Efficiency|Refined Liquids|Oil remind: Tech|Liquids|Fossil|Oil|Efficiency + remind-eu: Tech|Liquids|Fossil|Oil|Efficiency ecoinvent_aliases: fltr: name: @@ -295,11 +301,13 @@ gasoline: tiam-ucl: Secondary Energy|Liquids|Oil|Gasoline gcam: Secondary Energy|Production|Refined Liquids|Oil|Gasoline remind: SE|Liquids|Fossil|+|Oil|Gasoline + remind-eu: SE|Liquids|Fossil|+|Oil|Gasoline image: Secondary Energy|Consumption|Liquids|Fossil|Gasoline message: Secondary Energy|Liquids|Oil|Fuel|Gasoline eff_aliases: gcam: Efficiency|Refined Liquids|Oil remind: Tech|Liquids|Fossil|Oil|Efficiency + remind-eu: Tech|Liquids|Fossil|Oil|Efficiency ecoinvent_aliases: fltr: reference product: @@ -339,6 +347,7 @@ petrol, synthetic, from electrolysis: iam_aliases: gcam: Secondary Energy|Production|Biomass|BTL hydrogen remind: SE|Liquids|+|Hydrogen + remind-eu: SE|Liquids|+|Hydrogen biogenic_share: 1 ecoinvent_aliases: fltr: @@ -353,6 +362,7 @@ petrol, synthetic, from coal: iam_aliases: gcam: Secondary Energy|Production|Coal to Liquids|w/oCCS remind: SE|Liquids|Fossil|Coal|+|w/o CC + remind-eu: SE|Liquids|Fossil|Coal|+|w/o CC message: Secondary Energy|Liquids|Coal|MTG|w/o CCS ecoinvent_aliases: fltr: @@ -367,6 +377,7 @@ petrol, synthetic, from coal, with CCS: iam_aliases: gcam: Secondary Energy|Production|Coal to Liquids|w/CCS remind: SE|Liquids|Fossil|Coal|+|w/ CC + remind-eu: SE|Liquids|Fossil|Coal|+|w/ CC message: Secondary Energy|Liquids|Coal|MTG|w/ CCS ecoinvent_aliases: fltr: @@ -382,6 +393,7 @@ diesel, synthetic, from electrolysis: tiam-ucl: Secondary Energy|Liquids|Hydrogen|Diesel gcam: Secondary Energy|Production|Hydrogen|Electrolysis remind: SE|Liquids|+|Hydrogen + remind-eu: SE|Liquids|+|Hydrogen ecoinvent_aliases: fltr: - diesel production, synthetic, Fischer Tropsch process, hydrogen from electrolysis, energy allocation @@ -399,6 +411,7 @@ diesel, synthetic, from coal: tiam-ucl: Secondary Energy|Liquids|Coal|FT|Diesel|w/o CCS gcam: Secondary Energy|Production|Coal to Liquids|w/oCCS remind: SE|Liquids|Fossil|Coal|+|w/o CC + remind-eu: SE|Liquids|Fossil|Coal|+|w/o CC message: Secondary Energy|Liquids|Coal|FT|w/o CCS ecoinvent_aliases: fltr: @@ -416,6 +429,7 @@ diesel, synthetic, from coal, with CCS: tiam-ucl: Secondary Energy|Liquids|Coal|FT|Diesel|w CCS gcam: Secondary Energy|Production|Coal to Liquids|w/CCS remind: SE|Liquids|Fossil|Coal|+|w/ CC + remind-eu: SE|Liquids|Fossil|Coal|+|w/ CC message: Secondary Energy|Liquids|Coal|FT|w/ CCS ecoinvent_aliases: fltr: @@ -430,6 +444,7 @@ diesel, synthetic, from wood: tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Diesel|w/o CCS gcam: Secondary Energy|Production|Refined Liquids|Biomass|FT Biofuels|w/oCCS remind: SE|Liquids|Biomass|BioFTR|w/o CC + remind-eu: SE|Liquids|Biomass|BioFTR|w/o CC image: Secondary Energy|Consumption|Liquids|Biomass|FT Diesel|Woody|w/oCCS message: Secondary Energy|Liquids|Biomass|FT|w/o CCS eff_aliases: @@ -448,6 +463,7 @@ diesel, synthetic, from wood, with CCS: tiam-ucl: Secondary Energy|Liquids|Biomass|FT|Diesel|w CCS gcam: Secondary Energy|Production|Refined Liquids|Biomass|FT Biofuels|w/CCS remind: SE|Liquids|Biomass|BioFTR|w/ CC + remind-eu: SE|Liquids|Biomass|BioFTR|w/ CC image: Secondary Energy|Consumption|Liquids|Biomass|FT Diesel|Woody|w/CCS message: Secondary Energy|Liquids|Biomass|FT|w/ CCS eff_aliases: @@ -528,11 +544,13 @@ hydrogen, from electrolysis, PEM: tiam-ucl: Secondary Energy|Hydrogen|Electrolysis|Hydrogen gcam: Secondary Energy|Production|Hydrogen|Electrolysis remind: SE|Hydrogen|+|Electricity + remind-eu: SE|Hydrogen|+|Electricity image: Secondary Energy|Hydrogen|Electrolysis message: Secondary Energy|Hydrogen|Electricity eff_aliases: gcam: Efficiency|Hydrogen|Electrolysis remind: Tech|Hydrogen|Electricity|Efficiency + remind-eu: Tech|Hydrogen|Electricity|Efficiency tiam-ucl: Efficiency|Hydrogen|Electrolysis ecoinvent_aliases: fltr: hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity @@ -587,11 +605,13 @@ hydrogen, from biomass: tiam-ucl: Secondary Energy|Hydrogen|Biomass|Hydrogen|w/o CCS gcam: Secondary Energy|Production|Hydrogen|Biomass|w/oCCS remind: SE|Hydrogen|Biomass|+|w/o CC + remind-eu: SE|Hydrogen|Biomass|+|w/o CC image: Secondary Energy|Hydrogen|Biomass|w/o CCS message: Secondary Energy|Hydrogen|Biomass|w/o CCS eff_aliases: gcam: Efficiency|Hydrogen|Biomass|w/oCCS remind: Tech|Hydrogen|Biomass|w/o CC|Efficiency + remind-eu: Tech|Hydrogen|Biomass|w/o CC|Efficiency ecoinvent_aliases: fltr: - hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, at gasification plant @@ -604,11 +624,13 @@ hydrogen, from biomass, with CCS: tiam-ucl: Secondary Energy|Hydrogen|Biomass|Hydrogen|w CCS gcam: Secondary Energy|Production|Hydrogen|Biomass|w/CCS remind: SE|Hydrogen|Biomass|+|w/ CC + remind-eu: SE|Hydrogen|Biomass|+|w/ CC image: Secondary Energy|Hydrogen|Biomass|w/ CCS message: Secondary Energy|Hydrogen|Biomass|w/ CCS eff_aliases: gcam: Efficiency|Hydrogen|Biomass|w/CCS remind: Tech|Hydrogen|Biomass|w/ CC|Efficiency + remind-eu: Tech|Hydrogen|Biomass|w/ CC|Efficiency ecoinvent_aliases: fltr: - hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, with CCS, at gasification plant @@ -620,10 +642,12 @@ hydrogen, from coal: iam_aliases: tiam-ucl: Secondary Energy|Hydrogen|Coal|Hydrogen|w/o CCS remind: SE|Hydrogen|Coal|+|w/o CC + remind-eu: SE|Hydrogen|Coal|+|w/o CC image: Secondary Energy|Hydrogen|Coal|w/o CCS message: Secondary Energy|Hydrogen|Coal|w/o CCS eff_aliases: remind: Tech|Hydrogen|Coal|w/o CC|Efficiency + remind-eu: Tech|Hydrogen|Coal|w/o CC|Efficiency ecoinvent_aliases: fltr: hydrogen production, coal gasification mask: CCS @@ -636,11 +660,13 @@ hydrogen, from coal, with CCS: tiam-ucl: Secondary Energy|Hydrogen|Coal|Hydrogen|w CCS gcam: Secondary Energy|Production|Hydrogen|Coal|w/CCS remind: SE|Hydrogen|Coal|+|w/ CC + remind-eu: SE|Hydrogen|Coal|+|w/ CC image: Secondary Energy|Hydrogen|Coal|w/ CCS message: Secondary Energy|Hydrogen|Coal|w/ CCS eff_aliases: gcam: Efficiency|Hydrogen|Coal|w/CCS remind: Tech|Hydrogen|Coal|w/ CC|Efficiency + remind-eu: Tech|Hydrogen|Coal|w/ CC|Efficiency ecoinvent_aliases: fltr: hydrogen production, coal gasification, with CCS @@ -653,11 +679,13 @@ hydrogen, from natural gas: tiam-ucl: Secondary Energy|Hydrogen|Natural Gas|Hydrogen|w/o CCS gcam: Secondary Energy|Production|Hydrogen|Gas|w/oCCS remind: SE|Hydrogen|Gas|+|w/o CC + remind-eu: SE|Hydrogen|Gas|+|w/o CC image: Secondary Energy|Hydrogen|Gas|w/o CCS message: Secondary Energy|Hydrogen|Gas|w/o CCS eff_aliases: gcam: Efficiency|Hydrogen|Gas|w/oCCS remind: Tech|Hydrogen|Gas|w/o CC|Efficiency + remind-eu: Tech|Hydrogen|Gas|w/o CC|Efficiency ecoinvent_aliases: fltr: hydrogen production, steam methane reforming mask: @@ -672,11 +700,13 @@ hydrogen, from natural gas, with CCS: iam_aliases: gcam: Secondary Energy|Production|Hydrogen|Gas|w/CCS remind: SE|Hydrogen|Gas|+|w/ CC + remind-eu: SE|Hydrogen|Gas|+|w/ CC image: Secondary Energy|Hydrogen|Gas|w/ CCS message: Secondary Energy|Hydrogen|Gas|w/o CCS eff_aliases: gcam: Efficiency|Hydrogen|Gas|w/CCS remind: Tech|Hydrogen|Gas|w/ CC|Efficiency + remind-eu: Tech|Hydrogen|Gas|w/ CC|Efficiency ecoinvent_aliases: fltr: hydrogen production, steam methane reforming, with CCS @@ -711,11 +741,13 @@ biodiesel, from used cooking oil: tiam-ucl: Secondary Energy|Liquids|Biomass|Biodiesel|w/o CCS gcam: Secondary Energy|Production|Refined Liquids|Biomass|Biodiesel remind: SE|Liquids|Biomass|Biodiesel|w/o CC + remind-eu: SE|Liquids|Biomass|Biodiesel|w/o CC image: Secondary Energy|Consumption|Liquids|Biomass|Biodiesel|Oilcrops|w/oCCS eff_aliases: tiam-ucl: Efficiency|Liquids|Biomass|FT fuel mix (diesel, kerosene, naptha, ELC)|w/o CCS gcam: Efficiency|Refined Liquids|Biomass|Biodiesel remind: Tech|Liquids|Biomass|Biodiesel|w/o CC|Efficiency + remind-eu: Tech|Liquids|Biomass|Biodiesel|w/o CC|Efficiency image: Efficiency|Liquids|Biomass|Biodiesel|Oilcrops|w/o CCS ecoinvent_aliases: fltr: @@ -758,11 +790,13 @@ bioethanol, from wood: iam_aliases: gcam: Secondary Energy|Production|Refined Liquids|Biomass|Ethanol|Cellulose|w/oCCS remind: SE|Liquids|Biomass|Cellulosic|+|w/o CC + remind-eu: SE|Liquids|Biomass|Cellulosic|+|w/o CC image: Secondary Energy|Consumption|Liquids|Biomass|Ethanol|Woody|w/oCCS message: Secondary Energy|Liquids|Biomass|Ethanol|w/o CCS eff_aliases: gcam: Efficiency|Refined Liquids|Biomass|Ethanol|Cellulose|w/oCCS remind: Tech|Liquids|Biomass|Cellulosic|w/o CC|Efficiency + remind-eu: Tech|Liquids|Biomass|Cellulosic|w/o CC|Efficiency image: Efficiency|Liquids|Biomass|Ethanol|Woody|w/o CCS ecoinvent_aliases: fltr: @@ -793,11 +827,13 @@ bioethanol, from wood, with CCS: iam_aliases: gcam: Secondary Energy|Production|Refined Liquids|Biomass|Ethanol|Cellulose|w/CCS remind: SE|Liquids|Biomass|Cellulosic|+|w/ CC + remind-eu: SE|Liquids|Biomass|Cellulosic|+|w/ CC image: Secondary Energy|Consumption|Liquids|Biomass|Ethanol|Woody|w/CCS message: Secondary Energy|Liquids|Biomass|Ethanol|w/ CCS eff_aliases: gcam: Efficiency|Refined Liquids|Biomass|Ethanol|Cellulose|w/CCS remind: Tech|Liquids|Biomass|Cellulosic|w/o CC|Efficiency + remind-eu: Tech|Liquids|Biomass|Cellulosic|w/o CC|Efficiency image: Efficiency|Liquids|Biomass|Ethanol|Woody|w/ CCS ecoinvent_aliases: fltr: @@ -819,9 +855,11 @@ bioethanol, from grass: biogenic_share: 1 iam_aliases: remind: SE|Liquids|Biomass|++|Non-Cellulosic + remind-eu: SE|Liquids|Biomass|++|Non-Cellulosic image: Secondary Energy|Consumption|Liquids|Biomass|Ethanol|Grassy|w/oCCS eff_aliases: remind: Tech|Liquids|Biomass|Cellulosic|w/o CC|Efficiency + remind-eu: Tech|Liquids|Biomass|Cellulosic|w/o CC|Efficiency image: Efficiency|Liquids|Biomass|Ethanol|Grassy|w/o CCS ecoinvent_aliases: fltr: @@ -927,10 +965,12 @@ bioethanol, from sugar: iam_aliases: gcam: Secondary Energy|Production|Refined Liquids|Biomass|Ethanol|Sugar remind: SE|Liquids|Biomass|Conventional Ethanol + remind-eu: SE|Liquids|Biomass|Conventional Ethanol image: Secondary Energy|Consumption|Liquids|Biomass|Ethanol|Sugar|w/oCCS eff_aliases: gcam: Efficiency|Refined Liquids|Biomass|Ethanol|Sugar remind: Tech|Liquids|Biomass|Conventional Ethanol|Efficiency + remind-eu: Tech|Liquids|Biomass|Conventional Ethanol|Efficiency image: Efficiency|Liquids|Biomass|Ethanol|Sugar|w/o CCS ecoinvent_aliases: fltr: diff --git a/premise/iam_variables_mapping/gains_regions_mapping.yaml b/premise/iam_variables_mapping/gains_regions_mapping.yaml index aa563cd9..5b791d8f 100644 --- a/premise/iam_variables_mapping/gains_regions_mapping.yaml +++ b/premise/iam_variables_mapping/gains_regions_mapping.yaml @@ -3,150 +3,175 @@ AFRI_EAST: message: AFR remind: SSA + remind-eu: SSA image: EAF tiam-ucl: AFR gcam: "South Africa" AFRI_NORT: message: AFR remind: MEA + remind-eu: MEA image: NAF tiam-ucl: AFR gcam: "South Africa" AFRI_WEST: message: AFR remind: SSA + remind-eu: SSA image: WAF tiam-ucl: AFR gcam: "South Africa" ASIA_STAN: message: PAS remind: OAS + remind-eu: OAS image: STAN tiam-ucl: ODA gcam: "Southeast Asia" BRAZ_WHOL: message: LAM remind: LAM + remind-eu: LAM image: BRA tiam-ucl: CSA gcam: Brazil CANA_WHOL: message: NAM remind: CAZ + remind-eu: CAZ image: CAN tiam-ucl: CAN gcam: Canada CEAM_REST: message: LAM remind: LAM + remind-eu: LAM image: RCAM tiam-ucl: CSA gcam: "Central America and Caribbean" CENT_EURO: message: EEU remind: EUR + remind-eu: EUR image: CEU tiam-ucl: EEU gcam: EU-15 CHIN_PLUS: message: CHN remind: CHA + remind-eu: CHA image: CHN tiam-ucl: CHI gcam: China INDI_WHOL: message: SAS remind: IND + remind-eu: IND image: INDIA tiam-ucl: CHI gcam: India INDO_PLUS: message: PAS remind: OAS + remind-eu: OAS image: INDO tiam-ucl: ODA gcam: Indonesia JAPA_WHOL: message: PAO remind: JPN + remind-eu: JPN image: JAP tiam-ucl: JAP gcam: Japan KORE_AALL: message: PAS remind: OAS + remind-eu: OAS image: KOR tiam-ucl: SKO gcam: "South Korea" LAME_REST: message: LAM remind: LAM + remind-eu: LAM image: RSAM tiam-ucl: CSA gcam: "South America_Southern" MEXI_WHOL: message: LAM remind: LAM + remind-eu: LAM image: MEX tiam-ucl: MEX gcam: Mexico MIDD_EAST: message: MEA remind: MEA + remind-eu: MEA image: ME tiam-ucl: MEA gcam: "Middle East" OCEA_WHOL: message: PAO remind: CAZ + remind-eu: CAZ image: OCE tiam-ucl: AUS gcam: Australia_NZ RUSS_PLUS: message: FSU remind: REF + remind-eu: REF image: RUS tiam-ucl: FSU gcam: Russia SAFR_WHOL: message: AFR remind: SSA + remind-eu: SSA image: SAF tiam-ucl: AFR gcam: "South Africa" SOEA_ASIA: message: PAS remind: OAS + remind-eu: OAS image: SEAS tiam-ucl: ODA gcam: "Southeast Asia" SOUA_REST: message: SAS remind: OAS + remind-eu: OAS image: RSAS tiam-ucl: ODA gcam: "Southeast Asia" TURK_WHOL: message: WEU remind: MEA + remind-eu: MEA image: TUR tiam-ucl: MEA gcam: "Middle East" UKRA_PLUS: message: FSU remind: REF + remind-eu: REF image: UKR tiam-ucl: FSU gcam: EU-15 USAM_WHOL: message: NAM remind: USA + remind-eu: USA image: USA tiam-ucl: USA gcam: USA WEST_EURO: message: WEU remind: NEU + remind-eu: NEU image: WEU tiam-ucl: WEU gcam: EU-15 \ No newline at end of file diff --git a/premise/iam_variables_mapping/iam_region_to_climate.yaml b/premise/iam_variables_mapping/iam_region_to_climate.yaml index f1fbb28e..6cb03e00 100644 --- a/premise/iam_variables_mapping/iam_region_to_climate.yaml +++ b/premise/iam_variables_mapping/iam_region_to_climate.yaml @@ -42,6 +42,29 @@ remind: REF: temperate USA: temperate +remind-eu: + OAS: tropical + ENC: temperate + NES: temperate + MEA: tropical + SSA: tropical + LAM: tropical + REF: temperate + CAZ: temperate + EWN: temperate + ECS: temperate + CHA: temperate + ESC: temperate + ECE: temperate + FRA: temperate + DEU: temperate + UKI: temperate + NEN: temperate + IND: tropical + JPN: temperate + ESW: temperate + USA: temperate + message: AFR: tropical CHN: temperate diff --git a/premise/iam_variables_mapping/missing_geography_equivalences.yaml b/premise/iam_variables_mapping/missing_geography_equivalences.yaml index 5305d8a4..0041e4b0 100644 --- a/premise/iam_variables_mapping/missing_geography_equivalences.yaml +++ b/premise/iam_variables_mapping/missing_geography_equivalences.yaml @@ -4,210 +4,245 @@ --- Europe without Switzerland and Austria: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 Europe without Austria: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 Europe without Switzerland: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 North America without Quebec: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA RER w/o RU: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 RER: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 RoW: remind: World + remind-eu: World image: World message: World tiam-ucl: World gcam: World GLO: remind: World + remind-eu: World image: World message: World tiam-ucl: World gcam: World RNA: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA SAS: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IAI Area, EU27 & EFTA: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 UN-OCEANIA: remind: CAZ + remind-eu: AUS image: OCE message: PAO tiam-ucl: AUS gcam: Australia_NZ UN-SEASIA: remind: OAS + remind-eu: OAS image: SEAS message: PAS tiam-ucl: ODA gcam: Southeast Asia RAF: remind: SSA + remind-eu: RSAF image: RSAF message: AFR tiam-ucl: AFR gcam: South Africa RAS: remind: CHA + remind-eu: CHN image: CHN message: CHN tiam-ucl: CHI gcam: China IAI Area, Africa: remind: SSA + remind-eu: RSAF image: RSAF message: AFR tiam-ucl: AFR gcam: South Africa RER w/o CH+DE: remind: EUR + remind-eu: FRA image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 RER w/o DE+NL+RU: remind: EUR + remind-eu: FRA image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 IAI Area, Asia, without China and GCC: remind: OAS + remind-eu: OAS image: SEAS message: PAS tiam-ucl: ODA gcam: Southeast Asia Europe, without Russia and Turkey: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 WECC: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA WEU: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 UCTE: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 UCTE without Germany: remind: EUR + remind-eu: FRA image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 NORDEL: remind: NEU + remind-eu: NEN image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 ENTSO-E: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 RLA: remind: LAM + remind-eu: LAM image: RSAM message: LAM tiam-ucl: CSA gcam: South America_Southern IAI Area, South America: remind: LAM + remind-eu: RSAM image: RSAM message: LAM tiam-ucl: CSA gcam: South America_Southern IAI Area, Russia & RER w/o EU27 & EFTA: remind: REF + remind-eu: REF image: RUS message: FSU tiam-ucl: FSU gcam: Russia IAI Area, North America: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA OCE: remind: CAZ + remind-eu: CAZ image: OCE message: PAO tiam-ucl: AUS gcam: Australia_NZ US-PR: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA US only: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA APAC: remind: OAS + remind-eu: OAS image: SEAS message: PAS tiam-ucl: ODA gcam: Southeast Asia CN-NCGC: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI @@ -215,6 +250,7 @@ CN-NCGC: CN-CSG: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI @@ -222,30 +258,35 @@ CN-CSG: CN-SWG: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-CCG: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-ECGC: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China RoE: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 CN-NWG: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI @@ -253,6 +294,7 @@ CN-NWG: CN-NECG: remind: CHA + remind-eu: CHA image: CHN message: CHN gcam: China @@ -260,6 +302,7 @@ CN-NECG: IN-DD: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA @@ -267,6 +310,7 @@ IN-DD: IN-DN: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA @@ -274,6 +318,7 @@ IN-DN: LA: # Laos remind: OAS + remind-eu: OAS image: SEAS message: PAS tiam-ucl: ODA @@ -282,6 +327,7 @@ LA: # Laos # Fiji FJ: remind: OAS + remind-eu: OAS image: SEAS message: PAS tiam-ucl: ODA @@ -290,6 +336,7 @@ FJ: # Guinea GN: remind: SSA + remind-eu: SSA image: RSAF message: AFR tiam-ucl: AFR @@ -298,6 +345,7 @@ GN: # Guyana GY: remind: LAM + remind-eu: LAM image: RSAM message: LAM tiam-ucl: CSA @@ -306,6 +354,7 @@ GY: # Sierra Leone SL: remind: SSA + remind-eu: SSA image: RSAF message: AFR tiam-ucl: AFR @@ -314,6 +363,7 @@ SL: # add Solomon Islands SB: remind: OAS + remind-eu: OAS image: SEAS message: PAS tiam-ucl: ODA @@ -322,6 +372,7 @@ SB: # add Uganda UG: remind: SSA + remind-eu: SSA image: RSAF message: AFR tiam-ucl: AFR @@ -330,6 +381,7 @@ UG: # add Afghanistan AF: remind: OAS + remind-eu: OAS image: SEAS message: PAS tiam-ucl: ODA @@ -338,6 +390,7 @@ AF: # add Mauritius MR: remind: SSA + remind-eu: SSA image: RSAF message: AFR tiam-ucl: AFR @@ -345,12 +398,14 @@ MR: BR-North-eastern grid: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-Northern grid: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA @@ -358,12 +413,14 @@ BR-Northern grid: BR-South-eastern/Mid-western grid: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-Southern grid: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA @@ -371,708 +428,833 @@ BR-Southern grid: CN-JS: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-OR: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-TO: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-BA: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil IN-UP: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-PI: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-ZJ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CA-NS: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada BR-AP: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-RS: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CA-QC: remind: CAZ + remind-eu: CAZ image: CAN message: NAM tiam-ucl: CAN gcam: Canada US-TRE: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA CN-NM: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CA-SK: remind: CAZ + remind-eu: CAZ image: CAN message: NAM tiam-ucl: CAN gcam: Canada BR-PR: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-GZ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China BR-MG: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CA-NT: remind: CAZ + remind-eu: CAZ image: CAN message: NAM tiam-ucl: CAN gcam: Canada BR-SE: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-PA: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil IN-TN: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-HN: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-PY: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-Southern grid: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-PB: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CA-MB: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada IN-GJ: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-LN: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-HR: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-CE: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil IN-AS: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-AM: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-AH: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-HE: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-GX: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-XJ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-HL: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CA-ON: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada IN-DL: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India US-ASCC: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA CA-PE: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada BR-RO: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-BJ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-Northern grid: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-RJ: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CA-NB: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada IN-HP: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-GS: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China Canada without Quebec: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada US-NPCC: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA CN-XZ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China BR-DF: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil IN-KA: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-MP: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-Eastern grid: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CA-NF: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada US-HICC: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA IN-KL: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-AC: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil US-MRO: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA US-RFC: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA CN-SD: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-SX: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-SA: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-MH: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-FJ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China BR-SP: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-HB: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China BR-SC: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-NX: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China BR-MA: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-SC: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CN-CQ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CA-BC: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada CN-GD: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-Western grid: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-MS: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-YN: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China CA-AB: remind: CAZ + remind-eu: CAN image: CAN message: NAM tiam-ucl: CAN gcam: Canada IN-JH: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-TR: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-GA: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CA-YK: remind: CAZ + remind-eu: CAZ image: CAN message: NAM tiam-ucl: CAN gcam: Canada US-WECC: remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA BR-MT: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-HA: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-North-eastern grid: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-PE: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-JX: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China BR-ES: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-RR: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-RN: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil IN-RJ: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-AR: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India US-SERC: remind: USA + remind-eu: USA + image: USA + message: NAM + tiam-ucl: USA + gcam: USA +US-FRCC: + remind: USA + remind-eu: USA image: USA message: NAM tiam-ucl: USA gcam: USA IN-WB: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-TJ: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-ML: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India BR-GO: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil BR-AL: remind: LAM + remind-eu: LAM image: BRA message: LAM tiam-ucl: CSA gcam: Brazil CN-JL: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-JK: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-HU: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-AP: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-SH: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-UT: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India RME: remind: EUR + remind-eu: DEU image: WEU message: WEU tiam-ucl: WEU gcam: EU-15 IN-PB: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CA-NU: remind: CAZ + remind-eu: CAZ image: CAN message: NAM tiam-ucl: CAN gcam: Canada IN-CT: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-MZ: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-MN: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-BR: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-QH: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-SK: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India CN-SGCC: remind: CHA + remind-eu: CHA image: CHN message: CHN tiam-ucl: CHI gcam: China IN-NL: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA gcam: India IN-CH: remind: IND + remind-eu: IND image: INDIA message: SAS tiam-ucl: ODA diff --git a/premise/iam_variables_mapping/other_variables.yaml b/premise/iam_variables_mapping/other_variables.yaml index a2f86f6e..e6145e87 100644 --- a/premise/iam_variables_mapping/other_variables.yaml +++ b/premise/iam_variables_mapping/other_variables.yaml @@ -2,6 +2,7 @@ gdp: iam_aliases: message: GDP|PPP remind: GDP|PPP + remind-eu: GDP|PPP image: GDP|PPP tiam-ucl: GDP|PPP @@ -9,17 +10,20 @@ population: iam_aliases: message: Population remind: Population + remind-eu: Population image: Population tiam-ucl: Population GMST: iam_aliases: remind: Temperature|Global Mean + remind-eu: Temperature|Global Mean image: Temperature|Global Mean tiam-ucl: Temperature|Global Mean CO2: iam_aliases: remind: Emi|CO2 + remind-eu: Emi|CO2 image: Emissions|CO2 message: Emissions|CO2 tiam-ucl: Emissions|CO2 \ No newline at end of file diff --git a/premise/iam_variables_mapping/steel_variables.yaml b/premise/iam_variables_mapping/steel_variables.yaml index a4b86a41..4f46221f 100644 --- a/premise/iam_variables_mapping/steel_variables.yaml +++ b/premise/iam_variables_mapping/steel_variables.yaml @@ -4,6 +4,7 @@ steel - primary: iam_aliases: remind: Production|Industry|Steel|Primary + remind-eu: Production|Industry|Steel|Primary image: Production|Industry|Iron and Steel|Primary message: Production|Primary|Steel gcam: Production|Industry|Steel|Primary @@ -17,6 +18,8 @@ steel - primary: energy_use_aliases: remind: - FE|Industry|Steel|++|Primary + remind-eu: + - FE|Industry|Steel|++|Primary image: - Final Energy|Industry|Steel|Gases - Final Energy|Industry|Steel|Heat @@ -123,6 +126,7 @@ steel - primary: steel - secondary: iam_aliases: remind: Production|Industry|Steel|Secondary + remind-eu: Production|Industry|Steel|Secondary image: Production|Industry|Iron and Steel|EAF scrap message: Production|Secondary|Steel gcam: Production|Industry|Steel|Secondary @@ -138,6 +142,8 @@ steel - secondary: energy_use_aliases: remind: - FE|Industry|Steel|++|Secondary + remind-eu: + - FE|Industry|Steel|++|Secondary image: - Final Energy|Industry|Steel|Electricity message: diff --git a/premise/iam_variables_mapping/topologies/remind-eu-topology.json b/premise/iam_variables_mapping/topologies/remind-eu-topology.json new file mode 100644 index 00000000..0ced79e8 --- /dev/null +++ b/premise/iam_variables_mapping/topologies/remind-eu-topology.json @@ -0,0 +1,294 @@ +{ + "CAZ": [ + "AU", + "CA", + "HM", + "NZ", + "PM" + ], + "CHA": [ + "CN", + "HK", + "MO", + "TW" + ], + "DEU": [ + "DE" + ], + "ECE": [ + "CZ", + "EE", + "LV", + "LT", + "PL", + "SK" + ], + "ECS": [ + "BG", + "HR", + "HU", + "RO", + "SI" + ], + "ENC": [ + "AX", + "DK", + "FO", + "FI", + "SE" + ], + "ESC": [ + "CY", + "GR", + "IT", + "MT" + ], + "ESW": [ + "PT", + "ES" + ], + "EWN": [ + "AT", + "BE", + "LU", + "NL" + ], + "FRA": [ + "FR" + ], + "IND": [ + "IN" + ], + "JPN": [ + "JP" + ], + "LAM": [ + "AI", + "AQ", + "AG", + "AR", + "AW", + "BS", + "BB", + "BZ", + "BM", + "BO", + "BQ", + "BV", + "BR", + "KY", + "CL", + "CO", + "CR", + "CU", + "CW", + "DM", + "DO", + "EC", + "SV", + "FK", + "GF", + "GD", + "GP", + "GT", + "GY", + "HT", + "HN", + "JM", + "MQ", + "MX", + "MS", + "NI", + "PA", + "PY", + "PE", + "PR", + "BL", + "KN", + "LC", + "MF", + "VC", + "SX", + "GS", + "SR", + "TT", + "TC", + "UY", + "VE", + "VG", + "VI" + ], + "MEA": [ + "DZ", + "BH", + "EG", + "IR", + "IQ", + "IL", + "JO", + "KW", + "LB", + "LY", + "MA", + "OM", + "PS", + "QA", + "SA", + "SD", + "SY", + "TN", + "AE", + "EH", + "YE" + ], + "NEN": [ + "GL", + "IS", + "LI", + "NO", + "SJ", + "CH" + ], + "NES": [ + "AL", + "AD", + "BA", + "VA", + "MK", + "MC", + "ME", + "SM", + "RS", + "TR" + ], + "OAS": [ + "AF", + "AS", + "BD", + "BT", + "IO", + "BN", + "KH", + "CX", + "CC", + "CK", + "FJ", + "PF", + "TF", + "GU", + "ID", + "KI", + "KP", + "KR", + "LA", + "MY", + "MV", + "MH", + "FM", + "MN", + "MM", + "NR", + "NP", + "NC", + "NU", + "NF", + "MP", + "PK", + "PW", + "PG", + "PH", + "PN", + "WS", + "SG", + "SB", + "LK", + "TH", + "TL", + "TK", + "TO", + "TV", + "UM", + "VU", + "VN", + "WF" + ], + "REF": [ + "AM", + "AZ", + "BY", + "GE", + "KZ", + "KG", + "MD", + "RU", + "TJ", + "TM", + "UA", + "UZ" + ], + "SSA": [ + "AO", + "BJ", + "BW", + "BF", + "BI", + "CM", + "CV", + "CF", + "TD", + "KM", + "CG", + "CD", + "CI", + "DJ", + "GQ", + "ER", + "ET", + "GA", + "GM", + "GH", + "GN", + "GW", + "KE", + "LS", + "LR", + "MG", + "MW", + "ML", + "MR", + "MU", + "YT", + "MZ", + "NA", + "NE", + "NG", + "RE", + "RW", + "SH", + "ST", + "SN", + "SC", + "SL", + "SO", + "ZA", + "SS", + "SZ", + "TZ", + "TG", + "UG", + "ZM", + "ZW" + ], + "UKI": [ + "GI", + "GG", + "IE", + "IM", + "JE", + "GB" + ], + "USA": [ + "US" + ], + "World": ["GLO", "RoW"] +} \ No newline at end of file diff --git a/premise/iam_variables_mapping/transport_bus_variables.yaml b/premise/iam_variables_mapping/transport_bus_variables.yaml index 749922ef..82c4c4a7 100644 --- a/premise/iam_variables_mapping/transport_bus_variables.yaml +++ b/premise/iam_variables_mapping/transport_bus_variables.yaml @@ -4,9 +4,11 @@ 'bus, diesel': iam_aliases: remind: ES|Transport|Pass|Road|Bus|Liquids + remind-eu: ES|Transport|Pass|Road|Bus|Liquids tiam-ucl: Distance|Transport|Bus|Diesel|Diesel energy_use_aliases: remind: FE|Transport|Pass|Road|Bus|Liquids + remind-eu: FE|Transport|Pass|Road|Bus|Liquids tiam-ucl: Final Energy|Transport|Bus|Diesel|Diesel ecoinvent_aliases: fltr: @@ -42,9 +44,11 @@ 'bus, compressed gas': iam_aliases: remind: ES|Transport|Pass|Road|Bus|Gases + remind-eu: ES|Transport|Pass|Road|Bus|Gases tiam-ucl: Distance|Transport|Bus|Natural Gas|Natural Gas energy_use_aliases: remind: FE|Transport|Pass|Road|Bus|Gases + remind-eu: FE|Transport|Pass|Road|Bus|Gases tiam-ucl: Final Energy|Transport|Bus|Natural Gas|Natural Gas ecoinvent_aliases: fltr: @@ -68,9 +72,11 @@ 'bus, fuel cell': iam_aliases: remind: ES|Transport|Pass|Road|Bus|FCEV + remind-eu: ES|Transport|Pass|Road|Bus|FCEV tiam-ucl: Distance|Transport|Bus|Hydrogen Fuel Cell|Bus Hydrogen energy_use_aliases: remind: FE|Transport|Pass|Road|Bus|FCEV + remind-eu: FE|Transport|Pass|Road|Bus|FCEV tiam-ucl: Final Energy|Transport|Bus|Hydrogen Fuel Cell|Bus Hydrogen ecoinvent_aliases: fltr: @@ -81,8 +87,10 @@ 'bus, battery electric': iam_aliases: remind: ES|Transport|Pass|Road|Bus|Electric + remind-eu: ES|Transport|Pass|Road|Bus|Electric energy_use_aliases: remind: FE|Transport|Pass|Road|Bus|Electric + remind-eu: FE|Transport|Pass|Road|Bus|Electric ecoinvent_aliases: fltr: - 'transport, passenger bus, battery electric - overnight charging, 13m single deck urban bus' diff --git a/premise/iam_variables_mapping/transport_passenger_cars_variables.yaml b/premise/iam_variables_mapping/transport_passenger_cars_variables.yaml index 2015701b..888d40cb 100644 --- a/premise/iam_variables_mapping/transport_passenger_cars_variables.yaml +++ b/premise/iam_variables_mapping/transport_passenger_cars_variables.yaml @@ -4,8 +4,10 @@ 'passenger car, battery electric, large': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Large|BEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Large|BEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Large|BEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Large|BEV ecoinvent_aliases: fltr: - 'transport, passenger car, battery electric, Large' @@ -17,8 +19,10 @@ 'passenger car, fuel cell electric, large': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Large|FCEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Large|FCEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Large|FCEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Large|FCEV ecoinvent_aliases: fltr: - 'transport, passenger car, fuel cell electric, Large' @@ -30,8 +34,10 @@ 'passenger car, compressed gas, large': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Large|Gases + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Large|Gases energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Large|Gases + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Large|Gases ecoinvent_aliases: fltr: - 'transport, passenger car, compressed gas, Large, EURO-6' @@ -44,8 +50,10 @@ 'passenger car, plugin gasoline hybrid, large': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Large|Hybrid Electric + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Large|Hybrid Electric energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Large|Hybrid Electric + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Large|Hybrid Electric ecoinvent_aliases: fltr: - 'transport, passenger car, plugin gasoline hybrid, Large' @@ -59,8 +67,10 @@ 'passenger car, gasoline, large': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Large|Liquids + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Large|Liquids energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Large|Liquids + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Large|Liquids ecoinvent_aliases: fltr: - 'transport, passenger car, gasoline, Large, EURO-6' @@ -73,9 +83,11 @@ 'passenger car, battery electric, medium': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Medium|BEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Medium|BEV tiam-ucl: Distance|Transport|Car|Electric|Electricity energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Medium|BEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Medium|BEV tiam-ucl: Final Energy|Transport|Car|Electric|Electricity ecoinvent_aliases: fltr: @@ -88,10 +100,12 @@ 'passenger car, fuel cell electric, medium': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Medium|FCEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Medium|FCEV tiam-ucl: - Distance|Transport|Car|Hydrogen Fuel Cell|Car Hydrogen energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Medium|FCEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Medium|FCEV tiam-ucl: - Final Energy|Transport|Car|Hydrogen Fuel Cell|Car Hydrogen - Final Energy|Transport|Car|Hydrogen Fuel Cell|Electricity @@ -106,9 +120,11 @@ 'passenger car, compressed gas, medium': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Medium|Gases + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Medium|Gases tiam-ucl: Distance|Transport|Car|Natural Gas|Natural Gas energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Medium|Gases + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Medium|Gases tiam-ucl: Final Energy|Transport|Car|Natural Gas|Natural Gas ecoinvent_aliases: fltr: @@ -137,11 +153,13 @@ 'passenger car, plugin gasoline hybrid, medium': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Medium|Hybrid Electric + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Medium|Hybrid Electric tiam-ucl: - Distance|Transport|Car|Gasoline Plug-in Hybrid|Electricity - Distance|Transport|Car|Gasoline Plug-in Hybrid|Gasoline energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Medium|Hybrid Electric + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Medium|Hybrid Electric tiam-ucl: - Final Energy|Transport|Car|Gasoline Plug-in Hybrid|Electricity - Final Energy|Transport|Car|Gasoline Plug-in Hybrid|Gasoline @@ -204,12 +222,14 @@ 'passenger car, gasoline, medium': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Medium|Liquids + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Medium|Liquids tiam-ucl: - Distance|Transport|Car|Ethanol|Bioethanol - Distance|Transport|Car|Ethanol|Gasoline - Distance|Transport|Car|Gasoline|Gasoline energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Medium|Liquids + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Medium|Liquids tiam-ucl: - Final Energy|Transport|Car|Ethanol|Bioethanol - Final Energy|Transport|Car|Ethanol|Gasoline @@ -240,8 +260,10 @@ 'passenger car, battery electric, mini': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Mini|BEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Mini|BEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Mini|BEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Mini|BEV ecoinvent_aliases: fltr: - 'transport, passenger car, battery electric, Mini' @@ -251,8 +273,10 @@ 'passenger car, fuel cell electric, mini': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Mini|FCEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Mini|FCEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Mini|FCEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Mini|FCEV ecoinvent_aliases: fltr: - 'transport, passenger car, fuel cell electric, Mini' @@ -262,8 +286,10 @@ 'passenger car, compressed gas, mini': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Mini|Gases + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Mini|Gases energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Mini|Gases + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Mini|Gases ecoinvent_aliases: fltr: - 'transport, passenger car, compressed gas, Mini, EURO-6' @@ -275,8 +301,10 @@ 'passenger car, plugin gasoline hybrid, mini': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Mini|Hybrid Electric + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Mini|Hybrid Electric energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Mini|Hybrid Electric + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Mini|Hybrid Electric ecoinvent_aliases: fltr: - 'transport, passenger car, plugin gasoline hybrid, Mini' @@ -288,8 +316,10 @@ 'passenger car, gasoline, mini': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Mini|Liquids + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Mini|Liquids energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Mini|Liquids + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Mini|Liquids ecoinvent_aliases: fltr: - 'transport, passenger car, gasoline, Mini, EURO-6' @@ -301,8 +331,10 @@ 'passenger car, battery electric, medium SUV': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|SUV|BEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|SUV|BEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|SUV|BEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|SUV|BEV ecoinvent_aliases: fltr: - 'transport, passenger car, battery electric, Medium SUV' @@ -312,8 +344,10 @@ 'passenger car, fuel cell electric, medium SUV': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|SUV|FCEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|SUV|FCEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|SUV|FCEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|SUV|FCEV ecoinvent_aliases: fltr: - 'transport, passenger car, fuel cell electric, Medium SUV' @@ -323,8 +357,10 @@ 'passenger car, compressed gas, medium SUV': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|SUV|Gases + remind-eu: ES|Transport|VKM|Pass|Road|LDV|SUV|Gases energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|SUV|Gases + remind-eu: FE|Transport|VKM|Pass|Road|LDV|SUV|Gases ecoinvent_aliases: fltr: - 'transport, passenger car, compressed gas, Medium SUV, EURO-6' @@ -336,8 +372,10 @@ 'passenger car, plugin gasoline hybrid, medium SUV': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|SUV|Hybrid Electric + remind-eu: ES|Transport|VKM|Pass|Road|LDV|SUV|Hybrid Electric energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|SUV|Hybrid Electric + remind-eu: FE|Transport|VKM|Pass|Road|LDV|SUV|Hybrid Electric ecoinvent_aliases: fltr: - 'transport, passenger car, plugin gasoline hybrid, Medium SUV' @@ -349,8 +387,10 @@ 'passenger car, gasoline, medium SUV': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|SUV|Liquids + remind-eu: ES|Transport|VKM|Pass|Road|LDV|SUV|Liquids energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|SUV|Liquids + remind-eu: FE|Transport|VKM|Pass|Road|LDV|SUV|Liquids ecoinvent_aliases: fltr: - 'transport, passenger car, gasoline, Medium SUV, EURO-6' @@ -362,8 +402,10 @@ 'passenger car, battery electric, small': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Small|BEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Small|BEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Small|BEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Small|BEV ecoinvent_aliases: fltr: - 'transport, passenger car, battery electric, Small' @@ -373,8 +415,10 @@ 'passenger car, fuel cell electric, small': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Small|FCEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Small|FCEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Small|FCEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Small|FCEV ecoinvent_aliases: fltr: - 'transport, passenger car, fuel cell electric, Small' @@ -384,8 +428,10 @@ 'passenger car, compressed gas, small': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Small|Gases + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Small|Gases energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Small|Gases + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Small|Gases ecoinvent_aliases: fltr: - 'transport, passenger car, compressed gas, Small, EURO-6' @@ -397,8 +443,10 @@ 'passenger car, plugin gasoline hybrid, small': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Small|Hybrid Electric + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Small|Hybrid Electric energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Small|Hybrid Electric + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Small|Hybrid Electric ecoinvent_aliases: fltr: - 'transport, passenger car, plugin gasoline hybrid, Small' @@ -410,8 +458,10 @@ 'passenger car, gasoline, small': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Small|Liquids + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Small|Liquids energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Small|Liquids + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Small|Liquids ecoinvent_aliases: fltr: - 'transport, passenger car, gasoline, Small, EURO-6' @@ -423,8 +473,10 @@ 'passenger car, battery electric, van': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Van|BEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Van|BEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Van|BEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Van|BEV ecoinvent_aliases: fltr: - 'transport, passenger car, battery electric, Van' @@ -434,8 +486,10 @@ 'passenger car, fuel cell electric, van': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Van|FCEV + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Van|FCEV energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Van|FCEV + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Van|FCEV ecoinvent_aliases: fltr: - 'transport, passenger car, fuel cell electric, Van' @@ -445,8 +499,10 @@ 'passenger car, compressed gas, van': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Van|Gases + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Van|Gases energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Van|Gases + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Van|Gases ecoinvent_aliases: fltr: - 'transport, passenger car, compressed gas, Van, EURO-6' @@ -458,8 +514,10 @@ 'passenger car, plugin gasoline hybrid, van': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Van|Hybrid Electric + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Van|Hybrid Electric energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Van|Hybrid Electric + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Van|Hybrid Electric ecoinvent_aliases: fltr: - 'transport, passenger car, plugin gasoline hybrid, Van' @@ -471,8 +529,10 @@ 'passenger car, gasoline, van': iam_aliases: remind: ES|Transport|VKM|Pass|Road|LDV|Van|Liquids + remind-eu: ES|Transport|VKM|Pass|Road|LDV|Van|Liquids energy_use_aliases: remind: FE|Transport|VKM|Pass|Road|LDV|Van|Liquids + remind-eu: FE|Transport|VKM|Pass|Road|LDV|Van|Liquids ecoinvent_aliases: fltr: - 'transport, passenger car, gasoline, Van, EURO-6' diff --git a/premise/iam_variables_mapping/transport_railfreight_variables.yaml b/premise/iam_variables_mapping/transport_railfreight_variables.yaml index f8dd9b0e..03a59676 100644 --- a/premise/iam_variables_mapping/transport_railfreight_variables.yaml +++ b/premise/iam_variables_mapping/transport_railfreight_variables.yaml @@ -5,9 +5,11 @@ train, electric: iam_aliases: remind: ES|Transport|Freight|Rail|Electric + remind-eu: ES|Transport|Freight|Rail|Electric tiam-ucl: Distance|Transport|Rail|Freight|Electricity energy_use_aliases: remind: FE|Transport|Freight|Rail|Electricity + remind-eu: FE|Transport|Freight|Rail|Electricity tiam-ucl: Final Energy|Transport|Rail|Freight|Electricity ecoinvent_aliases: fltr: @@ -21,6 +23,9 @@ train, diesel-electric: remind: - ES|Transport|Freight|Rail|Liquids|Fossil - ES|Transport|Freight|Rail|Liquids|Biomass + remind-eu: + - ES|Transport|Freight|Rail|Liquids|Fossil + - ES|Transport|Freight|Rail|Liquids|Biomass tiam-ucl: - Final Energy|Transport|Rail|Freight|Biodiesel - Final Energy|Transport|Rail|Freight|Diesel @@ -28,6 +33,9 @@ train, diesel-electric: remind: - FE|Transport|Freight|Rail|Liquids|Fossil - FE|Transport|Freight|Rail|Liquids|Biomass + remind-eu: + - FE|Transport|Freight|Rail|Liquids|Fossil + - FE|Transport|Freight|Rail|Liquids|Biomass tiam-ucl: - Distance|Transport|Rail|Freight|Biodiesel - Distance|Transport|Rail|Freight|Diesel @@ -41,8 +49,10 @@ train, diesel-electric: train, fuel cell: iam_aliases: remind: ES|Transport|Freight|Rail|Liquids|Hydrogen + remind-eu: ES|Transport|Freight|Rail|Liquids|Hydrogen energy_use_aliases: remind: FE|Transport|Freight|Rail|Liquids|Hydrogen + remind-eu: FE|Transport|Freight|Rail|Liquids|Hydrogen ecoinvent_aliases: fltr: - transport, freight train, fuel cell, hydrogen diff --git a/premise/iam_variables_mapping/transport_roadfreight_variables.yaml b/premise/iam_variables_mapping/transport_roadfreight_variables.yaml index 778990e6..2c73b219 100644 --- a/premise/iam_variables_mapping/transport_roadfreight_variables.yaml +++ b/premise/iam_variables_mapping/transport_roadfreight_variables.yaml @@ -6,8 +6,10 @@ truck, battery electric, 3.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (0-3.5t)|Electric + remind-eu: ES|Transport|Freight|Road|Truck (0-3.5t)|Electric energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (0-3.5t)|Electricity + remind-eu: FE|Transport|Freight|Road|Truck (0-3.5t)|Electricity ecoinvent_aliases: fltr: - transport, freight, lorry, battery electric, 3.5t gross weight, long haul @@ -18,8 +20,10 @@ truck, battery electric, 3.5t: truck, fuel cell electric, 3.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (0-3.5t)|FCEV + remind-eu: ES|Transport|Freight|Road|Truck (0-3.5t)|FCEV energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (0-3.5t)|Hydrogen + remind-eu: FE|Transport|Freight|Road|Truck (0-3.5t)|Hydrogen ecoinvent_aliases: fltr: - transport, freight, lorry, fuel cell electric, 3.5t gross weight, long haul @@ -30,8 +34,10 @@ truck, fuel cell electric, 3.5t: truck, diesel, 3.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (0-3.5t)|Liquids + remind-eu: ES|Transport|Freight|Road|Truck (0-3.5t)|Liquids energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (0-3.5t)|Liquids + remind-eu: FE|Transport|Freight|Road|Truck (0-3.5t)|Liquids ecoinvent_aliases: fltr: - transport, freight, lorry, diesel, 3.5t gross weight, EURO-VI, long haul @@ -42,8 +48,10 @@ truck, diesel, 3.5t: truck, compressed gas, 3.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (0-3.5t)|Gases + remind-eu: ES|Transport|Freight|Road|Truck (0-3.5t)|Gases energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (0-3.5t)|Gases + remind-eu: FE|Transport|Freight|Road|Truck (0-3.5t)|Gases ecoinvent_aliases: fltr: - transport, freight, lorry, compressed gas, 3.5t gross weight, EURO-VI, long haul @@ -54,11 +62,13 @@ truck, compressed gas, 3.5t: truck, battery electric, 7.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (7.5t)|Electric + remind-eu: ES|Transport|Freight|Road|Truck (7.5t)|Electric tiam-ucl: - Distance|Transport|Truck|Light|Electric|Electricity - Distance|Transport|Truck|Commercial|Electric|Electricity energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (7.5t)|Electricity + remind-eu: FE|Transport|Freight|Road|Truck (7.5t)|Electricity tiam-ucl: - Final Energy|Transport|Truck|Light|Electric|Electricity - Final Energy|Transport|Truck|Commercial|Electric|Electricity @@ -72,11 +82,13 @@ truck, battery electric, 7.5t: truck, fuel cell electric, 7.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (7.5t)|FCEV + remind-eu: ES|Transport|Freight|Road|Truck (7.5t)|FCEV tiam-ucl: - Distance|Transport|Truck|Commercial|Hydrogen Fuel Cell|Electricity - Distance|Transport|Truck|Commercial|Hydrogen Fuel Cell|Truck Hydrogen energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (7.5t)|Hydrogen + remind-eu: FE|Transport|Freight|Road|Truck (7.5t)|Hydrogen tiam-ucl: - Final Energy|Transport|Truck|Commercial|Hydrogen Fuel Cell|Electricity - Final Energy|Transport|Truck|Commercial|Hydrogen Fuel Cell|Truck Hydrogen @@ -127,11 +139,13 @@ truck, gasoline, 7.5t: truck, diesel, 7.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (7.5t)|Liquids + remind-eu: ES|Transport|Freight|Road|Truck (7.5t)|Liquids tiam-ucl: - Distance|Transport|Truck|Light|Diesel|Diesel - Distance|Transport|Truck|Commercial|Diesel|Diesel energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (7.5t)|Liquids + remind-eu: FE|Transport|Freight|Road|Truck (7.5t)|Liquids tiam-ucl: - Final Energy|Transport|Truck|Light|Diesel|Diesel - Final Energy|Transport|Truck|Commercial|Diesel|Diesel @@ -181,11 +195,13 @@ truck, plugin diesel hybrid, 7.5t: truck, compressed gas, 7.5t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (7.5t)|Gases + remind-eu: ES|Transport|Freight|Road|Truck (7.5t)|Gases tiam-ucl: - Distance|Transport|Truck|Light|Natural Gas|Natural Gas - Distance|Transport|Truck|Commercial|Natural Gas|Natural Gas energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (7.5t)|Gases + remind-eu: FE|Transport|Freight|Road|Truck (7.5t)|Gases tiam-ucl: - Final Energy|Transport|Truck|Light|Natural Gas|Natural Gas - Final Energy|Transport|Truck|Commercial|Natural Gas|Natural Gas @@ -215,8 +231,10 @@ truck, liquefied petroleum gas, 7.5t: truck, battery electric, 18t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (18t)|Electric + remind-eu: ES|Transport|Freight|Road|Truck (18t)|Electric energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (18t)|Electricity + remind-eu: FE|Transport|Freight|Road|Truck (18t)|Electricity ecoinvent_aliases: fltr: - transport, freight, lorry, battery electric, 18t gross weight, long haul @@ -227,6 +245,7 @@ truck, battery electric, 18t: truck, fuel cell electric, 18t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (18t)|FCEV + remind-eu: ES|Transport|Freight|Road|Truck (18t)|FCEV tiam-ucl: Distance|Transport|Truck|Medium|Hydrogen Fuel Cell|Truck Hydrogen image: - Energy Service|Transportation|Freight|Med Truck|Fuel Cell Vehicle|Biofuels @@ -234,6 +253,7 @@ truck, fuel cell electric, 18t: - Energy Service|Transportation|Freight|Med Truck|Fuel Cell Vehicle|Hydrogen energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (18t)|Hydrogen + remind-eu: FE|Transport|Freight|Road|Truck (18t)|Hydrogen tiam-ucl: Final Energy|Transport|Truck|Medium|Hydrogen Fuel Cell|Truck Hydrogen ecoinvent_aliases: fltr: @@ -266,6 +286,7 @@ truck, gasoline, 18t: truck, diesel, 18t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (18t)|Liquids + remind-eu: ES|Transport|Freight|Road|Truck (18t)|Liquids tiam-ucl: - Distance|Transport|Truck|Medium|Diesel|Biodiesel - Distance|Transport|Truck|Medium|Diesel|Diesel @@ -277,6 +298,7 @@ truck, diesel, 18t: - Energy Service|Transportation|Freight|Med Truck|Internal Combustion Engine|Hydrogen energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (18t)|Liquids + remind-eu: FE|Transport|Freight|Road|Truck (18t)|Liquids tiam-ucl: - Final Energy|Transport|Truck|Medium|Diesel|Biodiesel - Final Energy|Transport|Truck|Medium|Diesel|Diesel @@ -304,10 +326,12 @@ truck, diesel hybrid, 18t: truck, compressed gas, 18t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (18t)|Gases + remind-eu: ES|Transport|Freight|Road|Truck (18t)|Gases image: Energy Service|Transportation|Freight|Med Truck|Hybrid engine|LNG tiam-ucl: Distance|Transport|Truck|Medium|Natural Gas|Natural Gas energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (18t)|Gases + remind-eu: FE|Transport|Freight|Road|Truck (18t)|Gases tiam-ucl: Final Energy|Transport|Truck|Medium|Natural Gas|Natural Gas ecoinvent_aliases: fltr: @@ -347,8 +371,10 @@ truck, diesel plugin hybrid, 18t: truck, battery electric, 26t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (26t)|Electric + remind-eu: ES|Transport|Freight|Road|Truck (26t)|Electric energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (26t)|Electricity + remind-eu: FE|Transport|Freight|Road|Truck (26t)|Electricity ecoinvent_aliases: fltr: - transport, freight, lorry, battery electric, 26t gross weight, long haul @@ -359,8 +385,10 @@ truck, battery electric, 26t: truck, fuel cell electric, 26t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (26t)|FCEV + remind-eu: ES|Transport|Freight|Road|Truck (26t)|FCEV energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (26t)|Hydrogen + remind-eu: FE|Transport|Freight|Road|Truck (26t)|Hydrogen ecoinvent_aliases: fltr: - transport, freight, lorry, fuel cell electric, 26t gross weight, long haul @@ -371,8 +399,10 @@ truck, fuel cell electric, 26t: truck, diesel, 26t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (26t)|Liquids + remind-eu: ES|Transport|Freight|Road|Truck (26t)|Liquids energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (26t)|Liquids + remind-eu: FE|Transport|Freight|Road|Truck (26t)|Liquids ecoinvent_aliases: fltr: - transport, freight, lorry, diesel, 26t gross weight, EURO-VI, long haul @@ -383,8 +413,10 @@ truck, diesel, 26t: truck, compressed gas, 26t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (26t)|Gases + remind-eu: ES|Transport|Freight|Road|Truck (26t)|Gases energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (26t)|Gases + remind-eu: FE|Transport|Freight|Road|Truck (26t)|Gases ecoinvent_aliases: fltr: - transport, freight, lorry, compressed gas, 26t gross weight, EURO-VI, long haul @@ -395,8 +427,10 @@ truck, compressed gas, 26t: truck, battery electric, 40t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (40t)|Electric + remind-eu: ES|Transport|Freight|Road|Truck (40t)|Electric energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (40t)|Electricity + remind-eu: FE|Transport|Freight|Road|Truck (40t)|Electricity ecoinvent_aliases: fltr: - transport, freight, lorry, battery electric, 40t gross weight, long haul @@ -407,6 +441,7 @@ truck, battery electric, 40t: truck, fuel cell electric, 40t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (40t)|FCEV + remind-eu: ES|Transport|Freight|Road|Truck (40t)|FCEV tiam-ucl: Distance|Transport|Truck|Heavy|Hydrogen Fuel Cell|Truck Hydrogen image: - Energy Service|Transportation|Freight|Heavy Truck|Fuel Cell Vehicle|Biofuels @@ -414,6 +449,7 @@ truck, fuel cell electric, 40t: - Energy Service|Transportation|Freight|Heavy Truck|Fuel Cell Vehicle|Hydrogen energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (40t)|Hydrogen + remind-eu: FE|Transport|Freight|Road|Truck (40t)|Hydrogen tiam-ucl: Final Energy|Transport|Truck|Heavy|Hydrogen Fuel Cell|Truck Hydrogen ecoinvent_aliases: fltr: @@ -439,6 +475,7 @@ truck, diesel hybrid, 40t: truck, diesel, 40t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (40t)|Liquids + remind-eu: ES|Transport|Freight|Road|Truck (40t)|Liquids tiam-ucl: - Distance|Transport|Truck|Heavy|Diesel|Biodiesel - Distance|Transport|Truck|Heavy|Diesel|Diesel @@ -450,6 +487,7 @@ truck, diesel, 40t: - Energy Service|Transportation|Freight|Heavy Truck|Internal Combustion Engine|Hydrogen energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (40t)|Liquids + remind-eu: FE|Transport|Freight|Road|Truck (40t)|Liquids tiam-ucl: - Final Energy|Transport|Truck|Heavy|Diesel|Biodiesel - Final Energy|Transport|Truck|Heavy|Diesel|Diesel @@ -481,10 +519,12 @@ truck, gasoline, 40t: truck, compressed gas, 40t: iam_aliases: remind: ES|Transport|Freight|Road|Truck (40t)|Gases + remind-eu: ES|Transport|Freight|Road|Truck (40t)|Gases image: Energy Service|Transportation|Freight|Heavy Truck|Hybrid engine|LNG tiam-ucl: Distance|Transport|Truck|Heavy|Natural Gas|Natural Gas energy_use_aliases: remind: FE|Transport|Freight|Road|Truck (40t)|Gases + remind-eu: FE|Transport|Freight|Road|Truck (40t)|Gases tiam-ucl: Final Energy|Transport|Truck|Heavy|Natural Gas|Natural Gas ecoinvent_aliases: fltr: diff --git a/premise/iam_variables_mapping/transport_two_wheelers_variables.yaml b/premise/iam_variables_mapping/transport_two_wheelers_variables.yaml index 71c4f38a..2ebc021e 100644 --- a/premise/iam_variables_mapping/transport_two_wheelers_variables.yaml +++ b/premise/iam_variables_mapping/transport_two_wheelers_variables.yaml @@ -5,8 +5,10 @@ two-wheeler, gasoline: iam_aliases: remind: ES|Transport|Pass|Road|LDV|Two Wheelers|Liquids + remind-eu: ES|Transport|Pass|Road|LDV|Two Wheelers|Liquids energy_use_aliases: remind: FE|Transport|Pass|Road|LDV|Two Wheelers|Liquids + remind-eu: FE|Transport|Pass|Road|LDV|Two Wheelers|Liquids ecoinvent_aliases: fltr: - transport, Motorbike, gasoline, 11-35kW, EURO-5 @@ -17,8 +19,10 @@ two-wheeler, gasoline: two-wheeler, battery electric: iam_aliases: remind: ES|Transport|Pass|Road|LDV|Two Wheelers|BEV + remind-eu: ES|Transport|Pass|Road|LDV|Two Wheelers|BEV energy_use_aliases: remind: FE|Transport|Pass|Road|LDV|Two Wheelers|BEV + remind-eu: FE|Transport|Pass|Road|LDV|Two Wheelers|BEV ecoinvent_aliases: fltr: - transport, Motorbike, battery electric, 11-35kW diff --git a/premise/incremental.py b/premise/incremental.py new file mode 100644 index 00000000..524dcf00 --- /dev/null +++ b/premise/incremental.py @@ -0,0 +1,177 @@ +from datetime import datetime + +from .new_database import ( + NewDatabase, + _update_biomass, + _update_electricity, + _update_dac, + _update_cement, + _update_steel, + _update_fuels, + _update_heat, + _update_battery, + _update_emissions, + _update_vehicles, + _update_external_scenarios, +) +from .utils import dump_database, load_database +from copy import copy +from tqdm import tqdm + +import pickle + +SECTORS = { + "electricity": "electricity", + "biomass": "biomass", + "materials": ["cement", "steel"], + "fuels": ["fuels", "heat"], + "battery": "battery", + "transport": ["cars", "two_wheelers", "trucks", "buses", "trains"], + "others": ["emissions", "dac"], + "external": "external", +} + + +class IncrementalDatabase(NewDatabase): + """ + Class for creating an incremental database. Incremental databases allow measuring the + effects of sectoral updates. The class inherits from the NewDatabase class. + """ + + def update(self, sectors: dict = None) -> None: + """ + Update the database with the specified sectors. + + :param sectors: A list of sectors to update. If None, all sectors will be updated incrementally. + :type + + """ + + sector_update_methods = { + "biomass": { + "func": _update_biomass, + "args": (self.version, self.system_model), + }, + "electricity": { + "func": _update_electricity, + "args": (self.version, self.system_model, self.use_absolute_efficiency), + }, + "dac": {"func": _update_dac, "args": (self.version, self.system_model)}, + "cement": { + "func": _update_cement, + "args": (self.version, self.system_model), + }, + "steel": {"func": _update_steel, "args": (self.version, self.system_model)}, + "fuels": {"func": _update_fuels, "args": (self.version, self.system_model)}, + "heat": {"func": _update_heat, "args": (self.version, self.system_model)}, + "battery": { + "func": _update_battery, + "args": (self.version, self.system_model), + }, + "emissions": { + "func": _update_emissions, + "args": (self.version, self.system_model, self.gains_scenario), + }, + "cars": { + "func": _update_vehicles, + "args": ("car", self.version, self.system_model), + }, + "two_wheelers": { + "func": _update_vehicles, + "args": ("two-wheeler", self.version, self.system_model), + }, + "trucks": { + "func": _update_vehicles, + "args": ("truck", self.version, self.system_model), + }, + "buses": { + "func": _update_vehicles, + "args": ("bus", self.version, self.system_model), + }, + "trains": { + "func": _update_vehicles, + "args": ("train", self.version, self.system_model), + }, + "external": { + "func": _update_external_scenarios, + "args": ( + self.version, + self.system_model, + ), + }, + } + + if sectors is None: + sectors = SECTORS + + new_scenarios = [] + + updates_to_apply = [] + for scenario in self.scenarios: + scenario_sectors = [] + for updates, updates in sectors.items(): + label = f"... + {updates}" + scenario_sectors.append(updates) + + if updates == "external" and "external" not in scenario["pathway"]: + continue + + new_scenario = scenario.copy() + new_scenario["pathway"] += label + new_scenarios.append(new_scenario) + updates_to_apply.append(copy(scenario_sectors)) + + self.scenarios = new_scenarios + + with tqdm(total=len(self.scenarios), ncols=70) as pbar_outer: + database_filepath, scenario_id = None, None + for s, scenario in enumerate(self.scenarios): + + if s == 0: + scenario["database"] = pickle.loads(pickle.dumps(self.database, -1)) + else: + if ( + f"{scenario['model']} - {scenario['pathway'].split('...')[0]} - {scenario['year']}" + == scenario_id + ): + scenario["database filepath"] = database_filepath + scenario = load_database(scenario, delete=False) + else: + scenario["database"] = pickle.loads( + pickle.dumps(self.database, -1) + ) + + updates = updates_to_apply[s][-1] + + if isinstance(updates, str): + updates = [updates] + + for update in updates: + # Prepare the function and arguments + update_func = sector_update_methods[update]["func"] + fixed_args = sector_update_methods[update]["args"] + scenario = update_func(scenario, *fixed_args) + + dump_database(scenario) + if "database filepath" in scenario: + database_filepath = scenario["database filepath"] + + scenario_id = f"{scenario['model']} - {scenario['pathway'].split('...')[0]} - {scenario['year']}" + + pbar_outer.update() + + print("Done!\n") + + def write_increment_db_to_brightway( + self, + name: str = f"super_db_{datetime.now().strftime('%d-%m-%Y')}", + filepath: str = None, + file_format: str = "excel", + ) -> None: + """ + Write the superstructure database to a Brightway2 database. + """ + + self.write_superstructure_db_to_brightway( + name, filepath, file_format, preserve_original_column=True + ) diff --git a/premise/inventory_imports.py b/premise/inventory_imports.py index 0127f08f..9b15602b 100644 --- a/premise/inventory_imports.py +++ b/premise/inventory_imports.py @@ -62,6 +62,8 @@ def get_biosphere_code(version) -> dict: fp = DATA_DIR / "utils" / "export" / "flows_biosphere_39.csv" elif version == "3.10": fp = DATA_DIR / "utils" / "export" / "flows_biosphere_310.csv" + elif version == "3.7": + fp = DATA_DIR / "utils" / "export" / "flows_biosphere_37.csv" else: fp = DATA_DIR / "utils" / "export" / "flows_biosphere_38.csv" @@ -73,6 +75,7 @@ def get_biosphere_code(version) -> dict: file, delimiter=get_delimiter(filepath=fp), ) + return {(row[0], row[1], row[2], row[3]): row[4] for row in input_dict} diff --git a/premise/new_database.py b/premise/new_database.py index d7099f8e..9dec734d 100644 --- a/premise/new_database.py +++ b/premise/new_database.py @@ -991,7 +991,8 @@ def write_superstructure_db_to_brightway( self, name: str = f"super_db_{datetime.now().strftime('%d-%m-%Y')}", filepath: str = None, - file_format: str = "excel", + file_format: str = "csv", + preserve_original_column: bool = False, ) -> None: """ Register a super-structure database, @@ -999,6 +1000,7 @@ def write_superstructure_db_to_brightway( :param name: name of the super-structure database :param filepath: filepath of the "scenarios difference file" :param file_format: format of the "scenarios difference file" export. Can be "excel", "csv" or "feather". + :param preserve_original_column: if True, the original column names are preserved in the super-structure database. :return: filepath of the "scenarios difference file" """ @@ -1034,6 +1036,7 @@ def write_superstructure_db_to_brightway( version=self.version, file_format=file_format, scenario_list=list_scenarios, + preserve_original_column=preserve_original_column, ) tmp_scenario = self.scenarios[0] diff --git a/premise/utils.py b/premise/utils.py index 2f4df1b6..1d1d9af7 100644 --- a/premise/utils.py +++ b/premise/utils.py @@ -404,10 +404,11 @@ def dump_database(scenario): return scenario -def load_database(scenario): +def load_database(scenario, delete=True): """ Load database from a pickle file. :param scenario: scenario dictionary + """ if scenario.get("database") is not None: @@ -419,8 +420,10 @@ def load_database(scenario): with open(filepath, "rb") as f: scenario["database"] = pickle.load(f) del scenario["database filepath"] + # delete the file - filepath.unlink() + if delete: + filepath.unlink() return scenario diff --git a/requirements.txt b/requirements.txt index ac7d8191..97e392bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,6 @@ requests schema sparse>=0.14.0 wurst>=0.4 -xarray +xarray<=2024.2.0 tqdm unfold \ No newline at end of file