Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename EDGET Vars #331

Merged
merged 10 commits into from
Jul 18, 2024
Merged

rename EDGET Vars #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d916cd4
rename EDGET Vars
jmuessel Jul 10, 2024
95894d4
build Lib
jmuessel Jul 10, 2024
57bfb37
delete missing variables from AR6 mapping
jmuessel Jul 11, 2024
440a354
Merge branch 'master' of https://github.com/pik-piam/piamInterfaces i…
jmuessel Jul 11, 2024
d827c76
update renamedVars overview
jmuessel Jul 11, 2024
f8bdd5d
buildLibrary()
jmuessel Jul 11, 2024
ee00501
Merge branch 'master' of https://github.com/pik-piam/piamInterfaces i…
jmuessel Jul 16, 2024
fafe8c6
build library()
jmuessel Jul 16, 2024
739e99b
Merge branch 'master' of https://github.com/pik-piam/piamInterfaces i…
jmuessel Jul 18, 2024
16ac728
buildLib
jmuessel Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '40240420'
ValidationKey: '40262362'
AutocreateReadme: yes
allowLinterWarnings: no
AddInReadme: tutorial.md
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.20
date-released: '2024-07-17'
version: 0.20.21
date-released: '2024-07-18'
abstract: Project specific interfaces to REMIND / MAgPIE.
authors:
- family-names: Benke
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: piamInterfaces
Title: Project specific interfaces to REMIND / MAgPIE
Version: 0.20.20
Date: 2024-07-17
Version: 0.20.21
Date: 2024-07-18
Authors@R: c(
person("Falk", "Benke", , "[email protected]", role = c("aut", "cre")),
person("Oliver", "Richters", role = "aut")
Expand All @@ -29,7 +29,7 @@ Suggests:
withr,
writexl
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Config/testthat/parallel: true
Config/testthat/edition: 3
Config/testthat/start-first: plotIntercomparison, checkSummations, generateIIASASubmission
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Project specific interfaces to REMIND / MAgPIE

R package **piamInterfaces**, version **0.20.20**
R package **piamInterfaces**, version **0.20.21**

[![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)

Expand Down Expand Up @@ -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.20, <URL: https://github.com/pik-piam/piamInterfaces>.
Benke F, Richters O (2024). _piamInterfaces: Project specific interfaces to REMIND / MAgPIE_. R package version 0.20.21, <https://github.com/pik-piam/piamInterfaces>.

A BibTeX entry for LaTeX users is

Expand All @@ -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.20},
note = {R package version 0.20.21},
url = {https://github.com/pik-piam/piamInterfaces},
}
```
62 changes: 31 additions & 31 deletions inst/mappings/mapping_AR6.csv
View file
Open in desktop

Large diffs are not rendered by default.

260 changes: 130 additions & 130 deletions inst/mappings/mapping_ARIADNE.csv
View file
Open in desktop

Large diffs are not rendered by default.

97 changes: 49 additions & 48 deletions inst/mappings/mapping_NAVIGATE.csv
View file
Open in desktop

Large diffs are not rendered by default.

79 changes: 79 additions & 0 deletions inst/renamed_piam_variables.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,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