allow zero weight in readGasser

pik-piam · Nov 21, 2024 · 79abdaf · 79abdaf
1 parent 9b4708f
commit 79abdaf
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 8 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -79,7 +79,6 @@ importFrom(magpiesets,reporthelper)
 importFrom(magpiesets,reportingnames)
 importFrom(magpiesets,summationhelper)
 importFrom(mrfaocore,toolFAOcombine)
-importFrom(mstools,toolCell2isoCell)
 importFrom(mstools,toolCoord2Isocell)
 importFrom(mstools,toolGetMappingCoord2Country)
 importFrom(mstools,toolIso2CellCountries)

diff --git a/R/calcValidGrassLSUha.R b/R/calcValidGrassLSUha.R
@@ -9,8 +9,6 @@
 #' \dontrun{
 #' calcOutput("ValidGrassLSUha")
 #' }
-#' @importFrom mstools toolCell2isoCell
-
 calcValidGrassLSUha <- function(datasource = "MAgPIEown") {
 
   if (datasource == "MAgPIEown") {

diff --git a/R/calcValidGridNutrientAWMS.R b/R/calcValidGridNutrientAWMS.R
@@ -12,10 +12,7 @@
 #' }
 #'
 #' @importFrom magpiesets reportingnames
-#' @importFrom mstools toolIso2CellCountries
-
 calcValidGridNutrientAWMS <- function(nutrient = c("nr", "c")) {
-
   past  <- findset("past")
   out   <- collapseNames(calcOutput("Excretion", cellular = TRUE, attributes = "npkc",
                                     aggregate = FALSE)[, past, ])[, , nutrient]

diff --git a/R/calcValidKcal.R b/R/calcValidKcal.R
@@ -20,7 +20,6 @@
 #' @importFrom magpiesets reporthelper
 #' @importFrom magclass getSets dimOrder
 #' @importFrom mrfaocore toolFAOcombine
-
 calcValidKcal <- function(datasource = "FAO", nutrient = "kcal", detail = TRUE) {
   if (length(nutrient) > 1) {
     stop("select only one nutrient")

diff --git a/R/readGasser.R b/R/readGasser.R
@@ -117,7 +117,8 @@ readGasser <- function(subtype = "bookkeeping") {
                               rel = mappingGasser,
                               weight = weight[isoList, getYears(eluc), ],
                               from = "GasserReg",
-                              to = "ISO.Alpha3")
+                              to = "ISO.Alpha3",
+                              zeroWeight = "allow")
 
     weight <- collapseNames(readSource("FRA2020", "forest_area")[, , "landArea"])
     missingWeightYears <- setdiff(getYears(eluc), getYears(weight))