diff --git a/.buildlibrary b/.buildlibrary index a5049653c..b962cfedf 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '8874684' +ValidationKey: '8895692' AutocreateReadme: yes allowLinterWarnings: no AddInReadme: tutorial.md diff --git a/CITATION.cff b/CITATION.cff index 3b816ed66..1fcf4a8d3 100644 --- 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.44.1 -date-released: '2025-02-05' +version: 0.44.2 +date-released: '2025-02-07' abstract: Project specific interfaces to REMIND / MAgPIE. authors: - family-names: Benke diff --git a/DESCRIPTION b/DESCRIPTION index 46892c0b2..a439cee59 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: piamInterfaces Title: Project specific interfaces to REMIND / MAgPIE -Version: 0.44.1 -Date: 2025-02-05 +Version: 0.44.2 +Date: 2025-02-07 Authors@R: c( person("Falk", "Benke", , "benke@pik-potsdam.de", role = c("aut", "cre")), person("Oliver", "Richters", role = "aut") diff --git a/README.md b/README.md index 280987d34..d715c8ae0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Project specific interfaces to REMIND / MAgPIE -R package **piamInterfaces**, version **0.44.1** +R package **piamInterfaces**, version **0.44.2** [![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) @@ -162,7 +162,7 @@ In case of questions / problems please contact Falk Benke To cite package **piamInterfaces** in publications use: -Benke F, Richters O (2025). "piamInterfaces: Project specific interfaces to REMIND / MAgPIE." Version: 0.44.1, . +Benke F, Richters O (2025). "piamInterfaces: Project specific interfaces to REMIND / MAgPIE." Version: 0.44.2, . A BibTeX entry for LaTeX users is @@ -170,9 +170,9 @@ A BibTeX entry for LaTeX users is @Misc{, title = {piamInterfaces: Project specific interfaces to REMIND / MAgPIE}, author = {Falk Benke and Oliver Richters}, - date = {2025-02-05}, + date = {2025-02-07}, year = {2025}, url = {https://github.com/pik-piam/piamInterfaces}, - note = {Version: 0.44.1}, + note = {Version: 0.44.2}, } ``` diff --git a/inst/mappings/mapping_ECEMF.csv b/inst/mappings/mapping_ECEMF.csv index d44c6a93c..2cd1666e5 100644 --- a/inst/mappings/mapping_ECEMF.csv +++ b/inst/mappings/mapping_ECEMF.csv @@ -668,7 +668,7 @@ Secondary Energy|Heat;EJ/yr;SE|Heat;EJ/yr;1;;;;R Secondary Energy|Heat|Biomass;EJ/yr;SE|Heat|+|Biomass;EJ/yr;1;;;;R Secondary Energy|Heat|Coal;EJ/yr;;;;;;; Secondary Energy|Heat|Electricity;EJ/yr;SE|Heat|Electricity|Heat Pump;EJ/yr;1;;;;R -Secondary Energy|Heat|Electricity|Heat Pump;EJ/yr;SE|Heat|Electricity|Heat Pump;EJ/yr;1;;;;R +Secondary Energy|Heat|Electricity|Heat Pumps;EJ/yr;SE|Heat|Electricity|Heat Pump;EJ/yr;1;;;;R Secondary Energy|Heat|Gas;EJ/yr;;EJ/yr;;;;; Secondary Energy|Heat|Fossil;EJ/yr;SE|Heat|+|Coal;EJ/yr;1;;;;R Secondary Energy|Heat|Fossil;EJ/yr;SE|Heat|+|Gas;EJ/yr;1;;;;R @@ -758,7 +758,6 @@ Capacity|Electricity|Oil;GW;Cap|Electricity|Oil|w/o CC;GW;1;;;;R Capacity|Electricity|Ocean;GW;;;;;;; Capacity|Electricity|Other;GW;Cap|Electricity|Hydrogen;GW;1;;;;R Capacity|Electricity|Solar;GW;Cap|Electricity|Solar;GW;1;;;;R -Capacity|Electricity|Storage;GW;Cap|Electricity|Storage|Battery;GW;1;;;;R Capacity|Electricity|Storage|Power;GW;Cap|Electricity|Storage|Battery;GW;1;;;;R Capacity|Electricity|Storage|Reservoir;GWh;Cap|Electricity|Storage|Battery;GW;6;;;;R Capacity|Electricity|Storage|Power|Battery;GW;Cap|Electricity|Storage|Battery;GW;1;;;;R