From dc12f26650ae95279bf6318a9b45653747701188 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Fri, 19 Jul 2024 12:47:42 +0200 Subject: [PATCH] fixes after release --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/fullREMIND.R | 17 ++++++++++++++++- README.md | 6 +++--- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 3c93a198..d2153708 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '36475351' +ValidationKey: '36498936' 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 38e309f4..2888bc68 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.183.1 -date-released: '2024-07-17' +version: 0.183.2 +date-released: '2024-07-19' abstract: The mrremind packages contains data preprocessing for the REMIND model. authors: - family-names: Baumstark diff --git a/DESCRIPTION b/DESCRIPTION index d59c0267..33025360 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrremind Title: MadRat REMIND Input Data Package -Version: 0.183.1 -Date: 2024-07-17 +Version: 0.183.2 +Date: 2024-07-19 Authors@R: c( person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")), person("Renato", "Rodrigues", role = "aut"), diff --git a/R/fullREMIND.R b/R/fullREMIND.R index a930784a..d762d0b2 100644 --- a/R/fullREMIND.R +++ b/R/fullREMIND.R @@ -119,7 +119,6 @@ fullREMIND <- function() { # delete the 'dummy' line system(paste0('sed -i "/dummy/d" ', getConfig()$outputfolder, "/p37_clinker-to-cement-ratio.cs3r")) - calcOutput("Capacity", subtype = "capacityByTech", round = 6, file = "p_histCap.cs3r") # will be deleted after the merge of REMIND-EU calcOutput("Capacity", subtype = "capacityByTech", round = 6, file = "pm_histCap.cs3r") calcOutput("Capacity", subtype = "capacityByTech_windoff", round = 6, file = "pm_histCap_windoff.cs3r") calcOutput("Capacity", subtype = "capacityByPE", round = 6, file = "p_PE_histCap.cs3r") @@ -134,6 +133,22 @@ fullREMIND <- function() { calcOutput("CCScapacity", subtype = "projections", round = 8, file = "pm_boundCapCCS.cs4r") calcOutput("CCSbounds", round = 8, file = "p_boundCapCCSindicator.cs4r") calcOutput("LimitCCS", round = 8, file = "pm_dataccs.cs3r") + calcOutput('Industry_CCS_limits', + a1 = 0.3, a2 = 0.15, installation_minimum = 1, + stage_weight = c('Operational' = 1, + 'In construction' = 1, + 'Advanced development' = 0.5, + 'Early development' = 0.2), + signif = 3, file = 'f37_indCCSlimit_default.cs4r', + years = seq(2005, 2050, 5)) + calcOutput('Industry_CCS_limits', + a1 = 0.5, a2 = 0.25, installation_minimum = 1, + stage_weight = c('Operational' = 1, + 'In construction' = 1, + 'Advanced development' = 0.8, + 'Early development' = 0.5), + signif = 3, file = 'f37_indCCSlimit_high.cs4r', + years = seq(2005, 2050, 5)) calcOutput("BiomassPrices", round = 6, file = "f30_bioen_price.cs4r") calcOutput("ResFor2ndBioengery", years = rem_years, round = 5, file = "p30_biolcResidues.cs3r") calcOutput("1stBioDem", subtype = "ethanol_oils", years = rem_years, round = 5, file = "p30_bio1stgen.cs3r") diff --git a/README.md b/README.md index e35ebd2a..90c613de 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat REMIND Input Data Package -R package **mrremind**, version **0.183.1** +R package **mrremind**, version **0.183.2** [![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.183.2, . 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.183.1}, + note = {R package version 0.183.2}, url = {https://github.com/pik-piam/mrremind}, } ```