From e9674d8dd5db50c31220d156b3e34bf3ca341ad2 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Wed, 2 Oct 2024 16:56:47 +0200 Subject: [PATCH] increment version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- man/reportLCOE.Rd | 24 ++++++++++++++++-------- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index e83f0f7d..10c4b64b 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '231393712' +ValidationKey: '231436854' 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 74891457..8b92cff6 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: 'remind2: The REMIND R package (2nd generation)' -version: 1.157.2 -date-released: '2024-09-30' +version: 1.157.3 +date-released: '2024-10-02' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index aa7a34e0..614e2b71 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.157.2 -Date: 2024-09-30 +Version: 1.157.3 +Date: 2024-10-02 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/README.md b/README.md index 22167476..814ba249 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.157.2** +R package **remind2**, version **1.157.3** [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds) @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.157.3, . A BibTeX entry for LaTeX users is @@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann and Tonn Rüter}, year = {2024}, - note = {R package version 1.157.2}, + note = {R package version 1.157.3}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/man/reportLCOE.Rd b/man/reportLCOE.Rd index 0106792b..57d6cb04 100644 --- a/man/reportLCOE.Rd +++ b/man/reportLCOE.Rd @@ -15,16 +15,24 @@ Can be either "average" (returns only average LCOE), and "marginal detail" (returns table to trace back how marginal LCOE are calculated).} } \value{ -MAgPIE object - LCOE calculated by model post-processing. Two types a) standing system LCOE b) new plant LCOE. +MAgPIE object - LCOE calculated by model post-processing. +Two types a) standing system LCOE b) new plant LCOE. } \description{ -This function provides a post-processing calculation of LCOE (Levelized Cost of Energy) for energy conversion technologies in REMIND. -It includes most technologies that generate secondary energy and the distribution technologies which convert secondary energy to final energy. -This script calculates two different types of LCOE: average LCOE (standing system) and marginal LCOE (new plant). -The average LCOE reflect the total cost incurred by the technology deployment in a specific time step divided by its energy output. -The marginal LCOE estimate the per-unit lifetime cost of the output if the model added another capacity of that technology in the respective time step. -The marginal LCOE are calculate in two versions: 1) with fuel prices and co2 taxes of the time step for which the LCOE are calculated (time step prices), -or 2) with an intertemporal weighted-average of fuel price and co2 taxes over the lifetime of the plant (intertemporal prices). +This function provides a post-processing calculation of LCOE (Levelized Cost +of Energy) for energy conversion technologies in REMIND. +It includes most technologies that generate secondary energy and the distribution +technologies which convert secondary energy to final energy. +This script calculates two different types of LCOE: average LCOE (standing system) +and marginal LCOE (new plant). +The average LCOE reflect the total cost incurred by the technology deployment +in a specific time step divided by its energy output. +The marginal LCOE estimate the per-unit lifetime cost of the output if the model +added another capacity of that technology in the respective time step. +The marginal LCOE are calculate in two versions: 1) with fuel prices and co2 +taxes of the time step for which the LCOE are calculated (time step prices), +or 2) with an intertemporal weighted-average of fuel price and co2 taxes over +the lifetime of the plant (intertemporal prices). } \examples{ \dontrun{