magclass 6 compatibility fix

.buildlibrary

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

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "remind: The REMIND R Package",
-  "version": "36.185.1",
+  "version": "36.185.2",
   "description": "<p>Contains the REMIND-specific routines for data and model output manipulation.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: remind
 Type: Package
 Title: The REMIND R Package
-Version: 36.185.1
-Date: 2021-08-30
+Version: 36.185.2
+Date: 2021-09-03
 Authors@R: c(
 	person("Anastasis", "Giannousakis", email="giannou@pik-potsdam.de", role=c("aut","cre")),
 	person("Michaja", "Pehl", role=c("aut")))

NAMESPACE

@@ -171,6 +171,7 @@ importFrom(lusweave,swtable)
 importFrom(madrat,calcOutput)
 importFrom(madrat,toolGetMapping)
 importFrom(madrat,toolNAreplace)
+importFrom(magclass,"getItems<-")
 importFrom(magclass,"getNames<-")
 importFrom(magclass,"getRegions<-")
 importFrom(magclass,"getSets<-")
@@ -184,6 +185,7 @@ importFrom(magclass,collapseNames)
 importFrom(magclass,complete_magpie)
 importFrom(magclass,dimReduce)
 importFrom(magclass,dimSums)
+importFrom(magclass,getItems)
 importFrom(magclass,getNames)
 importFrom(magclass,getRegions)
 importFrom(magclass,getSets)

R/calcFEprices.R

@@ -91,10 +91,10 @@ calcFEprices <- function(gdx) {
             mbind(
                 q_febal.m[,,c("fepet", "fedie")] * vm_prodFe.l[,,c("fepet", "fedie")],
                 q_balfinen.m[,,"fehos"] * vm_prodFe.l[,,"fehos"])),
-        dims = 3
+        dim = 3
     ) 
-    / dimSums(vm_prodFe.l, dims = 3)
-    / (abs(dimSums(qm_budget.m, dims = 3)) + 1e-10)
+    / dimSums(vm_prodFe.l, dim = 3)
+    / (abs(dimSums(qm_budget.m, dim = 3)) + 1e-10)
     * 1000
     / TWa_2_EJ
     ) -> liquids.p

R/compareScenarios.R

@@ -35,6 +35,7 @@ compareScenarios <- function(mif, hist,
                              y_bar=c(2010,2030,2050,2100),
                              reg=NULL, mainReg="GLO", fileName="CompareScenarios.pdf",
                              sr15marker_RCP=NULL) {
+  unit <- NULL
 
   lineplots_perCap <- function(data, vars, percap_factor, ylabstr,
                                global=FALSE, per_gdp=FALSE, histdata=NULL){

R/dimSums.R

@@ -0,0 +1,38 @@
+#' dimSums
+#'
+#' Slightly modified version of the \code{dimSums} function of the magclass package.
+#' It will expand magclass objects of length 0 by adding an element in the dimension
+#' over which \code{dimSumsSpecial} is applied and set all values to 0 and it
+#' will name the spatial dimension "GLO" if summation over this dimension happens.
+#'
+#' @param x A MAgPIE-object
+#' @param dim The dimensions(s) to sum over. A vector of dimension codes or dimension names.
+#' See \code{\link{dimCode}} for more information
+#' @param na.rm logical. Should missing values (including NaN) be omitted from
+#' the calculations?
+#' @return A MAgPIE object with values summed over the specified dimensions
+#' @importFrom magclass getItems<- getItems new.magpie
+#' @author Jan Philipp Dietrich
+dimSums <- function(x, dim = 3, na.rm = FALSE) { # nolint
+  if (is.null(x)) return(x)
+  if (length(x) == 0) {
+    elem <- list()
+    for (i in 1:3) {
+      if (dim(x)[i] == 0) elem[[i]] <- "dummy"
+      else elem[[i]] <- getItems(x, dim = i)
+    }
+    out <- new.magpie(elem[[1]], elem[[2]], elem[[3]], fill = 0)
+    if (dim(x)[1] == 0) getItems(out, dim = 1) <- "GLO"
+    if (dim(x)[2] == 0) getItems(out, dim = 2) <- NULL
+    if (dim(x)[3] == 0) getItems(out, dim = 3) <- NULL
+    return(out)
+  }
+  out <- magclass::dimSums(x, dim = dim, na.rm = na.rm)
+  if (1 %in% dim) getItems(out, dim = 1) <- "GLO"
+  return(out)
+}
+
+"getRegions<-" <- function(x, value) { #nolint
+  getItems(x, dim = 1) <- value
+  return(x)
+}

R/plotLCOE.R

@@ -23,6 +23,7 @@
 
 plotLCOE <- function(LCOEfile, gdx, y=c(2015,2020,2030,2040,2050,2060),reg="all_regi",fileName="LCOE_plots.pdf") {
 
+  unit <- NULL
 
   df.LCOE.in <- read.csv(LCOEfile, sep = ";") 
 

R/readSupplycurveBio.R

@@ -11,7 +11,6 @@
 #' @importFrom magclass mbind collapseNames add_dimension getSets
 #' @importFrom remulator calc_supplycurve
 #' @author David Klein
-#' @seealso \code{\link[remulator]{emulator}} \code{\link{calc_supplycurve}}
 #' @export
 
 readSupplycurveBio <- function(outputdirs, userfun = function(param,x) {return(param[[1]] + param[[2]] * x)}, mult_on = "all") {

R/reportEDGETransport.R

@@ -21,7 +21,8 @@
 
 reportEDGETransport <- function(output_folder=".",
                                 remind_root=NULL) {
-
+  unit <- NULL
+
   if(is.null(remind_root)){
     remind_root <- file.path(output_folder, "../..")
   }

R/reportLCOE.R

@@ -30,6 +30,8 @@
 
 reportLCOE <- function(gdx, output.type = "both"){
 
+ unit <- NULL
+
  # test whether output.type defined
  if (!output.type %in% c("marginal", "average", "both", "marginal detail")) {
    print("Unknown output type. Please choose either marginal, average, both or marginal detail.")

README.md

@@ -1,8 +1,8 @@
 # The REMIND R Package
 
-R package **remind**, version **36.185.1**
+R package **remind**, version **36.185.2**
 
-[![CRAN status](https://www.r-pkg.org/badges/version/remind)](https://cran.r-project.org/package=remind)    
+[![CRAN status](https://www.r-pkg.org/badges/version/remind)](https://cran.r-project.org/package=remind)     [![r-universe](https://pik-piam.r-universe.dev/badges/remind)](https://pik-piam.r-universe.dev/ui#builds)
 
 ## Purpose and Functionality
 
@@ -46,7 +46,7 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p
 
 To cite package **remind** in publications use:
 
-Giannousakis A, Pehl M (2021). _remind: The REMIND R Package_. R package version 36.185.1.
+Giannousakis A, Pehl M (2021). _remind: The REMIND R Package_. R package version 36.185.2.
 
 A BibTeX entry for LaTeX users is
 
@@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is
   title = {remind: The REMIND R Package},
   author = {Anastasis Giannousakis and Michaja Pehl},
   year = {2021},
-  note = {R package version 36.185.1},
+  note = {R package version 36.185.2},
 }
 ```