From 1886a00d5fec0dc7f028b7cecad41a5e6188d3bc Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Mon, 19 Feb 2024 11:08:42 +0100 Subject: [PATCH 1/2] remove maglcass::dimSums() import - since magclass 6.0.0 changed dimSums() behaviour, remind2 uses a local dimSums() (see #98) - so dimSums() was imported, then immediately overwritten by the local dimSums() version in the remind2 scope --- NAMESPACE | 1 - R/calc_regionSubset_sums.R | 2 +- R/readConsumption.R | 2 +- R/readEmissions.R | 2 +- R/readFE.R | 2 +- R/reportCapacity.R | 2 +- R/reportCapitalStock.R | 2 +- R/reportCosts.R | 2 +- R/reportCrossVariables.R | 2 +- R/reportEmi.R | 2 +- R/reportEmiAirPol.R | 154 ++++++++++++++++++------------------- R/reportEnergyInvestment.R | 2 +- R/reportExtraction.R | 2 +- R/reportFE.R | 2 +- R/reportLCOE.R | 2 +- R/reportMOFEX.R | 2 +- R/reportMacroEconomy.R | 2 +- R/reportPE.R | 2 +- R/reportPolicyCosts.R | 2 +- R/reportPrices.R | 2 +- R/reportSE.R | 2 +- R/reportTax.R | 2 +- R/reportTrade.R | 2 +- 23 files changed, 98 insertions(+), 99 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 40082166..c775aeb8 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -193,7 +193,6 @@ importFrom(magclass,collapseNames) importFrom(magclass,complete_magpie) importFrom(magclass,dimExists) importFrom(magclass,dimReduce) -importFrom(magclass,dimSums) importFrom(magclass,getItems) importFrom(magclass,getNames) importFrom(magclass,getRegions) diff --git a/R/calc_regionSubset_sums.R b/R/calc_regionSubset_sums.R index cb25dc9f..3ec32940 100644 --- a/R/calc_regionSubset_sums.R +++ b/R/calc_regionSubset_sums.R @@ -9,7 +9,7 @@ #' @return A [`MAgPIE`][magclass::magclass] object. #' @author Michaja Pehl #' -#' @importFrom magclass mbind dimSums getItems<- +#' @importFrom magclass mbind getItems<- #' #' #' @examples diff --git a/R/readConsumption.R b/R/readConsumption.R index 2af52377..9c86633b 100644 --- a/R/readConsumption.R +++ b/R/readConsumption.R @@ -13,7 +13,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass mbind dimSums getNames<- +#' @importFrom magclass mbind getNames<- readConsumption <- function(gdx, field="l"){ tmp <- readGDX(gdx, name='vm_cons', field=field, format="first_found") diff --git a/R/readEmissions.R b/R/readEmissions.R index 84d3ebba..1781f477 100644 --- a/R/readEmissions.R +++ b/R/readEmissions.R @@ -19,7 +19,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass dimSums setNames getNames<- +#' @importFrom magclass setNames getNames<- readEmissions <- function(gdx,emiengregi,eminegregi){ if(!is.null(emiengregi)){ tmp1 <- readGDX(gdx, name = c("vm_emiTe","vm_emiengregi"), field="l", format="first_found")[ , , emiengregi] diff --git a/R/readFE.R b/R/readFE.R index 9a36505e..dea95283 100644 --- a/R/readFE.R +++ b/R/readFE.R @@ -12,7 +12,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass dimSums getNames<- +#' @importFrom magclass getNames<- readFE <- function(gdx){ fe <- readGDX(gdx,c("vm_prodFe","v_feprod"),field="l",restore_zeros = FALSE,react="silent") fe <- dimSums(fe,dim=3) diff --git a/R/reportCapacity.R b/R/reportCapacity.R index fd6680d9..e869ec74 100644 --- a/R/reportCapacity.R +++ b/R/reportCapacity.R @@ -21,7 +21,7 @@ #' @importFrom quitte calcCumulatedDiscount #' @export #' @importFrom gdx readGDX -#' @importFrom magclass mbind setNames dimSums getSets getSets<- as.magpie +#' @importFrom magclass mbind setNames getSets getSets<- as.magpie #' @importFrom dplyr %>% filter mutate reportCapacity <- function(gdx, regionSubsetList = NULL, t = c(seq(2005, 2060, 5), seq(2070, 2110, 10), 2130, 2150)) { diff --git a/R/reportCapitalStock.R b/R/reportCapitalStock.R index 2fbf2358..d39ceca7 100644 --- a/R/reportCapitalStock.R +++ b/R/reportCapitalStock.R @@ -20,7 +20,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass getYears mbind setNames dimSums +#' @importFrom magclass getYears mbind setNames #' @importFrom dplyr tribble reportCapitalStock <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)) { diff --git a/R/reportCosts.R b/R/reportCosts.R index d243456f..2b123387 100644 --- a/R/reportCosts.R +++ b/R/reportCosts.R @@ -21,7 +21,7 @@ #' #' @export #' @importFrom rlang .data -#' @importFrom magclass mbind getYears collapseNames dimSums setNames +#' @importFrom magclass mbind getYears collapseNames setNames #' @importFrom gdx readGDX #' @importFrom dplyr filter diff --git a/R/reportCrossVariables.R b/R/reportCrossVariables.R index bc32dd4d..393ddb56 100644 --- a/R/reportCrossVariables.R +++ b/R/reportCrossVariables.R @@ -20,7 +20,7 @@ #' @export #' @importFrom assertr assert not_na #' @importFrom gdx readGDX -#' @importFrom magclass getYears getRegions mbind setNames dimSums mselect +#' @importFrom magclass getYears getRegions mbind setNames mselect #' new.magpie setYears mcalc #' @importFrom luscale speed_aggregate #' @importFrom tibble as_tibble diff --git a/R/reportEmi.R b/R/reportEmi.R index d4526a1e..aea28ddb 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -20,7 +20,7 @@ #' #' @importFrom gdx readGDX #' @importFrom dplyr %>% filter full_join group_by inner_join left_join mutate rename select summarise -#' @importFrom magclass mselect dimSums mselect<- collapseDim getItems getRegions getYears +#' @importFrom magclass mselect mselect<- collapseDim getItems getRegions getYears #' @importFrom madrat toolAggregate #' @importFrom tibble as_tibble diff --git a/R/reportEmiAirPol.R b/R/reportEmiAirPol.R index 924ef7b7..b26d27df 100644 --- a/R/reportEmiAirPol.R +++ b/R/reportEmiAirPol.R @@ -1,17 +1,17 @@ -#' Read in GDX and calculate air pollution emissions, used in convGDX2MIF.R for +#' Read in GDX and calculate air pollution emissions, used in convGDX2MIF.R for #' the reporting -#' -#' Read in air pollution emission information from GDX file, information used in +#' +#' Read in air pollution emission information from GDX file, information used in #' convGDX2MIF.R for the reporting -#' -#' +#' +#' #' @param gdx a GDX object as created by readGDX, or the path to a gdx #' @param regionSubsetList a list containing regions to create report variables region #' aggregations. If NULL (default value) only the global region aggregation "GLO" will #' be created. #' @param t temporal resolution of the reporting, default: #' t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150) -#' +#' #' @return MAgPIE object - contains the emission variables #' @author Antoine Levesque, Jerome Hilaire #' @seealso \code{\link{convGDX2MIF}} @@ -20,18 +20,18 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass collapseNames dimSums getNames<- mbind setNames new.magpie getRegions getYears mbind dimSums setYears getItems<- +#' @importFrom magclass collapseNames getNames<- mbind setNames new.magpie getRegions getYears mbind setYears getItems<- reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)){ - # Get realisation name + # Get realisation name realisation <- readGDX(gdx, "module2realisation") realisation <- realisation[which(realisation[,1] == "aerosols"),2] - if(is.null(realisation)) realisation <- "postIIASA" # default value - + if(is.null(realisation)) realisation <- "postIIASA" # default value + ######### initialisation ########### tmp <- NULL out <- NULL - + #=================================================================== # If realisation is postIIASA... #=================================================================== @@ -42,7 +42,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 airpollutants_low <- c("so2","bc","oc","CO","VOC","NOx","NH3") generateReportingEmiAP <- function(pollutant){ - + pollutant_low <- tolower(pollutant) # Remove unecessary technological dimensions @@ -54,11 +54,11 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 mapping = data.frame( remind = c("power", "indst", "res", "trans", "indprocess", "solvents", "extraction"), reporting = c(paste0("Emi|", pollutant, "|Energy Supply|Electricity (Mt ", pollutant, "/yr)"), - paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), + paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), paste0("Emi|", pollutant, "|Energy Demand|Buildings (Mt ", pollutant, "/yr)"), paste0("Emi|", pollutant, "|Energy Demand|Transport|Ground Trans (Mt ", pollutant, "/yr)"), - paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), - paste0("Emi|", pollutant, "|Solvents (Mt ", pollutant, "/yr)"), + paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), + paste0("Emi|", pollutant, "|Solvents (Mt ", pollutant, "/yr)"), paste0("Emi|", pollutant, "|Energy Supply|Extraction (Mt ", pollutant, "/yr)"))) magclass::getNames(dataEndo) <- paste(sapply(magclass::getNames(dataEndo), function(x) mapping$reporting[mapping$remind == x])) @@ -66,7 +66,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 dataAll <- mbind(dataEndo[,,paste(mapping$reporting[which(!mapping$remind %in% c("indst","indprocess", "solvents","extraction"))])], dataExog[,,paste(mapping$reporting[which(!mapping$remind %in% c("power","indst","res","trans","indprocess"))])], - dataEndo[,,paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)")] + + dataEndo[,,paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)")] + dataExog[,,paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)")]) if (is.null(pm_limits_wp4_rcp_world)) { @@ -87,7 +87,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 setNames(pm_limits_wp4_rcp[,,paste(pollutant_low,"waste",sep= ".")], paste0("Emi|",pollutant,"|Waste (Mt ",pollutant,"/yr)"))) } else { - tmp1 <- + tmp1 <- mbind(dataAll, setNames(pm_limits_wp4_rcp[,,paste(pollutant_low,"internationalshipping",sep= ".")], paste0("Emi|",pollutant,"|Energy Demand|Transport|International Shipping (Mt ",pollutant,"/yr)")), @@ -118,7 +118,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 paste0("Emi|",pollutant,"|Energy Supply (Mt ",pollutant,"/yr)"))) # Aggregation: Energy Demand + Energy Supply, Land Use - tmp3 <- mbind(tmp2, + tmp3 <- mbind(tmp2, setNames(dimSums(tmp2[,,c(paste0("Emi|",pollutant,"|Energy Demand|Industry (Mt ",pollutant,"/yr)"), paste0("Emi|",pollutant,"|Energy Demand|Buildings (Mt ",pollutant,"/yr)"), paste0("Emi|",pollutant,"|Energy Demand|Transport (Mt ",pollutant,"/yr)"), @@ -148,7 +148,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 ####### conversion factors ########## pm_conv_TWa_EJ <- 31.536 conv_MtSO2_to_MtS <- 1/2 # 32/(32+2*16) - + ####### read in needed data ######### ## parameter @@ -161,7 +161,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 p11_emi_nh3_forest <- readGDX(gdx, name="p11_emi_nh3_forest", field="l") p11_emi_nh3_savannah <- readGDX(gdx, name="p11_emi_nh3_savannah", field="l") - + if (!is.null(pm_emiAP)) { ####### process data ######### @@ -264,21 +264,21 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 # DEBUG #gdx = "path_to_gdx_directory/fulldata.gdx" #mainfolder = "path_to_rd3_inputdata/" - + #require(moinput,quietly = TRUE) #setConfig(mainfolder = mainfolder) - + ######### initialisation ########### airpollutants <- c("SO2","BC","OC","CO","VOC","NOx","NH3") - + generateReportingEmiAP <- function(pollutant){ - + pollutant_low <- tolower(pollutant) - + # Remove unecessary technological dimensions dataEndo <- collapseNames(dimSums(p11_emi_postrun[,,pollutant_low], dim=c("all_enty","all_enty1","all_te"),na.rm=TRUE)) - if (!is.null(p11_emiAP_endu) & pollutant_low != "nh3") { + if (!is.null(p11_emiAP_endu) & pollutant_low != "nh3") { dataEndo <- dataEndo[,,"indst", pmatch=TRUE, invert=TRUE] dataEndo <- dataEndo[,,"res", pmatch=TRUE, invert=TRUE] @@ -287,7 +287,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 } dataExog <- collapseNames(pm_emiAP[,,pollutant_low]) - + # Apply emission base year calibration (if required) if (!is.null(pm_emi_calib)) { if (pollutant_low %in% c("nox", "co", "voc")) { @@ -309,7 +309,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 ship = pm_limits_wp4_rcp[,2005,paste0(pollutant_low,".internationalshipping")] air = pm_limits_wp4_rcp[,2005,paste0(pollutant_low,".aviation")] scalfac <- setNames(setYears((dimSums(pm_emi_calib[,2005,pollutant_low]) + ship + air )/(dimSums(dataEndo[,2005,]) + dimSums(dataExog[,2005,]) + ship + air), NULL), NULL) - # Multiply factor + # Multiply factor dataEndo[,,] = dataEndo[,,] * scalfac dataExog[,,] = dataExog[,,] * scalfac pm_limits_wp4_rcp[,,paste0(pollutant_low,".internationalshipping")] = pm_limits_wp4_rcp[,,paste0(pollutant_low,".internationalshipping")] * scalfac @@ -321,22 +321,22 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 mapping = data.frame( remind = c("power", "indst", "res", "trans", "indprocess", "solvents", "extraction"), reporting = c(paste0("Emi|", pollutant, "|Energy Supply|Electricity (Mt ", pollutant, "/yr)"), - paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), + paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), paste0("Emi|", pollutant, "|Energy Demand|Buildings (Mt ", pollutant, "/yr)"), paste0("Emi|", pollutant, "|Energy Demand|Transport|Ground Trans (Mt ", pollutant, "/yr)"), - paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), - paste0("Emi|", pollutant, "|Solvents (Mt ", pollutant, "/yr)"), + paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)"), + paste0("Emi|", pollutant, "|Solvents (Mt ", pollutant, "/yr)"), paste0("Emi|", pollutant, "|Energy Supply|Extraction (Mt ", pollutant, "/yr)"))) - + magclass::getNames(dataEndo) <- paste(sapply(magclass::getNames(dataEndo), function(x) mapping$reporting[mapping$remind == x])) magclass::getNames(dataExog) <- paste(sapply(magclass::getNames(dataExog), function(x) mapping$reporting[mapping$remind == x])) - + dataAll <- mbind(dataEndo[,,paste(mapping$reporting[which(!mapping$remind %in% c("indst","indprocess", "solvents","extraction"))])], dataExog[,,paste(mapping$reporting[which(!mapping$remind %in% c("power","indst","res","trans","indprocess"))])], - dataEndo[,,paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)")] + + dataEndo[,,paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)")] + dataExog[,,paste0("Emi|", pollutant, "|Energy Demand|Industry (Mt ", pollutant, "/yr)")]) - - tmp1 <- + + tmp1 <- mbind(dataAll, setNames(pm_limits_wp4_rcp[,,paste(pollutant_low,"internationalshipping",sep= ".")], paste0("Emi|",pollutant,"|Energy Demand|Transport|International Shipping (Mt ",pollutant,"/yr)")), @@ -352,7 +352,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 paste0("Emi|",pollutant,"|Land Use|Savannah Burning (Mt ",pollutant,"/yr)")), setNames(pm_limits_wp4_rcp[,,paste(pollutant_low,"waste",sep= ".")], paste0("Emi|",pollutant,"|Waste (Mt ",pollutant,"/yr)"))) - + # Aggregation: Transport and Energy Supply tmp2 <- mbind(tmp1, setNames(dimSums(tmp1[,, @@ -365,9 +365,9 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 paste0("Emi|",pollutant,"|Energy Supply|Extraction (Mt ",pollutant,"/yr)"))],dim = 3), paste0("Emi|",pollutant,"|Energy Supply (Mt ",pollutant,"/yr)")) ) - + # Aggregation: Energy Demand + Energy Supply, Land Use - tmp3 <- mbind(tmp2, + tmp3 <- mbind(tmp2, setNames(dimSums(tmp2[,,c(paste0("Emi|",pollutant,"|Energy Demand|Industry (Mt ",pollutant,"/yr)"), paste0("Emi|",pollutant,"|Energy Demand|Buildings (Mt ",pollutant,"/yr)"), paste0("Emi|",pollutant,"|Energy Demand|Transport (Mt ",pollutant,"/yr)"), @@ -378,7 +378,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 paste0("Emi|",pollutant,"|Land Use|Agriculture (Mt ",pollutant,"/yr)"), paste0("Emi|",pollutant,"|Land Use|Agricultural Waste Burning (Mt ",pollutant,"/yr)"))],dim = 3), paste0("Emi|",pollutant,"|Land Use (Mt ",pollutant,"/yr)"))) - + # Compute total tmp4 <- mbind(tmp3, setNames(dimSums(tmp3[,,c(paste0("Emi|",pollutant,"|Energy Supply and Demand (Mt ",pollutant,"/yr)"), @@ -386,18 +386,18 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 paste0("Emi|",pollutant,"|Land Use (Mt ",pollutant,"/yr)"), paste0("Emi|",pollutant,"|Waste (Mt ",pollutant,"/yr)"))],dim=3), paste0("Emi|",pollutant," (Mt ",pollutant,"/yr)"))) - + # Set NAs to 0 tmp4[is.na(tmp4)] <- 0 - + return(tmp4) - } - + } + ####### conversion factors ########## pm_conv_TWa_EJ <- 31.536 conv_MtSO2_to_MtS <- 1/2 # 32/(32+2*16) - - + + ####### read in needed data ######### ## parameter p11_emi_postrun <- readGDX(gdx, name=c("pm_emi_postrun","p11_emi_postrun"), field="l", format="first_found",restore_zeros = FALSE) @@ -410,7 +410,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 p11_emi_nh3_forest <- readGDX(gdx, name="p11_emi_nh3_forest", field="l") p11_emi_nh3_savannah <- readGDX(gdx, name="p11_emi_nh3_savannah", field="l") pm_emi_calib <- readGDX(gdx, name=c("pm_APemi_calib","pm_emi_calib_ceds"), format="first_found") - + if (!is.null(pm_emiAP)) { ####### process data ######### magclass::getNames(p11_emi_postrun) <- tolower(magclass::getNames(p11_emi_postrun)) @@ -418,13 +418,13 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 magclass::getNames(pm_limits_wp4_rcp_world) <- tolower(magclass::getNames(pm_limits_wp4_rcp_world)) magclass::getNames(pm_emiAP) <- tolower(magclass::getNames(pm_emiAP)) magclass::getNames(p11_emiAP_endu) <- tolower(magclass::getNames(p11_emiAP_endu)) - magclass::getNames(pm_emi_calib) <- tolower(magclass::getNames(pm_emi_calib)) + magclass::getNames(pm_emi_calib) <- tolower(magclass::getNames(pm_emi_calib)) p11_emi_postrun[,,"so2"] <- 1/conv_MtSO2_to_MtS * p11_emi_postrun[,,"so2"] pm_limits_wp4_rcp[,,"so2"] <- 1/conv_MtSO2_to_MtS * pm_limits_wp4_rcp[,,"so2"] pm_limits_wp4_rcp_world[,,"so2"] <- 1/conv_MtSO2_to_MtS * pm_limits_wp4_rcp_world[,,"so2"] pm_emiAP[,,"so2"] <- 1/conv_MtSO2_to_MtS * pm_emiAP[,,"so2"] - p11_emiAP_endu[,,"so2"] <- 1/conv_MtSO2_to_MtS * p11_emiAP_endu[,,"so2"] + p11_emiAP_endu[,,"so2"] <- 1/conv_MtSO2_to_MtS * p11_emiAP_endu[,,"so2"] pm_emi_calib[,,"so2"] <- 1/conv_MtSO2_to_MtS * pm_emi_calib[,,"so2"] if (is.null(pm_limits_wp4_rcp_world)) { @@ -449,26 +449,26 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 magclass::getNames(p11_emi_nh3_savannah) <- "nh3.grasslandburning" p_emi_nh3_others = new.magpie(cells_and_regions = getRegions(p11_emi_nh3_savannah), years = getYears(p11_emi_nh3_savannah), names = c("nh3.waste", "nh3.internationalshipping", "nh3.aviation"), fill=0.0) p_emi_nh3 = mbind(p11_emi_nh3_agwaste, p11_emi_nh3_ag, p11_emi_nh3_forest, p11_emi_nh3_savannah, p_emi_nh3_others) - + ####### calculate minimal temporal and spatial resolutions ##### getItems(pm_limits_wp4_rcp, dim = 1) <- toupper(getRegions(pm_limits_wp4_rcp)) y <- Reduce(intersect,list(getYears(p11_emi_postrun), getYears(pm_limits_wp4_rcp), getYears(pm_emiAP), getYears(p11_emiAP_endu))) r <- Reduce(intersect,list(getRegions(p11_emi_postrun),getRegions(pm_limits_wp4_rcp), getRegions(pm_emiAP), getRegions(p11_emiAP_endu))) p11_emi_postrun <- p11_emi_postrun[r,y,] pm_limits_wp4_rcp <- pm_limits_wp4_rcp[r,y,] - pm_limits_wp4_rcp_world <- pm_limits_wp4_rcp_world[,y,] + pm_limits_wp4_rcp_world <- pm_limits_wp4_rcp_world[,y,] pm_emiAP <- pm_emiAP[r,y,] p11_emiAP_endu <- p11_emiAP_endu[r,y,] p_emi_nh3 <- p_emi_nh3[r,y,] pm_limits_wp4_rcp = mbind(pm_limits_wp4_rcp, p_emi_nh3) - - + + ####### calculate reporting parameters ############ # Loop over air pollutants and call reporting generating function out <- do.call("mbind", lapply(airpollutants, generateReportingEmiAP)) - + # Add global values out <- mbind(out, dimSums(out,dim=1)) @@ -481,7 +481,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 out["GLO",,paste0("Emi|",pollutant,"|Energy Demand|Transport|Aviation (Mt ",pollutant,"/yr)")] <- pm_limits_wp4_rcp_world["GLO",,paste(pollutant_low,"aviation",sep= ".")] out["GLO",,paste0("Emi|",pollutant,"|Energy Demand|Transport (Mt ",pollutant,"/yr)")] <- out["GLO",,paste0("Emi|",pollutant,"|Energy Demand|Transport (Mt ",pollutant,"/yr)")] + - out["GLO",,paste0("Emi|",pollutant,"|Energy Demand|Transport|International Shipping (Mt ",pollutant,"/yr)")] + + out["GLO",,paste0("Emi|",pollutant,"|Energy Demand|Transport|International Shipping (Mt ",pollutant,"/yr)")] + out["GLO",,paste0("Emi|",pollutant,"|Energy Demand|Transport|Aviation (Mt ",pollutant,"/yr)")] out["GLO",,paste0("Emi|",pollutant,"|Energy Supply and Demand (Mt ",pollutant,"/yr)")] <- out["GLO",,paste0("Emi|",pollutant,"|Energy Supply and Demand (Mt ",pollutant,"/yr)")] + @@ -502,51 +502,51 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 } else if (realisation == "exoGAINS") { ######### initialisation ########### airpollutants <- c("so2","bc","oc","CO","VOC","NOx","NH3") - + ######### internal function ########### generateReportingEmiAirPol <- function(pollutant,i_emiAPexsolve=pm_emiAPexsolve,i_emiAPexo=pm_emiAPexo){ poll_rep <- toupper(pollutant) tmp <- NULL - + # reduce to the pollutant emiAPexsolve <- collapseNames(i_emiAPexsolve[,,pollutant]) emiAPexo <- collapseNames(i_emiAPexo[,,pollutant]) getSets(emiAPexo) <- getSets(emiAPexsolve) - + # add indprocess to indst emiAPexsolve[,,"indst"] <- emiAPexsolve[,,"indst"] + emiAPexsolve[,,"indprocess"] - + # Replace REMIND sector names by reporting ones mapping = data.frame( remind = c("power", "indst", "res", "trans", "solvents", "extraction"), reporting = c(paste0("Emi|", poll_rep, "|Energy Supply|Electricity (Mt ", poll_rep, "/yr)"), - paste0("Emi|", poll_rep, "|Energy Demand|Industry (Mt ", poll_rep, "/yr)"), + paste0("Emi|", poll_rep, "|Energy Demand|Industry (Mt ", poll_rep, "/yr)"), paste0("Emi|", poll_rep, "|Energy Demand|Buildings (Mt ", poll_rep, "/yr)"), paste0("Emi|", poll_rep, "|Energy Demand|Transport|Ground Trans (Mt ", poll_rep, "/yr)"), - paste0("Emi|", poll_rep, "|Solvents (Mt ", poll_rep, "/yr)"), + paste0("Emi|", poll_rep, "|Solvents (Mt ", poll_rep, "/yr)"), paste0("Emi|", poll_rep, "|Energy Supply|Extraction (Mt ", poll_rep, "/yr)"))) - - emiAPexsolve <- setNames(emiAPexsolve[,,mapping$remind],as.character(mapping$reporting)) - - tmp <- + + emiAPexsolve <- setNames(emiAPexsolve[,,mapping$remind],as.character(mapping$reporting)) + + tmp <- mbind(emiAPexsolve, setNames(emiAPexo[,,"AgWasteBurning"], paste0("Emi|",poll_rep,"|Land Use|Agricultural Waste Burning (Mt ",poll_rep,"/yr)")), setNames(emiAPexo[,,"Agriculture"], paste0("Emi|",poll_rep,"|Land Use|Agriculture (Mt ",poll_rep,"/yr)")), setNames(emiAPexo[,,"ForestBurning"], paste0("Emi|",poll_rep,"|Land Use|Forest Burning (Mt ",poll_rep,"/yr)")), setNames(emiAPexo[,,"GrasslandBurning"],paste0("Emi|",poll_rep,"|Land Use|Savannah Burning (Mt ",poll_rep,"/yr)")), setNames(emiAPexo[,,"Waste"], paste0("Emi|",poll_rep,"|Waste (Mt ",poll_rep,"/yr)"))) - - + + # Set NAs to 0 tmp[is.na(tmp)] <- 0 - + return(tmp) } - + ####### conversion factors ########## pm_conv_TWa_EJ <- 31.536 conv_MtSO2_to_MtS <- 1/2 # 32/(32+2*16) - + ####### read in needed data ######### ## sets ttot <- as.numeric(readGDX(gdx, name=c("ttot"), format="first_found")) @@ -554,21 +554,21 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 pm_emiAPexsolve <- readGDX(gdx, name=c("pm_emiAPexsolve"), field="l", format="first_found")[,ttot,] pm_emiAPexo <- readGDX(gdx, name=c("pm_emiAPexo"), field="l", format="first_found")[,ttot,airpollutants] pm_emiAPexoGlob <- readGDX(gdx, name=c("pm_emiAPexoGlob"), field="l", format="first_found")[,ttot,airpollutants] - + ####### prepare parameter ######################## magclass::getNames(pm_emiAPexsolve) <- gsub("SOx","so2",magclass::getNames(pm_emiAPexsolve)) magclass::getNames(pm_emiAPexsolve) <- gsub("NMVOC","VOC",magclass::getNames(pm_emiAPexsolve)) - + ####### calculate reporting parameters ############ # Loop over air pollutants and call reporting generating function out <- do.call("mbind", lapply(airpollutants, generateReportingEmiAirPol)) - + # Add global values out <- mbind(out, dimSums(out,dim=1)) # add other region aggregations if (!is.null(regionSubsetList)) out <- mbind(out, calc_regionSubset_sums(out, regionSubsetList)) - + # Loop over air pollutants and add some variables for (pollutant in airpollutants) { poll_rep <- toupper(pollutant) @@ -593,7 +593,7 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 paste0("Emi|",poll_rep,"|Energy Supply (Mt ",poll_rep,"/yr)")) ) # Aggregation: Energy Demand + Energy Supply, Land Use - out <- mbind(out, + out <- mbind(out, setNames(dimSums(out[,,c(paste0("Emi|",poll_rep,"|Energy Demand|Industry (Mt ",poll_rep,"/yr)"), paste0("Emi|",poll_rep,"|Energy Demand|Buildings (Mt ",poll_rep,"/yr)"), paste0("Emi|",poll_rep,"|Energy Demand|Transport (Mt ",poll_rep,"/yr)"), @@ -614,9 +614,9 @@ reportEmiAirPol <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2 paste0("Emi|",poll_rep," (Mt ",poll_rep,"/yr)")) ) } - - } else {stop("not allowed AP-realization")} + + } else {stop("not allowed AP-realization")} getSets(out)[3] <- "variable" return(out) diff --git a/R/reportEnergyInvestment.R b/R/reportEnergyInvestment.R index 82daeb9c..ae67c78c 100644 --- a/R/reportEnergyInvestment.R +++ b/R/reportEnergyInvestment.R @@ -20,7 +20,7 @@ #' } #' #' @export -#' @importFrom magclass dimSums mbind +#' @importFrom magclass mbind #' @importFrom gdx readGDX reportEnergyInvestment <- function(gdx, regionSubsetList = NULL, t = c(seq(2005, 2060, 5), seq(2070, 2110, 10), 2130, 2150)) { diff --git a/R/reportExtraction.R b/R/reportExtraction.R index 56a35f3b..7999aadd 100644 --- a/R/reportExtraction.R +++ b/R/reportExtraction.R @@ -17,7 +17,7 @@ #' @importFrom quitte calcCumulatedDiscount #' @export #' @importFrom gdx readGDX -#' @importFrom magclass mbind dimSums mselect getRegions new.magpie getYears<- getYears setNames getSets getSets<- as.magpie +#' @importFrom magclass mbind mselect getRegions new.magpie getYears<- getYears setNames getSets getSets<- as.magpie #' @importFrom dplyr %>% filter mutate #' @importFrom tidyr extract diff --git a/R/reportFE.R b/R/reportFE.R index 6fe40c59..e49c6167 100644 --- a/R/reportFE.R +++ b/R/reportFE.R @@ -20,7 +20,7 @@ #' @export #' @importFrom gdx readGDX #' @importFrom magclass new.magpie mselect getRegions getYears mbind setNames -#' dimSums getNames<- as.data.frame as.magpie getSets +#' getNames<- as.data.frame as.magpie getSets #' @importFrom dplyr %>% filter full_join group_by left_join mutate rename #' select semi_join summarise ungroup #' @importFrom quitte inline.data.frame revalue.levels diff --git a/R/reportLCOE.R b/R/reportLCOE.R index 48f6b7e6..ef40fc2b 100644 --- a/R/reportLCOE.R +++ b/R/reportLCOE.R @@ -24,7 +24,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass new.magpie dimSums getRegions getYears getNames setNames clean_magpie dimReduce as.magpie magpie_expand +#' @importFrom magclass new.magpie getRegions getYears getNames setNames clean_magpie dimReduce as.magpie magpie_expand #' @importFrom dplyr %>% mutate select rename group_by ungroup right_join filter full_join arrange summarise #' @importFrom quitte as.quitte overwrite getRegs getPeriods #' @importFrom tidyr spread gather expand fill diff --git a/R/reportMOFEX.R b/R/reportMOFEX.R index ce5f3dcd..19c29cd7 100644 --- a/R/reportMOFEX.R +++ b/R/reportMOFEX.R @@ -14,7 +14,7 @@ #' #' @export #' @importFrom rlang .data -#' @importFrom magclass mbind getYears collapseNames dimSums setNames mselect as.magpie write.report +#' @importFrom magclass mbind getYears collapseNames setNames mselect as.magpie write.report #' @importFrom gdx readGDX #' @importFrom dplyr filter #' @importFrom ggplot2 ggplot aes labs geom_area geom_line geom_col scale_fill_brewer facet_grid theme_minimal diff --git a/R/reportMacroEconomy.R b/R/reportMacroEconomy.R index da9f70c9..aeb72133 100644 --- a/R/reportMacroEconomy.R +++ b/R/reportMacroEconomy.R @@ -20,7 +20,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass setNames mbind getYears dimSums new.magpie getRegions setYears +#' @importFrom magclass setNames mbind getYears new.magpie getRegions setYears reportMacroEconomy <- function(gdx, regionSubsetList = NULL, t = c(seq(2005, 2060, 5), seq(2070, 2110, 10), 2130, 2150)) { diff --git a/R/reportPE.R b/R/reportPE.R index e098e453..ab861f30 100644 --- a/R/reportPE.R +++ b/R/reportPE.R @@ -19,7 +19,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass mselect getYears dimSums getNames<- mbind setNames +#' @importFrom magclass mselect getYears getNames<- mbind setNames reportPE <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)){ ####### conversion factors ########## diff --git a/R/reportPolicyCosts.R b/R/reportPolicyCosts.R index 24028e46..4985f929 100644 --- a/R/reportPolicyCosts.R +++ b/R/reportPolicyCosts.R @@ -19,7 +19,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass getYears mbind dimSums setNames +#' @importFrom magclass getYears mbind setNames reportPolicyCosts <- function(gdx,gdx_ref,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)){ ####### read in needed data ######### ## sets diff --git a/R/reportPrices.R b/R/reportPrices.R index 2f3fbfb5..459aba6b 100644 --- a/R/reportPrices.R +++ b/R/reportPrices.R @@ -24,7 +24,7 @@ #' @importFrom luscale speed_aggregate #' @importFrom dplyr %>% case_when distinct filter inner_join tibble left_join rename #' @importFrom gdx readGDX -#' @importFrom magclass mbind getYears getRegions setNames dimExists dimSums new.magpie lowpass complete_magpie getItems<- getNames +#' @importFrom magclass mbind getYears getRegions setNames dimExists new.magpie lowpass complete_magpie getItems<- getNames #' @importFrom quitte df.2.named.vector getColValues #' @importFrom readr read_csv #' @importFrom madrat toolAggregate diff --git a/R/reportSE.R b/R/reportSE.R index 154d6683..a4414b84 100644 --- a/R/reportSE.R +++ b/R/reportSE.R @@ -20,7 +20,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass mselect getSets getSets<- getYears dimSums getNames<- mbind +#' @importFrom magclass mselect getSets getSets<- getYears getNames<- mbind #' @importFrom abind abind #' @importFrom rlang sym diff --git a/R/reportTax.R b/R/reportTax.R index a9396d90..9f119320 100644 --- a/R/reportTax.R +++ b/R/reportTax.R @@ -19,7 +19,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass mbind getYears getNames setNames dimSums setItems +#' @importFrom magclass mbind getYears getNames setNames setItems reportTax <- function(gdx,output=NULL,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)){ # old tax reporting was deleted, stop if old tax reporting would be needed diff --git a/R/reportTrade.R b/R/reportTrade.R index 17e8d156..b8863069 100644 --- a/R/reportTrade.R +++ b/R/reportTrade.R @@ -20,7 +20,7 @@ #' #' @export #' @importFrom gdx readGDX -#' @importFrom magclass getYears setNames mbind dimSums +#' @importFrom magclass getYears setNames mbind reportTrade <- function(gdx,regionSubsetList=NULL,t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)) { From e9d0e585254fa065dc1a61c2b4ca798db1bc9792 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Mon, 19 Feb 2024 11:36:44 +0100 Subject: [PATCH 2/2] lucode hubbub --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 104dde8b..a250fe3d 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '224378150' +ValidationKey: '224431972' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 148fa1cc..53818310 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'remind2: The REMIND R package (2nd generation)' -version: 1.135.0 -date-released: '2024-02-16' +version: 1.135.1 +date-released: '2024-02-19' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 16b6c16d..f9fac0ee 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.135.0 -Date: 2024-02-16 +Version: 1.135.1 +Date: 2024-02-19 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/README.md b/README.md index c78af3df..1f439d99 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.135.0** +R package **remind2**, version **1.135.1** [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds) @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.135.1, . A BibTeX entry for LaTeX users is @@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann}, year = {2024}, - note = {R package version 1.135.0}, + note = {R package version 1.135.1}, url = {https://github.com/pik-piam/remind2}, } ```