Merge pull request #424 from fbenke-pik/bugfix

Fix bugs in convertBP

.buildlibrary

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

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.169.1
-date-released: '2023-09-13'
+version: 0.169.2
+date-released: '2023-09-14'
 abstract: The mrremind packages contains data preprocessing for the REMIND model.
 authors:
 - family-names: Baumstark

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrremind
 Title: MadRat REMIND Input Data Package
-Version: 0.169.1
-Date: 2023-09-13
+Version: 0.169.2
+Date: 2023-09-14
 Authors@R: c(
     person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
     person("Renato", "Rodrigues", role = "aut"),

R/convertBP.R

@@ -206,7 +206,7 @@ convertBP <- function(x, subtype) {
     trade.ref.import.oil <- .removeNaRegions(trade.ref.import.oil)
     trade.ref.import.oil <- trade.ref.import.oil[, c(2019, 2020), ]
 
-    reg2detailReg <- toolGetMapping("regionmappingBP_Oil_Region_To_DetailReg.csv", 
+    reg2detailReg <- toolGetMapping("regionmappingBP_Oil_Region_To_DetailReg.csv",
                                     type = "regional", where = "mappingfolder")
     reg2detailReg.export <- filter(reg2detailReg, !!sym("Type") == "Export")
     reg2detailReg.import <- filter(reg2detailReg, !!sym("Type") == "Import")
@@ -224,7 +224,8 @@ convertBP <- function(x, subtype) {
     x1[, c(2019, 2020), ] <- trade.ref.export.oil
     # for 1980 - 2018 we split some regions into more fine granular regions by 2020 data
     x1[unchanged_regions, seq(1980, 2018, 1), ] <- trade.export.oil[unchanged_regions, seq(1980, 2018, 1), ]
-    x1[to_regions, seq(1980, 2018, 1), ] <- trade.ref.export.split[, seq(1980, 2018, 1), , ]
+
+    x1[to_regions, seq(1980, 2018, 1), ] <- trade.ref.export.split[, seq(1980, 2018, 1), ]
 
     from_regions <- intersect(reg2detailReg.import$BP_Region, getItems(trade.import.oil, dim = 1))
     to_regions <- intersect(reg2detailReg.import$BP_Region_Detail, getItems(trade.ref.import.oil, dim = 1))
@@ -239,7 +240,7 @@ convertBP <- function(x, subtype) {
     x2[, c(2019, 2020), ] <- trade.ref.import.oil
     # for 1980 - 2018 we split some regions into more fine granular regions by 2020 data
     x2[unchanged_regions, seq(1980, 2018, 1), ] <- trade.import.oil[unchanged_regions, seq(1980, 2018, 1), ]
-    x2[to_regions, seq(1980, 2018, 1), ] <- trade.ref.import.split[, seq(1980, 2018, 1), , ]
+    x2[to_regions, seq(1980, 2018, 1), ] <- trade.ref.import.split[, seq(1980, 2018, 1), ]
 
     x.trade <- new.magpie(getItems(x1, dim = 1), getYears(x1), c("Trade|Import|Oil (kb/d)", "Trade|Export|Oil (kb/d)"))
     x.trade[, , "Trade|Export|Oil (kb/d)"] <- x1

R/fullVALIDATIONREMIND.R

@@ -65,15 +65,15 @@ fullVALIDATIONREMIND <- function(rev = 0) {
   )
 
   weo <- weo["GLO", , ]
-  write.report(weo, file = file.path(getConfig("outputfolder"), valfile), append = TRUE)
+  write.report(weo, file = valfile, append = TRUE)
 
   weo <- calcOutput(
     type = "IEA_WEO_2021", subtype = "region", aggregate = columnsForAggregation,
     warnNA = FALSE, try = TRUE, isValidation = TRUE
   )
 
   weo <- weo["GLO", , invert = TRUE]
-  write.report(weo, file = file.path(getConfig("outputfolder"), valfile), append = TRUE)
+  write.report(weo, file = valfile, append = TRUE)
 
   # filter variables that are too imprecise on regional level ----
   filter_historical_mif()

README.md

@@ -1,6 +1,6 @@
 # MadRat REMIND Input Data Package
 
-R package **mrremind**, version **0.169.1**
+R package **mrremind**, version **0.169.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 <lavinia@pik-po
 
 To cite package **mrremind** in publications use:
 
-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 (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.169.1, <https://github.com/pik-piam/mrremind>.
+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 (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.169.2, <https://github.com/pik-piam/mrremind>.
 
 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},
   year = {2023},
-  note = {R package version 0.169.1},
+  note = {R package version 0.169.2},
   url = {https://github.com/pik-piam/mrremind},
 }
 ```