diff --git a/.buildlibrary b/.buildlibrary index ba4653e10..c5537db4f 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '7420350' +ValidationKey: '7420720' AutocreateReadme: yes allowLinterWarnings: no AddInReadme: tutorial.md diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7ccf77e04..7dcd45b7c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ exclude: '^tests/testthat/_snaps/.*$' repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0 + rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0 hooks: - id: check-case-conflict - id: check-json @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3 + rev: 3b70240796cdccbe1474b0176560281aaded97e6 # frozen: v0.4.3.9003 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index 87849c8de..b529731e3 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -3,7 +3,7 @@ message: If you use this software, please cite it using the metadata from this f type: software title: 'piamInterfaces: Project specific interfaces to REMIND / MAgPIE' version: 0.37.0 -date-released: '2024-11-28' +date-released: '2024-11-29' abstract: Project specific interfaces to REMIND / MAgPIE. authors: - family-names: Benke diff --git a/DESCRIPTION b/DESCRIPTION index 8ccbb67f3..eef8adabb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Type: Package Package: piamInterfaces Title: Project specific interfaces to REMIND / MAgPIE Version: 0.37.0 -Date: 2024-11-28 +Date: 2024-11-29 Authors@R: c( person("Falk", "Benke", , "benke@pik-potsdam.de", role = c("aut", "cre")), person("Oliver", "Richters", role = "aut") diff --git a/inst/mappings/mapping_ARIADNE.csv b/inst/mappings/mapping_ARIADNE.csv index 18a94b225..df9895bea 100644 --- a/inst/mappings/mapping_ARIADNE.csv +++ b/inst/mappings/mapping_ARIADNE.csv @@ -996,6 +996,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 2;energy (transport);Final Energy|Transportation|Liquids|Synthetic Fossil;PJ/yr;final energy consumption by the transportation sector of synthetic liquids of fossil origin (e.g. coal or gas liquefaction);;;;;0;; 2;energy (transport);Final Energy|Transportation|Liquids|Petroleum;PJ/yr;final energy consumption by the transportation sector of liquids from fossil origin (conventional & unconventional petroleum);FE|Transport|w/o Bunkers|Liquids|+|Fossil;EJ/yr;1000;;0;;R 2;energy (transport);Final Energy|Transportation|Liquids|Efuel;PJ/yr;final energy consumption by the transportation sector of synthetic liquid efuels (power-to-liquid);FE|Transport|w/o Bunkers|Liquids|+|Hydrogen;EJ/yr;1000;;0;;R +2;energy (transport);Final Energy|Transportation|Methanol;PJ/yr;final energy consumption by the transportation sector of methanol;;;;;0;; 3;energy (transport);Final Energy|Transportation|Waste;PJ/yr;final energy consumption by the transportation sector of waste;;;;;0;; 1;energy (transport);Final Energy|Transportation|Other;PJ/yr;final energy consumption by the transportation sector of other sources that do not fit to any other category (please provide a definition of the sources in this category in the 'comments' tab);;;;;0;; 2;energy (transport);Final Energy|Bunkers;PJ/yr;final energy consumption of bunker fuels;FE|Transport|Bunkers;EJ/yr;1000;;0;;R @@ -1022,6 +1023,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 3;energy (transport);Final Energy|Bunkers|Navigation|Liquids|Petroleum;PJ/yr;final energy consumption of liquids from fossil origin (conventional & unconventional petroleum) as bunker fuels for navigation;FE|Transport|Bunkers|Freight|International Shipping|Liquids|Fossil;EJ/yr;1000;;0;;T 2;energy (transport);Final Energy|Bunkers|Navigation|Gases;PJ/yr;final energy consumption of gases (natural gas, biogas, coal-gas) as bunker fuels for navigation;;;;;0;; 2;energy (transport);Final Energy|Bunkers|Navigation|Hydrogen;PJ/yr;final energy consumption of hydrogen as bunker fuels for navigation;;;;;0;; +2;energy (transport);Final Energy|Bunkers|Navigation|Methanol;PJ/yr;final energy consumption of methanol as bunker fuels for navigation;;;;;0;; 3;energy (transport);Final Energy|Transportation|Renewables;PJ/yr;final energy consumption by the transportation sector of renewables (solid biomass, biofuels, biogas, green e-fuels);;;;;0;; 2;energy (transport);Final Energy|Transportation|LDV;PJ/yr;final energy consumption by light duty vehicles;FE|Transport|Pass|Road|LDV;EJ/yr;1000;;0;;T 2;energy (transport);Final Energy|Transportation|LDV|Liquids;PJ/yr;final energy consumption by light duty vehicles of refined liquids (conventional & unconventional oil, biofuels, coal-to-liquids, gas-to-liquids, efuels);FE|Transport|Pass|Road|LDV|Liquids;EJ/yr;1000;;0;;T @@ -1309,6 +1311,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 2;energy (supply);Secondary Energy|Heat|Gas|Efuel;PJ/yr;district heat generation from synthetic gases;;;;;0;; 2;energy (supply);Secondary Energy|Heat|Gas|Natural Gas;PJ/yr;district heat generation from natural gas;;;;;0;; 1;energy (supply);Secondary Energy|Heat|Geothermal;PJ/yr;district heat generation from geothermal energy EXCLUDING geothermal heat pumps;;;;;0;; +1;energy (supply);Secondary Energy|Heat|Hydrogen;PJ/yr;district heat generation from hydrogen;;;;;0;; 1;energy (supply);Secondary Energy|Heat|Nuclear;PJ/yr;district heat generation from nuclear energy;;;;;0;; 1;energy (supply);Secondary Energy|Heat|Oil;PJ/yr;district heat generation from oil products;;;;;0;; 1;energy (supply);Secondary Energy|Heat|Other;PJ/yr;district heat generation from sources that do not fit any other category (please provide a definition of the sources in this category in the 'comments' tab);;;;;0;; @@ -1332,11 +1335,13 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 2;energy (hydrogen);Secondary Energy|Hydrogen|Gas|w/ CCS;PJ/yr;hydrogen production from natural gas with a CO2 capture component (blue H2);SE|Hydrogen|Gas|+|w/ CC;EJ/yr;1000;;0;;R 2;energy (hydrogen);Secondary Energy|Hydrogen|Gas|w/o CCS;PJ/yr;hydrogen production from natural gas with freely vented CO2 emissions (grey H2);SE|Hydrogen|Gas|+|w/o CC;EJ/yr;1000;;0;;R 2;energy (hydrogen);Secondary Energy|Hydrogen|Gas|Pyrolysis;PJ/yr;hydrogen production from natural gas via methane pyrolysis with elemental carbon as by-product (turquoise H2);;;;;0;; +2;energy (hydrogen);Secondary Energy|Methanol;PJ/yr;total methanol production;;;;;0;; 1;energy (hydrogen);Secondary Energy Input|Efuel|Electricity;PJ/yr;secondary energy consumption of efuels for the production of electricity;;;;;0;; 1;energy (hydrogen);Secondary Energy Input|Efuel|Heat;PJ/yr;secondary energy consumption of efuels for the production of heat;;;;;0;; 1;energy (hydrogen);Secondary Energy Input|Hydrogen|Electricity;PJ/yr;secondary energy consumption of hydrogen for the production of electricity;SE|Input|Hydrogen|Electricity;EJ/yr;1000;;0;;R 1;energy (hydrogen);Secondary Energy Input|Hydrogen|Liquids;PJ/yr;secondary energy consumption of hydrogen for the production of liquids (synfuels);SE|Input|Hydrogen|Synthetic Fuels|+|Liquids;EJ/yr;1000;;0;;R 1;energy (hydrogen);Secondary Energy Input|Hydrogen|Gases;PJ/yr;secondary energy consumption of hydrogen for the production of gases (syngases);SE|Input|Hydrogen|Synthetic Fuels|+|Gases;EJ/yr;1000;;0;;R +1;energy (hydrogen);Secondary Energy Input|Hydrogen|Heat;PJ/yr;secondary energy consumption of hydrogen for the production of heat;;;;;0;; 1;energy (electricity);Secondary Energy Input|Electricity|Hydrogen;PJ/yr;secondary energy consumption of electricity for the production of hydrogen;SE|Input|Electricity|Hydrogen;EJ/yr;1000;;0;;R 1;energy (electricity);Secondary Energy Input|Electricity|Heat;PJ/yr;secondary energy consumption of electricity for the production of heat (large-scale heat pumps);SE|Input|Electricity|Self Consumption Energy System|Central Ground Heat Pump;EJ/yr;1000;In REMIND only ground heat pumps are implemented for centralized heat generation;0;;R 3;energy (hydrogen);Secondary Energy|Hydrogen|Nuclear;PJ/yr;total hydrogen production from nuclear energy (e.g. thermochemical water splitting with nucelar heat);;;;;0;; @@ -1546,7 +1551,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 3;energy (transport);Stock|Transportation|Truck|Truck (40t);million;Stock of trucks with weight 40t;Stock|Transport|Freight|Road|Heavy|Truck(40t);million veh;1;;0;;T 3;energy (transport);Stock|Transportation|Truck|Truck (7.5t);million;Stock of trucks with weight 3.5 - 7.5t;Stock|Transport|Freight|Road|Light|Truck(7_5t);million veh;1;;0;;T 3;energy (transport);Stock|Transportation|Truck|Truck (12t);million;Stock of trucks with weight 7.5 - 12t;;;;;0;; -3;energy (transport);Stock|Transportation|Truck|Truck (12t+);million;Stock of trucks with weight >12t;Stock|Transport|Freight|Road|Heavy|Truck(18t);million veh;1;;0;Ariadne and EDGE-T weight class not fully overlapping. Take closest category. ;T +3;energy (transport);Stock|Transportation|Truck|Truck (12t+);million;Stock of trucks with weight >12t;Stock|Transport|Freight|Road|Heavy|Truck(18t);million veh;1;;0;Ariadne and EDGE-T weight class not fully overlapping. Take closest category.;T 3;energy (transport);Stock|Transportation|Truck|Tractor Truck;million;Stock of tractor trucks;;;;;0;; 2;energy (transport);Stock|Transportation|Bus;million;Stock of buses;Stock|Transport|Pass|Road|Bus;million veh;1;;0;;T 3;energy (transport);Stock|Transportation|Bus|ICE;million;Stock of buses with internal combustion engine including hybrids and plug-in hybrids;Stock|Transport|Pass|Road|Bus|Liquids;million veh;1;;0;;T @@ -1672,9 +1677,13 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 2;energy (supply);Trade|Secondary Energy|Liquids|Gas|Volume;PJ/yr;net exports of fossil liquid synfuels from gas-to-liquids (GTL) technologies, at the global level these should add up to the trade losses only;;;;;0;; 2;energy (supply);Trade|Secondary Energy|Liquids|Oil|Volume;PJ/yr;net exports of liquid fuels from petroleum including both conventional and unconventional sources, at the global level these should add up to the trade losses only;;;;;0;; 2;energy (supply);Trade|Secondary Energy|Liquids|Hydrogen|Volume;PJ/yr;net exports of liquid hydrocarbon fuels from renewable hydrogen and renewable CO2 (green synfuels), at the global level these should add up to the trade losses only;Trade|SE|Liquids|Hydrogen;EJ/yr;1000;;0;;Rx +2;energy (supply);Trade|Secondary Energy|Gases|Biomass|Volume;PJ/yr;net exports of biogas, at the global level these should add up to the trade losses only (for those models that are able to split solid and liquid bioenergy);;;;;0;; +2;energy (supply);Trade|Secondary Energy|Gases|Biomass|Gross Import|Volume;PJ/yr;gross imports of biogas, at the global level these should add up to the trade losses only (for those models that are able to split solid and liquid bioenergy);;;;;0;; 2;energy (supply);Trade|Secondary Energy|Gases|Hydrogen|Volume;PJ/yr;net exports of gaseous hydrocarbon fuels from renewable hydrogen and renewable CO2 (green syngases), at the global level these should add up to the trade losses only;Trade|SE|Gases|Hydrogen;EJ/yr;1000;;0;;Rx 2;energy (supply);Trade|Secondary Energy|Liquids|Hydrogen|Gross Import|Volume;PJ/yr;gross imports of liquid hydrocarbon fuels from renewable hydrogen and renewable CO2 (green synfuels), excluding export;;;;;0;; 2;energy (supply);Trade|Secondary Energy|Gases|Hydrogen|Gross Import|Volume;PJ/yr;gross imports of gaseous hydrocarbon fuels from renewable hydrogen and renewable CO2 (green syngases), excluding export;;;;;0;; +2;energy (supply);Trade|Secondary Energy|Methanol|Hydrogen|Volume;PJ/yr;net exports of methanol from renewable hydrogen and renewable CO2 (green synfuels), at the global level these should add up to the trade losses only;;;;;0;; +2;energy (supply);Trade|Secondary Energy|Methanol|Hydrogen|Gross Import|Volume;PJ/yr;gross imports of methanol from renewable hydrogen and renewable CO2 (green synfuels), excluding export;;;;;0;; 2;energy (supply);Trade|Uranium|Mass;kt U/yr;net exports of Uranium, at the global level these should add up to the trade losses only;;;;;0;; 3;energy (price);Price|Final Energy|Residential|Electricity;EUR2020/GJ;electricity price at the final level in the residential sector. Prices should include the effect of carbon prices.;Price|Final Energy|Buildings|Electricity|Total LCOE;US$2017/GJ;0.9534;;0;;R 3;energy (price);Price|Final Energy|Residential|Hydrogen;EUR2020/GJ;natural gas price at the final level in the residential sector. Prices should include the effect of carbon prices.;Price|Final Energy|Buildings|Hydrogen|Total LCOE;US$2017/GJ;0.9534;;0;;R @@ -1938,6 +1947,8 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 1;energy (transport);Investment|Energy Demand|Transportation|Truck|PHEV|Additional;billion EUR2020/yr;Additional investment spending for PHEV-trucks compared to the alternative ICE technology spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: plug-in hybrids with internal combustion engine running on any type of liquid or gaseous fuel);;;;;0;; 1;energy (transport);Investment|Energy Demand|Transportation|Truck|Overhead Line|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks using overhead line technology: electric vehicle technologies, only all-electrics);;;;;0;; 1;energy (transport);Investment|Energy Demand|Transportation|Truck|Overhead Line|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks using overhead line technology: internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;; +1;energy (transport);Investment|Energy Demand|Transportation|Truck|Overhead Line|BEV|Additional;billion EUR2020/yr;Additional investment spending through new vehicle purchases in the transport sector compared to fossil alternative (heavy-duty freight trucks using overhead line technology: electric vehicle technologies, only all-electrics);;;;;0;; +1;energy (transport);Investment|Energy Demand|Transportation|Truck|Overhead Line|ICE|Additional;billion EUR2020/yr;Additional investment spending through new vehicle purchases in the transport sector compared to fossil alternativ (heavy-duty freight trucks using overhead line technology: internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;; 2;energy (transport);Investment|Energy Demand|Transportation|Other;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (other, like bicycles, e-scooter, …);;;;;0;; 2;energy (transport);Investment|Energy Demand|Transportation|Domestic Navigation;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (domestic navigation);Annualized fleet investments|Transport|Freight|Domestic Shipping;billion US$2017/yr;0.9534;;0;;R 2;energy (transport);Investment|Energy Demand|Transportation|Domestic Navigation|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (domestic navigation, internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;; @@ -1958,14 +1969,18 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme 1;energy (transport);Investment|Infrastructure|Transportation|Truck|BEV;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (heavy-duty trucks: electric vehicle technologies, only all-electrics);;;;;0;; 1;energy (transport);Investment|Infrastructure|Transportation|Truck|Overhead Line;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (heavy-duty trucks, all types);;;;;0;; 1;energy (transport);Investment|Infrastructure|Transportation|Truck|FCEV;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (heavy-duty trucks, fuel cell technologies running on hydrogen or another type of fuel);;;;;0;; -2;energy (transport);Investment|Infrastructure|Transportation|Rail;billion EUR2020/yr;Total investment spending into transport infrastructure (all related to railway). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; -1;energy (transport);Investment|Infrastructure|Transportation|Rail|ICE;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (rail, internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;; -1;energy (transport);Investment|Infrastructure|Transportation|Rail|BEV;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (rail, electric vehicle technologies, only all-electrics);;;;;0;; -1;energy (transport);Investment|Infrastructure|Transportation|Rail|FCEV;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (rail, fuel cell technologies running on hydrogen or another type of fuel);;;;;0;; +1;energy (transport);Investment|Infrastructure|Transportation|Rail;billion EUR2020/yr;Total investment spending into transport infrastructure (all related to railway). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; +1;energy (transport);Investment|Infrastructure|Transportation|Rail|Additional;billion EUR2020/yr;Additional investment spending into transport infrastructure for the energy transition (all related to railway). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; +1;energy (transport);Investment|Infrastructure|Transportation|Rail|Railtracks;billion EUR2020/yr;Total investment spending into transport infrastructure (all related to railway). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; +1;energy (transport);Investment|Infrastructure|Transportation|Rail|Railtracks|Additional;billion EUR2020/yr;Additional investment spending into transport infrastructure for the energy transition (all related to railway). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; +1;energy (transport);Investment|Infrastructure|Transportation|Rail|ICE;billion EUR2020/yr;Total investment spending through refueling Infrastructure in the transport sector (rail, internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;; +1;energy (transport);Investment|Infrastructure|Transportation|Rail|BEV;billion EUR2020/yr;Total investment spending through charging Infrastructure in the transport sector (rail, electric vehicle technologies, only all-electrics);;;;;0;; +1;energy (transport);Investment|Infrastructure|Transportation|Rail|FCEV;billion EUR2020/yr;Total investment spending through refueling Infrastructure in the transport sector (rail, fuel cell technologies running on hydrogen or another type of fuel);;;;;0;; 2;energy (transport);Investment|Infrastructure|Transportation|Bus;billion EUR2020/yr;Total investment spending into transport infrastructure (all related to buses). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; 1;energy (transport);Investment|Infrastructure|Transportation|Bus|ICE;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (bus, internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;; 1;energy (transport);Investment|Infrastructure|Transportation|Bus|BEV;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (bus, electric vehicle technologies, only all-electrics);;;;;0;; 1;energy (transport);Investment|Infrastructure|Transportation|Bus|FCEV;billion EUR2020/yr;Total investment spending through Infrastructure in the transport sector (bus, fuel cell technologies running on hydrogen or another type of fuel);;;;;0;; +2;energy (transport);Investment|Infrastructure|Transportation|Road|Additional;billion EUR2020/yr;Additional investment spending into transport infrastructure for the energy transition (all related to roads). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; 2;energy (transport);Investment|Infrastructure|Transportation|Road;billion EUR2020/yr;Total investment spending into transport infrastructure (all related to roads). Please specify in the comments section the type of infastructure that is being referred to here.;;;;;0;; 1;energy (transport);Investment|Infrastructure|Transportation|Charging|Public;billion EUR2020/yr;Total investment spending into public charging infrastructure.;Energy Investments|Electricity|Grid|+|BEV Chargers;billion US$2017/yr;0.9534;;0;REMIND does not distinguish between private and public charging infrastructure;R 1;energy (transport);Investment|Infrastructure|Transportation|Charging|Private;billion EUR2020/yr;Total investment spending into private charging infrastructure;;;;;0;;