diff --git a/.buildlibrary b/.buildlibrary index af2b426..32aa9fc 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '28109640' +ValidationKey: '28256150' 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 dd1bdf5..f2fd426 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: 'mip: Comparison of multi-model runs' -version: 0.144.3 -date-released: '2023-05-03' +version: 0.145.0 +date-released: '2023-05-10' abstract: Package contains generic functions to produce comparison plots of multi-model runs. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 91276eb..fc35d59 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mip Title: Comparison of multi-model runs -Version: 0.144.3 -Date: 2023-05-03 +Version: 0.145.0 +Date: 2023-05-10 Authors@R: c( person("David", "Klein", , "dklein@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), diff --git a/README.md b/README.md index b0e6c03..c96119b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Comparison of multi-model runs -R package **mip**, version **0.144.3** +R package **mip**, version **0.145.0** [![CRAN status](https://www.r-pkg.org/badges/version/mip)](https://cran.r-project.org/package=mip) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158586.svg)](https://doi.org/10.5281/zenodo.1158586) [![R build status](https://github.com/pik-piam/mip/workflows/check/badge.svg)](https://github.com/pik-piam/mip/actions) [![codecov](https://codecov.io/gh/pik-piam/mip/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mip) [![r-universe](https://pik-piam.r-universe.dev/badges/mip)](https://pik-piam.r-universe.dev/builds) @@ -47,7 +47,7 @@ In case of questions / problems please contact David Klein . +Klein D, Dietrich J, Baumstark L, Humpenoeder F, Stevanovic M, Wirth S, Führlich P, Richters O (2023). _mip: Comparison of multi-model runs_. doi: 10.5281/zenodo.1158586 (URL: https://doi.org/10.5281/zenodo.1158586), R package version 0.145.0, . A BibTeX entry for LaTeX users is @@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is title = {mip: Comparison of multi-model runs}, author = {David Klein and Jan Philipp Dietrich and Lavinia Baumstark and Florian Humpenoeder and Miodrag Stevanovic and Stephen Wirth and Pascal Führlich and Oliver Richters}, year = {2023}, - note = {R package version 0.144.3}, + note = {R package version 0.145.0}, doi = {10.5281/zenodo.1158586}, url = {https://github.com/pik-piam/mip}, } diff --git a/inst/extdata/plotstyle.csv b/inst/extdata/plotstyle.csv index e05e89d..02a516c 100644 --- a/inst/extdata/plotstyle.csv +++ b/inst/extdata/plotstyle.csv @@ -673,27 +673,29 @@ Hydrogen [external];Hydrogen;#88FFFF;; Storage|Stat Batteries;Storage Batteries;#FF8C00;; Storage|Pump Hydro;Pump Hydro;#EE82EE;; Net Imports;Net Imports;#EE4000;; -Energy|Supply|Heat|District Heating;District Heating;#cc0000;; -Energy|Supply|Electricity;Electricity;#993a44;; +Energy|Supply|Heat|District Heating;District Heating;#97d700;; +Energy|Supply|Electricity;Electricity;#bb29bb;; CHP|Hard Coal;CHP|Hard Coal;#0c0c0c;; -CHP|Lignite;CHP|Lignite;#858585;; +CHP|Lignite;CHP|Lignite;orange4;; CHP|Gas;CHP|Gas;#999959;; CHP|Hydrogen;CHP|Hydrogen;#88FFFF;; CHP|Oil;CHP|Oil;#663a00;; CHP|Waste;CHP|Waste;#bcbc6d;; CHP|Other;CHP|Other;#cc00cc;; -CHP|Other Fossil;CHP|Other Fossil;#7f7f7f;; +CHP|Other Fossil;CHP|Other Fossil;LightSalmon1;; CHP|Biomass;CHP|Biomass;#005900;; -Heat-only|Hard Coal;Heat-only|Hard Coal;#3c3c3c;; -Heat-only|Lignite;Heat-only|Lignite;#424242;; -Heat-only|Gas;Heat-only|Gas;#999966;; -Heat-only|Oil;Heat-only|Oil;#0000cc;; -Heat-only|Other;Heat-only|Other;#7a007a;; -Heat-only|Waste;Heat-only|Waste;#969657;; -Heat-only|Other Fossil;Heat-only|Other Fossil;#585858;; -Heat-only|Biomass;Heat-only|Biomass;#00b219;; -Heat-only|Heat Pump;Heat-only|Heat Pump;#3cb44b;; -Heat-only|Electric Boiler;Heat-only|Electric Boiler;#f58231;; -Heat-only|Solar;Heat-only|Solar;#7f7f00;; -Heat-only|Geothermal;Heat-only|Geothermal;#660000;; -Cap|Stationary;EU ETS cap;#ff9800;; \ No newline at end of file +Heat-only|Hard Coal;Heat-only|Hard Coal;#2F4F4F;; +Heat-only|Lignite;Heat-only|Lignite;#8B7355;; +Heat-only|Gas;Heat-only|Gas;#528B8B;; +Heat-only|Oil;Heat-only|Oil;#CD5B45;; +Heat-only|Other;Heat-only|Other;#CD8162;; +Heat-only|Waste;Heat-only|Waste;#e58e73;; +Heat-only|Other Fossil;Heat-only|Other Fossil;#8B5742;; +Heat-only|Biomass;Heat-only|Biomass;#7FFF00;; +Heat-only|Heat Pump;Heat-only|Heat Pump;#00B2EE;; +Heat-only|Electric Boiler;Heat-only|Electric Boiler;#BFEFFF;; +Heat-only|Solar;Heat-only|Solar;#FFD700;; +Heat-only|Geothermal;Heat-only|Geothermal;#C71585;; +Cap|Stationary;EU ETS cap;#ff9800;; +non-ETS-covered;non ETS;#150144;; +ETS-covered;ETS;#c3406b;; \ No newline at end of file diff --git a/man/showLinePlots.Rd b/man/showLinePlots.Rd index adb8ea1..67db8d3 100644 --- a/man/showLinePlots.Rd +++ b/man/showLinePlots.Rd @@ -8,7 +8,7 @@ showLinePlots( data, vars = NULL, scales = "free_y", - color.dim.name = "Model output", + color.dim.name = NULL, mainReg = getOption("mip.mainReg") ) } diff --git a/man/showLinePlotsWithTarget.Rd b/man/showLinePlotsWithTarget.Rd index c86379f..17feb31 100644 --- a/man/showLinePlotsWithTarget.Rd +++ b/man/showLinePlotsWithTarget.Rd @@ -4,12 +4,7 @@ \alias{showLinePlotsWithTarget} \title{Show Line Plots With Target} \usage{ -showLinePlotsWithTarget( - data, - vars, - scales = "free_y", - color.dim.name = "Model output" -) +showLinePlotsWithTarget(data, vars, scales = "free_y", color.dim.name = NULL) } \arguments{ \item{data}{A quitte object or an object that can be transformed into a