Update in accordance with mrdrivers update

pik-piam · Oct 16, 2024 · 3600957 · 3600957
1 parent 557646b
commit 3600957
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/R/calcNutrientBudgetSewage.R b/R/calcNutrientBudgetSewage.R
@@ -33,8 +33,7 @@ calcNutrientBudgetSewage <- function(historic = TRUE) {
     drecht <- drecht[, , ssps]
     drecht <- collapseNames(time_interpolate(drecht, interpolated_year = findset("time"),
                                              integrate_interpolated_years = FALSE, extrapolation_type = "constant"))
-    population <- collapseNames(calcOutput("Population", naming = "indicator.scenario",
-                                           PopulationFuture = "SSP", aggregate = FALSE)[, , ssps])
+    population <- calcOutput("Population", scenario = "SSPs", naming = "scenario", aggregate = FALSE)
   }
 
   detergent <- population * drecht[, , "det_p_pp"]

diff --git a/R/convertGTAPv8v9.R b/R/convertGTAPv8v9.R
@@ -65,8 +65,7 @@ convertGTAPv8v9 <- function(x, subtype) {
     }
 
   } else {
-    gdpMer <- calcOutput("GDPPast", GDPPast = "WDI-MI",
-                         unit = "constant 2017 US$MER", aggregate = FALSE)
+    gdpMer <- calcOutput("GDPPast", unit = "constant 2017 US$MER", aggregate = FALSE)
     gdpMer <- gdpMer[, getYears(x), , drop = TRUE]
     w1 <- GDPuc::toolConvertGDP(gdpMer,
                                 unit_in = "constant 2017 US$MER",