pik-piam · jmuessel · Jul 18, 2024 · Jul 10, 2024 · Jul 10, 2024 · Jul 11, 2024
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '40028955'
+ValidationKey: '4181940'
 AutocreateReadme: yes
 allowLinterWarnings: no
 AddInReadme: tutorial.md

diff --git a/CITATION.cff b/CITATION.cff
@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'piamInterfaces: Project specific interfaces to REMIND / MAgPIE'
-version: 0.20.11
-date-released: '2024-07-01'
+version: 0.21.0
+date-released: '2024-07-10'
 abstract: Project specific interfaces to REMIND / MAgPIE.
 authors:
 - family-names: Benke

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: piamInterfaces
 Title: Project specific interfaces to REMIND / MAgPIE
-Version: 0.20.11
-Date: 2024-07-01
+Version: 0.21.0
+Date: 2024-07-10
 Authors@R: c(
     person("Falk", "Benke", , "[email protected]", role = c("aut", "cre")),
     person("Oliver", "Richters", role = "aut")

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Project specific interfaces to REMIND / MAgPIE
 
-R package **piamInterfaces**, version **0.20.11**
+R package **piamInterfaces**, version **0.21.0**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/piamInterfaces)](https://cran.r-project.org/package=piamInterfaces)  [![R build status](https://github.com/pik-piam/piamInterfaces/workflows/check/badge.svg)](https://github.com/pik-piam/piamInterfaces/actions) [![codecov](https://codecov.io/gh/pik-piam/piamInterfaces/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/piamInterfaces) [![r-universe](https://pik-piam.r-universe.dev/badges/piamInterfaces)](https://pik-piam.r-universe.dev/builds)
 
@@ -107,7 +107,7 @@ In case of questions / problems please contact Falk Benke <[email protected]>
 
 To cite package **piamInterfaces** in publications use:
 
-Benke F, Richters O (2024). _piamInterfaces: Project specific interfaces to REMIND / MAgPIE_. R package version 0.20.11, <URL: https://github.com/pik-piam/piamInterfaces>.
+Benke F, Richters O (2024). _piamInterfaces: Project specific interfaces to REMIND / MAgPIE_. R package version 0.21.0, <https://github.com/pik-piam/piamInterfaces>.
 
 A BibTeX entry for LaTeX users is
 
@@ -116,7 +116,7 @@ A BibTeX entry for LaTeX users is
   title = {piamInterfaces: Project specific interfaces to REMIND / MAgPIE},
   author = {Falk Benke and Oliver Richters},
   year = {2024},
-  note = {R package version 0.20.11},
+  note = {R package version 0.21.0},
   url = {https://github.com/pik-piam/piamInterfaces},
 }
 ```
diff --git a/inst/mappings/mapping_AR6.csv b/inst/mappings/mapping_AR6.csv
diff --git a/inst/mappings/mapping_ARIADNE.csv b/inst/mappings/mapping_ARIADNE.csv
diff --git a/inst/mappings/mapping_NAVIGATE.csv b/inst/mappings/mapping_NAVIGATE.csv
diff --git a/inst/renamed_piam_variables.csv b/inst/renamed_piam_variables.csv
@@ -1,5 +1,5 @@
 piam_variable                                 ;old_name
-# renamed in https://github.com/pik-piam/remind2/pull/579
+# renamed in https://github.com/pik-piam/remind2/pull/579;
 Energy Investments|Electricity|Biomass        ;Energy Investments|Elec|Biomass
 Energy Investments|Electricity|Biomass|w/ CC  ;Energy Investments|Elec|Biomass|w/ CC
 Energy Investments|Electricity|Biomass|w/o CC ;Energy Investments|Elec|Biomass|w/o CC
@@ -23,17 +23,17 @@ Energy Investments|Electricity|Oil|w/o CC     ;Energy Investments|Elec|Oil|w/o C
 Energy Investments|Electricity|Solar          ;Energy Investments|Elec|Solar
 Energy Investments|Electricity|Storage        ;Energy Investments|Elec|Storage
 Energy Investments|Electricity|Wind           ;Energy Investments|Elec|Wind
-
-# map MAGICC6 variables to new MAGICC7 names
+;
+# map MAGICC6 variables to new MAGICC7 names;
 MAGICC7 AR6|Surface Temperature (GSAT)|50.0th Percentile     ;Temperature|Global Mean
 MAGICC7 AR6|Atmospheric Concentrations|CH4|50.0th Percentile ;Concentration|CH4
 MAGICC7 AR6|Atmospheric Concentrations|CO2|50.0th Percentile ;Concentration|CO2
 MAGICC7 AR6|Atmospheric Concentrations|N2O|50.0th Percentile ;Concentration|N2O
-
-# changed magpie4 reporting variables
+;
+# changed magpie4 reporting variables;
 Resources|Nitrogen|Cropland Budget|Inputs|+|Manure Recycled from Confinements;Resources|Nitrogen|Cropland Budget|Inputs|Manure
-
-# magpie4 reporting variables for cropland changed with magpie4 2.3.2
+;
+# magpie4 reporting variables for cropland changed with magpie4 2.3.2;
 Resources|Land Cover|Cropland|Croparea|+|Bioenergy crops;Resources|Land Cover|Cropland|+|Bioenergy crops
 Resources|Land Cover|Cropland|Croparea|+|Crops;Resources|Land Cover|Cropland|+|Crops
 Resources|Land Cover|Cropland|Croparea|+|Fallow Cropland;Resources|Land Cover|Cropland|+|Fallow Cropland
@@ -110,3 +110,82 @@ Resources|Land Cover|Cropland|Croparea|Crops|Sugar crops|Sugar cane|irrigated;Re
 Resources|Land Cover|Cropland|Croparea|Crops|Sugar crops|Sugar cane|rainfed;Resources|Land Cover|Cropland|Crops|Sugar crops|Sugar cane|rainfed
 Resources|Land Cover|Cropland|Croparea|Forage|irrigated;Resources|Land Cover|Cropland|Forage|irrigated
 Resources|Land Cover|Cropland|Croparea|Forage|rainfed;Resources|Land Cover|Cropland|Forage|rainfed
+;
+#Changes from edgeT refactoring;
+Emi|CO2|Energy|Demand|Transport|Bunkers|Freight|International Shipping;Emi|CO2|Transport|Freight|International Shipping|Demand
+Emi|CO2|Energy|Demand|Transport|Bunkers|Pass|International Aviation;Emi|CO2|Transport|Pass|Aviation|International|Demand
+Emi|CO2|Energy|Demand|Transport|Freight;Emi|CO2|Transport|Freight|w/o bunkers|Demand
+Emi|CO2|Energy|Demand|Transport|Freight|Domestic Shipping;Emi|CO2|Transport|Freight|Navigation|Demand
+Emi|CO2|Energy|Demand|Transport|Freight|Rail;Emi|CO2|Transport|Freight|Rail|Demand
+Emi|CO2|Energy|Demand|Transport|Freight|Road;Emi|CO2|Transport|Freight|Road|Demand
+Emi|CO2|Energy|Demand|Transport|Pass;Emi|CO2|Transport|Pass|w/o bunkers|Demand
+Emi|CO2|Energy|Demand|Transport|Pass|Domestic Aviation;Emi|CO2|Transport|Pass|Aviation|Domestic|Demand
+Emi|CO2|Energy|Demand|Transport|Pass|Rail;Emi|CO2|Transport|Pass|Rail|Demand
+Emi|CO2|Energy|Demand|Transport|Pass|Road;Emi|CO2|Transport|Pass|Road|Demand
+Emi|CO2|Energy|Demand|Transport|Pass|Road|Bus;Emi|CO2|Transport|Pass|Road|Bus|Demand
+Emi|CO2|Energy|Demand|Transport|Pass|Road|LDV;Emi|CO2|Transport|Pass|Road|LDV|Demand
+ES|Transport|Bunkers|Freight|International Shipping;ES|Transport|Freight|International Shipping
+ES|Transport|Bunkers|Pass|International Aviation;ES|Transport|Pass|Aviation|International
+ES|Transport|Freight|Domestic Shipping;ES|Transport|Freight|Navigation
+ES|Transport|Freight|Road|BEV;ES|Transport|Freight|Road|Electric
+ES|Transport|Pass|Domestic Aviation;ES|Transport|Pass|Aviation|Domestic
+ES|Transport|Pass|Non-motorized;ES|Transport|Pass|Road|Non-Motorized
+ES|Transport|Pass|Non-motorized|Cycle;ES|Transport|Pass|Road|Non-Motorized|Cycling
+ES|Transport|Pass|Non-motorized|Walk;ES|Transport|Pass|Road|Non-Motorized|Walking
+FE|Transport with bunkers;FE|Transport edge
+FE|Transport|Bunkers|Freight|International Shipping;FE|Transport|Freight|International Shipping
+FE|Transport|Bunkers|Freight|International Shipping|Liquids;FE|Transport|Freight|International Shipping|Liquids
+FE|Transport|Bunkers|Freight|International Shipping|Liquids|Biomass;FE|Transport|Freight|International Shipping|Liquids|Biomass
+FE|Transport|Bunkers|Freight|International Shipping|Liquids|Fossil;FE|Transport|Freight|International Shipping|Liquids|Fossil
+FE|Transport|Bunkers|Freight|International Shipping|Liquids|Hydrogen;FE|Transport|Freight|International Shipping|Liquids|Hydrogen
+FE|Transport|Bunkers|Pass|International Aviation;FE|Transport|Pass|Aviation|International
+FE|Transport|Bunkers|Pass|International Aviation|Liquids;FE|Transport|Pass|Aviation|International|Liquids
+FE|Transport|Bunkers|Pass|International Aviation|Liquids|Biomass;FE|Transport|Pass|Aviation|International|Liquids|Biomass
+FE|Transport|Bunkers|Pass|International Aviation|Liquids|Fossil;FE|Transport|Pass|Aviation|International|Liquids|Fossil
+FE|Transport|Bunkers|Pass|International Aviation|Liquids|Hydrogen;FE|Transport|Pass|Aviation|International|Liquids|Hydrogen
+FE|Transport|Freight|Domestic Shipping;FE|Transport|Freight|Navigation
+FE|Transport|Freight|Domestic Shipping|Liquids;FE|Transport|Freight|Navigation|Liquids
+FE|Transport|Freight|Domestic Shipping|Liquids|Biomass;FE|Transport|Freight|Navigation|Liquids|Biomass
+FE|Transport|Freight|Domestic Shipping|Liquids|Fossil;FE|Transport|Freight|Navigation|Liquids|Fossil
+FE|Transport|Freight|Domestic Shipping|Liquids|Hydrogen;FE|Transport|Freight|Navigation|Liquids|Hydrogen
+FE|Transport|Pass|Domestic Aviation;FE|Transport|Pass|Aviation|Domestic
+FE|Transport|Pass|Domestic Aviation|Hydrogen;FE|Transport|Pass|Aviation|Domestic|Hydrogen
+FE|Transport|Pass|Domestic Aviation|Liquids;FE|Transport|Pass|Aviation|Domestic|Liquids
+FE|Transport|Pass|Domestic Aviation|Liquids|Biomass;FE|Transport|Pass|Aviation|Domestic|Liquids|Biomass
+FE|Transport|Pass|Domestic Aviation|Liquids|Fossil;FE|Transport|Pass|Aviation|Domestic|Liquids|Fossil
+FE|Transport|Pass|Domestic Aviation|Liquids|Hydrogen;FE|Transport|Pass|Aviation|Domestic|Liquids|Hydrogen
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|BEV;Sales|Transport|LDV|Large Car and SUV|BEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|FCEV;Sales|Transport|LDV|Large Car and SUV|FCEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|Hybrid electric;Sales|Transport|LDV|Large Car and SUV|Hybrid Electric
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|Liquids;Sales|Transport|LDV|Large Car and SUV|Liquids
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|BEV;Sales|Transport|LDV|Compact Car|BEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|FCEV;Sales|Transport|LDV|Compact Car|FCEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|Hybrid electric;Sales|Transport|LDV|Compact Car|Hybrid Electric
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|Liquids;Sales|Transport|LDV|Compact Car|Liquids
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|BEV;Sales|Transport|LDV|Midsize Car|BEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|FCEV;Sales|Transport|LDV|Midsize Car|FCEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|Hybrid electric;Sales|Transport|LDV|Midsize Car|Hybrid Electric
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|Liquids;Sales|Transport|LDV|Midsize Car|Liquids
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|BEV;Sales|Transport|LDV|Subcompact Car|BEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|FCEV;Sales|Transport|LDV|Subcompact Car|FCEV
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|Hybrid electric;Sales|Transport|LDV|Subcompact Car|Hybrid Electric
+Sales|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|Liquids;Sales|Transport|LDV|Subcompact Car|Liquids
+Sales|Transport|Pass|Road|LDV|Hybrid electric;Sales|Transport|LDV|Hybrid Electric
+Stock|Transport|Pass|Road|Bus;Stock|Transport|Bus
+Stock|Transport|Pass|Road|LDV;Stock|Transport|LDV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|BEV;Stock|Transport|LDV|Large Car and SUV|BEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|FCEV;Stock|Transport|LDV|Large Car and SUV|FCEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|Hybrid electric;Stock|Transport|LDV|Large Car and SUV|Hybrid Electric
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Large|Large Car and SUV|Liquids;Stock|Transport|LDV|Large Car and SUV|Liquids
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|BEV;Stock|Transport|LDV|Compact Car|BEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|FCEV;Stock|Transport|LDV|Compact Car|FCEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|Hybrid electric;Stock|Transport|LDV|Compact Car|Hybrid Electric
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|Liquids;Stock|Transport|LDV|Compact Car|Liquids
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|BEV;Stock|Transport|LDV|Midsize Car|BEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|FCEV;Stock|Transport|LDV|Midsize Car|FCEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|Hybrid electric;Stock|Transport|LDV|Midsize Car|Hybrid Electric
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|Liquids;Stock|Transport|LDV|Midsize Car|Liquids
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|BEV;Stock|Transport|LDV|Subcompact Car|BEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|FCEV;Stock|Transport|LDV|Subcompact Car|FCEV
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|Hybrid electric;Stock|Transport|LDV|Subcompact Car|Hybrid Electric
+Stock|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|Liquids;Stock|Transport|LDV|Subcompact Car|Liquids