From ab7feda227abc6f9c939d09cadd55c5043ae8d95 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:18:36 +0100 Subject: [PATCH 1/6] Update readEDGETransport.R --- R/readEDGETransport.R | 1 + 1 file changed, 1 insertion(+) diff --git a/R/readEDGETransport.R b/R/readEDGETransport.R index 90be8000..397b5348 100644 --- a/R/readEDGETransport.R +++ b/R/readEDGETransport.R @@ -45,6 +45,7 @@ readEDGETransport <- function(subtype) { "SSP2", "Mix4", TRUE, "SSP2_demRedStrong", "SSP2", "Mix4", TRUE, "SSP2_demDiffer", "SSP2", "Mix1", FALSE, "SSP2_demDiffer", + "SSP2", "Mix2", FALSE, "SSP2_highDemDEU", "SDP_EI", "Mix4", TRUE, "default", "SDP_MC", "Mix4", TRUE, "default", "SDP_RC", "Mix3", TRUE, "default", From 461080eda0b8a28a682df8010da50c7e4824da87 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:24:55 +0100 Subject: [PATCH 2/6] buildlib --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 6 +++--- README.md | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 26f7bacd..649f362e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '39529055' +ValidationKey: '39679200' AcceptedWarnings: - Invalid URL: .* - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 1fab62ad..7ca26968 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: 'mrremind: MadRat REMIND Input Data Package' -version: 0.197.3 -date-released: '2024-11-08' +version: 0.198.0 +date-released: '2024-11-13' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index 7d2c7597..d2f2122b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.197.3 -Date: 2024-11-08 +Version: 0.198.0 +Date: 2024-11-13 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), @@ -44,7 +44,7 @@ Imports: countrycode, data.table, dplyr, - edgeTransport (>= 1.5.5), + edgeTransport (>= 2.9.0), GDPuc (>= 1.3.0), ggplot2, luscale, diff --git a/README.md b/README.md index 6601fbfc..2f0d52dd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.197.3** +R package **mrremind**, version **0.198.0** [![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![R build status](https://github.com/pik-piam/mrremind/workflows/check/badge.svg)](https://github.com/pik-piam/mrremind/actions) [![codecov](https://codecov.io/gh/pik-piam/mrremind/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark . +Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.198.0, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrremind: MadRat REMIND Input Data Package}, author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux and Johannes Koch}, year = {2024}, - note = {R package version 0.197.3}, + note = {R package version 0.198.0}, url = {https://github.com/pik-piam/mrremind}, } ``` From d5dfffe568f55dc1165709f6aba485ba08e018a0 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:46:59 +0100 Subject: [PATCH 3/6] buildlib --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index b3e42b51..649f362e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '39558960' +ValidationKey: '39679200' AcceptedWarnings: - Invalid URL: .* - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index dec4ea58..7ca26968 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'mrremind: MadRat REMIND Input Data Package' -version: 0.197.4 +version: 0.198.0 date-released: '2024-11-13' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 95c76973..c0b8a665 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.197.4 +Version: 0.198.0 Date: 2024-11-13 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), @@ -44,7 +44,7 @@ Imports: countrycode, data.table, dplyr, - edgeTransport (>= 2.9.0), + edgeTransport, GDPuc (>= 1.3.0), ggplot2, luscale, From 4064cdc000767f07dc5f62efd93458cd22eb97f1 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:47:04 +0100 Subject: [PATCH 4/6] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b621916f..2f0d52dd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.197.4** +R package **mrremind**, version **0.198.0** [![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![R build status](https://github.com/pik-piam/mrremind/workflows/check/badge.svg)](https://github.com/pik-piam/mrremind/actions) [![codecov](https://codecov.io/gh/pik-piam/mrremind/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark . +Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.198.0, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrremind: MadRat REMIND Input Data Package}, author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux and Johannes Koch}, year = {2024}, - note = {R package version 0.197.4}, + note = {R package version 0.198.0}, url = {https://github.com/pik-piam/mrremind}, } ``` From 8fcdaaf234ca0493912a30859ce4d4d02f34aad0 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:48:18 +0100 Subject: [PATCH 5/6] Update DESCRIPTION --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c0b8a665..d2f2122b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -44,7 +44,7 @@ Imports: countrycode, data.table, dplyr, - edgeTransport, + edgeTransport (>= 2.9.0), GDPuc (>= 1.3.0), ggplot2, luscale, From 3f23f46b53412c6bd5cce765087bc2117f2b2206 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:56:43 +0100 Subject: [PATCH 6/6] include mix3 as option --- R/readEDGETransport.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/R/readEDGETransport.R b/R/readEDGETransport.R index 397b5348..f87ac87a 100644 --- a/R/readEDGETransport.R +++ b/R/readEDGETransport.R @@ -46,6 +46,8 @@ readEDGETransport <- function(subtype) { "SSP2", "Mix4", TRUE, "SSP2_demDiffer", "SSP2", "Mix1", FALSE, "SSP2_demDiffer", "SSP2", "Mix2", FALSE, "SSP2_highDemDEU", + "SSP2", "Mix3", FALSE, "SSP2_highDemDEU", + "SSP2", "Mix3", TRUE, "SSP2_highDemDEU", "SDP_EI", "Mix4", TRUE, "default", "SDP_MC", "Mix4", TRUE, "default", "SDP_RC", "Mix3", TRUE, "default",