From d321fc5d06ff0722a889764e219170555b3720a9 Mon Sep 17 00:00:00 2001 From: David Klein Date: Fri, 30 Aug 2024 10:51:50 +0200 Subject: [PATCH 1/3] Add supply curves for SSP3 (copy from SSP2). --- R/calcBiomassPrices.R | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/R/calcBiomassPrices.R b/R/calcBiomassPrices.R index 41a2bd04..fa059a0a 100644 --- a/R/calcBiomassPrices.R +++ b/R/calcBiomassPrices.R @@ -19,6 +19,11 @@ calcBiomassPrices <- function(){ # Introduce new SSP/SDP dimension by replacing "-" with "." getNames(x) <- gsub("(SSP[0-9]|SDP)-","\\1.",getNames(x)) + # add supply curves for SSP3 using the curves from SSP2 + tmp <- x[,,"SSP2"] + getNames(tmp) <- gsub("SSP2", "SSP3", getNames(tmp)) + x <- mbind(x, tmp) + # if fit coefficients of a country are NA for all years (there is no supplycurve at all for this country) # generate artificial supplycurve with VERY high prices x[,,"a"][is.na(x[,,"a"])] <- 1 From e9aba401f15df391ddc0345fd40715367e4e1329 Mon Sep 17 00:00:00 2001 From: David Klein Date: Fri, 30 Aug 2024 11:02:32 +0200 Subject: [PATCH 2/3] Read file that contains SSP3 data --- R/industry_subsectors_specific.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/industry_subsectors_specific.R b/R/industry_subsectors_specific.R index 2bdb967c..f1e70156 100644 --- a/R/industry_subsectors_specific.R +++ b/R/industry_subsectors_specific.R @@ -64,7 +64,7 @@ readindustry_subsectors_specific <- function(subtype = NULL) { # subtype switchboard ---- switchboard <- list( 'FE' = function() { - read_csv(file = file.path(path, 'specific_FE.csv'), + read_csv(file = file.path(path, 'specific_FE.SSP3.csv'), col_types = 'cccd', comment = '#', progress = FALSE) %>% From afb406cc08f3fd3506a6c02962739a6d70f31739 Mon Sep 17 00:00:00 2001 From: David Klein Date: Mon, 2 Sep 2024 13:50:52 +0200 Subject: [PATCH 3/3] build library --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 258d0a5b..2a2cb17a 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '37180416' +ValidationKey: '37340160' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 1977c5ab..252d8fee 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.186.2 +version: 0.187.0 date-released: '2024-09-02' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 7d7bf895..7de2f392 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.186.2 +Version: 0.187.0 Date: 2024-09-02 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index e3c3ab90..205a1dd1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.186.2** +R package **mrremind**, version **0.187.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.187.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.186.2}, + note = {R package version 0.187.0}, url = {https://github.com/pik-piam/mrremind}, } ```