From 3600957bbb7fdb3dd67d118a6b5566e72a0e1b7d Mon Sep 17 00:00:00 2001 From: Johannes Koch Date: Fri, 11 Oct 2024 08:11:21 +0200 Subject: [PATCH] Update in accordance with mrdrivers update --- R/calcNutrientBudgetSewage.R | 3 +-- R/convertGTAPv8v9.R | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/R/calcNutrientBudgetSewage.R b/R/calcNutrientBudgetSewage.R index 9dcb35dc..bb54b812 100644 --- 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 index 6746115d..b32769ab 100644 --- 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",