unify imports

fbenke-pik · Jun 28, 2024 · f566ac4 · f566ac4
1 parent 5bc93c6
commit f566ac4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -188,7 +188,6 @@ importFrom(magclass,getSets)
 importFrom(magclass,getYears)
 importFrom(magclass,lowpass)
 importFrom(magclass,magpie_expand)
-importFrom(magclass,matchDim)
 importFrom(magclass,mbind)
 importFrom(magclass,mcalc)
 importFrom(magclass,mselect)

diff --git a/R/reportEmi.R b/R/reportEmi.R
@@ -20,7 +20,7 @@
 #'
 #' @importFrom gdx readGDX
 #' @importFrom dplyr %>% distinct filter full_join group_by inner_join left_join mutate rename select summarise
-#' @importFrom magclass mselect mselect<- collapseDim getItems getRegions getYears matchDim
+#' @importFrom magclass mselect mselect<- collapseDim getItems getRegions getYears
 #' @importFrom madrat toolAggregate
 #' @importFrom tibble as_tibble
 #' @importFrom piamutils deletePlus
@@ -147,7 +147,7 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL,
   if (length(vm_demFENonEnergySector) == 0) {
     vm_demFENonEnergySector <- NULL
   } else {
-    vm_demFENonEnergySector <- matchDim(vm_demFENonEnergySector, vm_demFeSector)
+    vm_demFENonEnergySector <- magclass::matchDim(vm_demFENonEnergySector, vm_demFeSector)
   }
 
   # secondary energy production
@@ -326,7 +326,7 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL,
                                     react = "silent")[,t,]
     }
     else {
-      vm_incinerationEmi <- matchDim(vm_incinerationEmi, v37_plasticsCarbon,
+      vm_incinerationEmi <- magclass::matchDim(vm_incinerationEmi, v37_plasticsCarbon,
                                    fill = 0)
     }
 
@@ -337,7 +337,7 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL,
     if (is.null(vm_incinerationCCS)) {
       rm('vm_incinerationCCS')
     } else {
-      vm_incinerationCCS <- matchDim(vm_incinerationCCS, vm_incinerationEmi)
+      vm_incinerationCCS <- magclass::matchDim(vm_incinerationCCS, vm_incinerationEmi)
     }
 
     vm_nonIncineratedPlastics   <- readGDX(gdx, "vm_nonIncineratedPlastics", field = "l", restore_zeros = FALSE,