filter historic datawith low accuracy or faulty aggregation in compareScenarios2()

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '32899410'
+ValidationKey: '33091320'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "remind2: The REMIND R package (2nd generation)",
-  "version": "1.73.0",
+  "version": "1.74.0",
   "description": "<p>Contains the REMIND-specific routines for data and model output manipulation.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: remind2
 Type: Package
 Title: The REMIND R package (2nd generation)
-Version: 1.73.0
-Date: 2022-01-25
+Version: 1.74.0
+Date: 2022-01-26
 Authors@R: as.person(c(
     "Renato Rodrigues <renato.rodrigues@pik-potsdam.de> [aut,cre]"))
 Description: Contains the REMIND-specific routines for data and model output manipulation.

NAMESPACE

@@ -68,7 +68,6 @@ export(reportTrade)
 export(toolRegionSubsets)
 export(validationREMIND)
 export(validationSummary)
-import(magclass)
 importFrom(RColorBrewer,brewer.pal)
 importFrom(abind,abind)
 importFrom(assertr,assert)

README.md

@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.73.0**
+R package **remind2**, version **1.74.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://codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/ui#builds)
 
@@ -47,7 +47,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R (2022). _remind2: The REMIND R package (2nd generation)_. R package version 1.73.0, <URL: https://github.com/pik-piam/remind2>.
+Rodrigues R (2022). _remind2: The REMIND R package (2nd generation)_. R package version 1.74.0, <URL: https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is
   title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues},
   year = {2022},
-  note = {R package version 1.73.0},
+  note = {R package version 1.74.0},
   url = {https://github.com/pik-piam/remind2},
 }
 ```

inst/markdown/compareScenarios2/cs2_main.Rmd

@@ -105,6 +105,40 @@ dataHist %>%
   filter(period %in% params$yearsHist, !is.na(value)) ->
   dataHist
 
+# filter faulty historic data 
+# (see e.g. https://github.com/pik-piam/mrremind/issues/194)
+# TODO: can be removed once it is being dealt with on the mrremind end
+dataHist <- dataHist %>% 
+  # filter regional cement and steel production data from IEA ETP
+  anti_join(
+    expand_grid(
+      model = grep('^IEA ETP', getModels(dataHist), value = TRUE),
+      region = setdiff(getRegs(dataScen), 'World'),
+      variable = c('Production|Industry|Cement', 
+                   'Production|Industry|Steel')),
+
+    c('model', 'region', 'variable')
+  ) %>% 
+  # remove regional and global data from IEA WEO 2021
+  anti_join(
+    bind_rows(
+      expand_grid(
+        model = c('IEA WEO 2021 APS GLO', 
+                  'IEA WEO 2021 Net2050 GLO', 
+                  'IEA WEO 2021 SDS GLO', 
+                  'IEA WEO 2021 SPS GLO'),
+        region = setdiff(getRegs(dataScen), 'World')),
+
+      expand_grid(
+        model = c('IEA WEO 2021 APS regional', 
+                  'IEA WEO 2021 SDS regional', 
+                  'IEA WEO 2021 SPS regional'),
+        region = 'World')
+    ),
+
+    c('model', 'region')
+  )
+
 # Combine into one data frame and remove old.
 data <- bind_rows(dataScen, dataHist)
 rm(dataScen, dataHist)

tests/testthat/.gitignore

@@ -0,0 +1 @@
+test-dummy.R