From b66d4a66712efa9087a8abd9e07a3c13106b8808 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Tue, 2 Jul 2024 10:21:28 +0200 Subject: [PATCH 1/7] delte non-ldv plots --- inst/compareScenarios/cs_05_energy_demand.Rmd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/inst/compareScenarios/cs_05_energy_demand.Rmd b/inst/compareScenarios/cs_05_energy_demand.Rmd index 5b47d4d8..fe708d14 100644 --- a/inst/compareScenarios/cs_05_energy_demand.Rmd +++ b/inst/compareScenarios/cs_05_energy_demand.Rmd @@ -470,10 +470,6 @@ items <- c( "FE|Transport|LDV|Hydrogen", "FE|Transport|LDV|Gases", "FE|Transport|LDV|Liquids", - "FE|Transport|non-LDV|Electricity", - "FE|Transport|non-LDV|Hydrogen", - "FE|Transport|non-LDV|Gases", - "FE|Transport|non-LDV|Liquids", NULL ) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") From fb60e4bda90aee14f0373ea3f4b84c03f13fa4b6 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Wed, 10 Jul 2024 14:39:56 +0200 Subject: [PATCH 2/7] update VarNames --- inst/compareScenarios/cs_05_energy_demand.Rmd | 12 ++-- .../cs_06_energy_services.Rmd | 68 +++++++++---------- inst/compareScenarios/preprocessing.R | 4 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/inst/compareScenarios/cs_05_energy_demand.Rmd b/inst/compareScenarios/cs_05_energy_demand.Rmd index fe708d14..d46db52b 100644 --- a/inst/compareScenarios/cs_05_energy_demand.Rmd +++ b/inst/compareScenarios/cs_05_energy_demand.Rmd @@ -379,9 +379,9 @@ items_synliq <- c( "FE|Transport|Pass|Road|Bus|Liquids|Hydrogen", "FE|Transport|Freight|Rail|Liquids|Hydrogen", "FE|Transport|Pass|Rail|Liquids|Hydrogen", - "FE|Transport|Pass|Aviation|Domestic|Liquids|Hydrogen", - "FE|Transport|Pass|Aviation|International|Liquids|Hydrogen", - "FE|Transport|Freight|International Shipping|Liquids|Hydrogen", + "FE|Transport|Pass|Domestic Aviation|Liquids|Hydrogen", + "FE|Transport|Bunkers|Pass|International Aviation|Liquids|Hydrogen", + "FE|Transport|Bunkers|Freight|International Shipping|Liquids|Hydrogen", NULL ) @@ -397,9 +397,9 @@ items_bioliq <- c( "FE|Transport|Pass|Road|Bus|Liquids|Biomass", "FE|Transport|Freight|Rail|Liquids|Biomass", "FE|Transport|Pass|Rail|Liquids|Biomass", - "FE|Transport|Pass|Aviation|Domestic|Liquids|Biomass", - "FE|Transport|Pass|Aviation|International|Liquids|Biomass", - "FE|Transport|Freight|International Shipping|Liquids|Biomass", + "FE|Transport|Pass|Domestic Aviation|Liquids|Biomass", + "FE|Transport|Bunkers|Pass|International Aviation|Liquids|Biomass", + "FE|Transport|Bunkers|Freight|International Shipping|Liquids|Biomass", NULL ) diff --git a/inst/compareScenarios/cs_06_energy_services.Rmd b/inst/compareScenarios/cs_06_energy_services.Rmd index 4a39029c..294892a2 100644 --- a/inst/compareScenarios/cs_06_energy_services.Rmd +++ b/inst/compareScenarios/cs_06_energy_services.Rmd @@ -169,7 +169,7 @@ items <- c( "ES|Transport|Pass|Road|LDV|BEV pCap", "ES|Transport|Pass|Road|LDV|FCEV pCap", "ES|Transport|Pass|Road|LDV|Gases pCap", - "ES|Transport|Pass|Road|LDV|Hybrid Electric pCap", + "ES|Transport|Pass|Road|LDV|Hybrid electric pCap", "ES|Transport|Pass|Road|LDV|Liquids pCap") showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` @@ -185,7 +185,7 @@ showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap") ### Energy Services for Freight Road Transport per Capita - StackedBars ```{r ES transport freight road per capita} items <- c( - "ES|Transport|Freight|Road|Electric pCap", + "ES|Transport|Freight|Road|BEV pCap", "ES|Transport|Freight|Road|FCEV pCap", "ES|Transport|Freight|Road|Gases pCap", "ES|Transport|Freight|Road|Liquids pCap") @@ -194,13 +194,13 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ### LDV Vehicles Stock - EDGE-T ```{r LDV Vehicles Stock - EDGE-T} -tot <- "Stock|Transport|LDV" +tot <- "Stock|Transport|Pass|Road|LDV" items <- c( - "Stock|Transport|LDV|BEV", - "Stock|Transport|LDV|Hybrid Electric", - "Stock|Transport|LDV|FCEV", - "Stock|Transport|LDV|NG", - "Stock|Transport|LDV|Liquids", + "Stock|Transport|Pass|Road|LDV|BEV", + "Stock|Transport|Pass|Road|LDV|Hybrid Electric", + "Stock|Transport|Pass|Road|LDV|FCEV", + "Stock|Transport|Pass|Road|LDV|NG", + "Stock|Transport|Pass|Road|LDV|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` @@ -217,13 +217,13 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ### LDV Vehicles Sales - EDGE-T ```{r LDV Vehicles Sales - EDGE-T} -tot <- "Sales|Transport|LDV" +tot <- "Sales|Transport|Pass|Road|LDV" items <- c( - "Sales|Transport|LDV|BEV", - "Sales|Transport|LDV|Hybrid Electric", - "Sales|Transport|LDV|FCEV", - "Sales|Transport|LDV|NG", - "Sales|Transport|LDV|Liquids", + "Sales|Transport|Pass|Road|LDV|BEV", + "Sales|Transport|Pass|Road|LDV|Hybrid Electric", + "Sales|Transport|Pass|Road|LDV|FCEV", + "Sales|Transport|Pass|Road|LDV|NG", + "Sales|Transport|Pass|Road|LDV|Liquids", NULL ) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") @@ -241,48 +241,48 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") ### Truck Stock - EDGE-T ```{r Truck Stock} -tot <- "Stock|Transport|Truck" +tot <- "Stock|Transport|Freight|Road" items <- c( - "Stock|Transport|Truck|Electric", - "Stock|Transport|Truck|FCEV", - "Stock|Transport|Truck|NG", - "Stock|Transport|Truck|Liquids", + "Stock|Transport|Freight|Road|Electric", + "Stock|Transport|Freight|Road|FCEV", + "Stock|Transport|Freight|Road|NG", + "Stock|Transport|Freight|Road|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### Truck Sales - EDGE-T ```{r Truck Sales} -tot <- "Sales|Transport|Truck" +tot <- "Sales|Transport|Freight|Road" items <- c( - "Sales|Transport|Truck|Electric", - "Sales|Transport|Truck|FCEV", - "Sales|Transport|Truck|NG", - "Sales|Transport|Truck|Liquids", + "Sales|Transport|Freight|Road|Electric", + "Sales|Transport|Freight|Road|FCEV", + "Sales|Transport|Freight|Road|NG", + "Sales|Transport|Freight|Road|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### Bus Stock - EDGE-T ```{r Bus Stock} -tot <- "Stock|Transport|Bus" +tot <- "Stock|Transport|Pass|Road|Bus" items <- c( - "Stock|Transport|Bus|Electric", - "Stock|Transport|Bus|FCEV", - "Stock|Transport|Bus|NG", - "Stock|Transport|Bus|Liquids", + "Stock|Transport|Pass|Road|Bus|Electric", + "Stock|Transport|Pass|Road|Bus|FCEV", + "Stock|Transport|Pass|Road|Bus|NG", + "Stock|Transport|Pass|Road|Bus|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### Bus Sales - EDGE-T ```{r Bus Sales} -tot <- "Sales|Transport|Bus" +tot <- "Sales|Transport|Pass|Road|Bus" items <- c( - "Sales|Transport|Bus|Electric", - "Sales|Transport|Bus|FCEV", - "Sales|Transport|Bus|NG", - "Sales|Transport|Bus|Liquids", + "Sales|Transport|Pass|Road|Bus|Electric", + "Sales|Transport|Pass|Road|Bus|FCEV", + "Sales|Transport|Pass|Road|Bus|NG", + "Sales|Transport|Pass|Road|Bus|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` diff --git a/inst/compareScenarios/preprocessing.R b/inst/compareScenarios/preprocessing.R index eed8aa2f..37cfba2f 100644 --- a/inst/compareScenarios/preprocessing.R +++ b/inst/compareScenarios/preprocessing.R @@ -54,10 +54,10 @@ pCapVariables <- tribble( "ES|Transport|Pass|Road|LDV|BEV", "km/yr", 1e9, "ES|Transport|Pass|Road|LDV|FCEV", "km/yr", 1e9, "ES|Transport|Pass|Road|LDV|Gases", "km/yr", 1e9, - "ES|Transport|Pass|Road|LDV|Hybrid Electric", "km/yr", 1e9, + "ES|Transport|Pass|Road|LDV|Hybrid electric", "km/yr", 1e9, "ES|Transport|Pass|Road|LDV|Liquids", "km/yr", 1e9, "ES|Transport|Freight", "tkm/yr", 1e9, - "ES|Transport|Freight|Road|Electric", "tkm/yr", 1e9, + "ES|Transport|Freight|Road|BEV", "tkm/yr", 1e9, "ES|Transport|Freight|Road|FCEV", "tkm/yr", 1e9, "ES|Transport|Freight|Road|Gases", "tkm/yr", 1e9, "ES|Transport|Freight|Road|Liquids", "tkm/yr", 1e9, From 1c94a288a0b50e2e7857170a0036ef9db3528f50 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Wed, 10 Jul 2024 16:42:11 +0200 Subject: [PATCH 3/7] buildLibrary --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index bc26b01f..0133d559 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '228274182' +ValidationKey: '228413580' 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 d121cbed..51dd11e8 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: 'remind2: The REMIND R package (2nd generation)' -version: 1.146.3 +version: 1.147.0 date-released: '2024-07-10' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 015f3d08..eb4c262f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.146.3 +Version: 1.147.0 Date: 2024-07-10 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index d96f9103..807e4f53 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.146.3** +R package **remind2**, version **1.147.0** [![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.147.0, . 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.146.3}, + note = {R package version 1.147.0}, url = {https://github.com/pik-piam/remind2}, } ``` From 55e96f8cd1f18b7c2f4b76093a22edca634ecdf8 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Tue, 16 Jul 2024 14:54:36 +0200 Subject: [PATCH 4/7] final mappings and build library() --- inst/compareScenarios/preprocessing.R | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/inst/compareScenarios/preprocessing.R b/inst/compareScenarios/preprocessing.R index 2b9337bf..274a968c 100644 --- a/inst/compareScenarios/preprocessing.R +++ b/inst/compareScenarios/preprocessing.R @@ -54,19 +54,19 @@ pCapVariables <- tribble( "ES|Transport|Pass|Road|LDV|BEV", "k pkm/yr/pCap", 1e6, "ES|Transport|Pass|Road|LDV|FCEV", "k pkm/yr/pCap", 1e6, "ES|Transport|Pass|Road|LDV|Gases", "k pkm/yr/pCap", 1e6, - "ES|Transport|Pass|Road|LDV|Hybrid Electric", "k pkm/yr/pCap", 1e6, + "ES|Transport|Pass|Road|LDV|Hybrid electric", "k pkm/yr/pCap", 1e6, "ES|Transport|Pass|Road|LDV|Liquids", "k pkm/yr/pCap", 1e6, "ES|Transport|Freight", "k tkm/yr/pCap", 1e6, - "ES|Transport|Freight|Road|Electric", "k tkm/yr/pCap", 1e6, + "ES|Transport|Freight|Road|BEV", "k tkm/yr/pCap", 1e6, "ES|Transport|Freight|Road|FCEV", "k tkm/yr/pCap", 1e6, "ES|Transport|Freight|Road|Gases", "k tkm/yr/pCap", 1e6, "ES|Transport|Freight|Road|Liquids", "k tkm/yr/pCap", 1e6, - "Stock|Transport|LDV", "cars per 1000 people", 1e9, - "Stock|Transport|LDV|BEV", "cars per 1000 people", 1e9, - "Stock|Transport|LDV|Hybrid Electric", "cars per 1000 people", 1e9, - "Stock|Transport|LDV|FCEV", "cars per 1000 people", 1e9, - "Stock|Transport|LDV|NG", "cars per 1000 people", 1e9, - "Stock|Transport|LDV|Liquids", "cars per 1000 people", 1e9, + "Stock|Transport|Road|LDV", "cars per 1000 people", 1e9, + "Stock|Transport|Road|LDV|BEV", "cars per 1000 people", 1e9, + "Stock|Transport|Road|LDV|Hybrid electric", "cars per 1000 people", 1e9, + "Stock|Transport|Road|LDV|FCEV", "cars per 1000 people", 1e9, + "Stock|Transport|Road|LDV|Gases", "cars per 1000 people", 1e9, + "Stock|Transport|Road|LDV|Liquids", "cars per 1000 people", 1e9, "Emi|GHG", "t CO2eq/yr/pCap", 1e6, "Emi|GHG|Gross|Energy|Supply|Electricity", "t CO2eq/yr/pCap", 1e6, "Emi|GHG|Gross|Energy|Supply|Non-electric", "t CO2eq/yr/pCap", 1e6, From c49dac7f0f529670e09000c8304ae914b99f6564 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Tue, 16 Jul 2024 15:57:23 +0200 Subject: [PATCH 5/7] buildLibrary() --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 7aa33f04..c1031fa8 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '228425050' +ValidationKey: '228502320' 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 3196c85e..8152f1f9 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.147.0 -date-released: '2024-07-11' +version: 1.147.1 +date-released: '2024-07-16' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index b4697dac..ddcb49e7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.147.0 -Date: 2024-07-11 +Version: 1.147.1 +Date: 2024-07-16 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 807e4f53..5747b117 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.147.0** +R package **remind2**, version **1.147.1** [![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.147.1, . 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.147.0}, + note = {R package version 1.147.1}, url = {https://github.com/pik-piam/remind2}, } ``` From f81b8fb33dc8a9908b815f12e48328556ee21795 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Tue, 16 Jul 2024 18:07:26 +0200 Subject: [PATCH 6/7] hybrid electric --- .../cs_06_energy_services.Rmd | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/inst/compareScenarios/cs_06_energy_services.Rmd b/inst/compareScenarios/cs_06_energy_services.Rmd index 771fe7b4..2f6a0ba0 100644 --- a/inst/compareScenarios/cs_06_energy_services.Rmd +++ b/inst/compareScenarios/cs_06_energy_services.Rmd @@ -179,7 +179,7 @@ items <- c( "ES|Transport|Pass|Road|LDV|BEV", "ES|Transport|Pass|Road|LDV|FCEV", "ES|Transport|Pass|Road|LDV|Gases", - "ES|Transport|Pass|Road|LDV|Hybrid Electric", + "ES|Transport|Pass|Road|LDV|Hybrid electric", "ES|Transport|Pass|Road|LDV|Liquids") showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` @@ -235,9 +235,9 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") tot <- "Stock|Transport|Pass|Road|LDV" items <- c( "Stock|Transport|Pass|Road|LDV|BEV", - "Stock|Transport|Pass|Road|LDV|Hybrid Electric", + "Stock|Transport|Pass|Road|LDV|Hybrid electric", "Stock|Transport|Pass|Road|LDV|FCEV", - "Stock|Transport|Pass|Road|LDV|NG", + "Stock|Transport|Pass|Road|LDV|Gases", "Stock|Transport|Pass|Road|LDV|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") @@ -248,9 +248,9 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") tot <- "Stock|Transport|LDV pCap" items <- c( "Stock|Transport|LDV|BEV pCap", - "Stock|Transport|LDV|Hybrid Electric pCap", + "Stock|Transport|LDV|Hybrid electric pCap", "Stock|Transport|LDV|FCEV pCap", - "Stock|Transport|LDV|NG pCap", + "Stock|Transport|LDV|Gases pCap", "Stock|Transport|LDV|Liquids pCap", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") @@ -271,9 +271,9 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") tot <- "Sales|Transport|Pass|Road|LDV" items <- c( "Sales|Transport|Pass|Road|LDV|BEV", - "Sales|Transport|Pass|Road|LDV|Hybrid Electric", + "Sales|Transport|Pass|Road|LDV|Hybrid electric", "Sales|Transport|Pass|Road|LDV|FCEV", - "Sales|Transport|Pass|Road|LDV|NG", + "Sales|Transport|Pass|Road|LDV|Gases", "Sales|Transport|Pass|Road|LDV|Liquids", NULL ) @@ -296,7 +296,7 @@ tot <- "Stock|Transport|Freight|Road" items <- c( "Stock|Transport|Freight|Road|Electric", "Stock|Transport|Freight|Road|FCEV", - "Stock|Transport|Freight|Road|NG", + "Stock|Transport|Freight|Road|Gases", "Stock|Transport|Freight|Road|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") @@ -308,7 +308,7 @@ tot <- "Sales|Transport|Freight|Road" items <- c( "Sales|Transport|Freight|Road|Electric", "Sales|Transport|Freight|Road|FCEV", - "Sales|Transport|Freight|Road|NG", + "Sales|Transport|Freight|Road|Gases", "Sales|Transport|Freight|Road|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") @@ -320,7 +320,7 @@ tot <- "Stock|Transport|Pass|Road|Bus" items <- c( "Stock|Transport|Pass|Road|Bus|Electric", "Stock|Transport|Pass|Road|Bus|FCEV", - "Stock|Transport|Pass|Road|Bus|NG", + "Stock|Transport|Pass|Road|Bus|Gases", "Stock|Transport|Pass|Road|Bus|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") @@ -332,7 +332,7 @@ tot <- "Sales|Transport|Pass|Road|Bus" items <- c( "Sales|Transport|Pass|Road|Bus|Electric", "Sales|Transport|Pass|Road|Bus|FCEV", - "Sales|Transport|Pass|Road|Bus|NG", + "Sales|Transport|Pass|Road|Bus|Gases", "Sales|Transport|Pass|Road|Bus|Liquids", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") From b08ecd77654ce08716c081eb7fc427fa5f4c6b23 Mon Sep 17 00:00:00 2001 From: jmuessel Date: Thu, 18 Jul 2024 16:39:17 +0200 Subject: [PATCH 7/7] buildLib --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 36b0445a..e2ac2b57 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '228525262' +ValidationKey: '228545184' 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 6d3a1ead..e86410ff 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: 'remind2: The REMIND R package (2nd generation)' -version: 1.147.1 +version: 1.147.2 date-released: '2024-07-18' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index cc230be7..c5e6458c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.147.1 +Version: 1.147.2 Date: 2024-07-18 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index 68356b57..1b1e40de 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.147.1** +R package **remind2**, version **1.147.2** [![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.147.2, . 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.147.1}, + note = {R package version 1.147.2}, url = {https://github.com/pik-piam/remind2}, } ```