diff --git a/.buildlibrary b/.buildlibrary index 569b4c1f..5b3e6b16 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,8 +1,10 @@ -ValidationKey: '11333779' +ValidationKey: '11715040' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' -AcceptedNotes: unable to verify current time +AcceptedNotes: +- unable to verify current time +- Depends: includes the non-default packages AutocreateReadme: yes allowLinterWarnings: no enforceVersionUpdate: no diff --git a/CITATION.cff b/CITATION.cff index 7708658b..6e0da49b 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: 'mrland: MadRaT land data package' -version: 0.57.1 -date-released: '2024-05-06' +version: 0.59.0 +date-released: '2024-05-13' abstract: The package provides land related data via the madrat framework. authors: - family-names: Dietrich @@ -37,6 +37,8 @@ authors: given-names: Felicitas - family-names: Hoetten given-names: David +- family-names: Sauer + given-names: Pascal license: LGPL-3.0 repository-code: https://github.com/pik-piam/mrland doi: 10.5281/zenodo.3822083 diff --git a/DESCRIPTION b/DESCRIPTION index 75dceeeb..53042498 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrland Title: MadRaT land data package -Version: 0.57.1 -Date: 2024-05-06 +Version: 0.59.0 +Date: 2024-05-13 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Abhijeet", "Mishra", role = "aut"), @@ -18,7 +18,8 @@ Authors@R: c( person("Patrick", "von Jeetze", role = "aut"), person("Stephen", "Wirth", role = "aut"), person("Felicitas", "Beier", role = "aut"), - person("David", "Hoetten", role = "aut") + person("David", "Hoetten", role = "aut"), + person("Pascal", "Sauer", role = "aut") ) Description: The package provides land related data via the madrat framework. @@ -27,24 +28,25 @@ URL: https://github.com/pik-piam/mrland, https://doi.org/10.5281/zenodo.3822083 BugReports: https://github.com/pik-piam/mrland/issues Depends: - R (>= 2.10.0), madrat (>= 1.30), magclass (>= 6.13.1), - mrdrivers (>= 1.0.0), - mrcommons (>= 1.37.0), - mrfactors + mrcommons (>= 1.41.0), + mrfactors (>= 0.4.0), + mrfaocore (>= 1.0.0), + mrlandcore (>= 1.0.0), + R (>= 2.10.0) Imports: - GDPuc, - SPEI, countrycode, data.table, dplyr, + GDPuc, magpiesets, - mstools, + mstools (>= 0.6.0), ncdf4, raster, readxl, reshape2, + SPEI, stringr, terra, withr diff --git a/NAMESPACE b/NAMESPACE index a798ccac..e3e84810 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -25,8 +25,9 @@ import(countrycode) import(madrat) import(magclass) import(mrcommons) -import(mrdrivers) import(mrfactors) +import(mrfaocore) +import(mrlandcore) import(readxl) import(utils) importFrom(GDPuc,convertGDP) @@ -87,14 +88,16 @@ importFrom(magclass,unwrap) importFrom(magclass,where) importFrom(magpiesets,addLocation) importFrom(magpiesets,findset) -importFrom(mrcommons,toolAggregateCell2Country) -importFrom(mrcommons,toolCoord2Isocell) -importFrom(mrcommons,toolGetMappingCoord2Country) -importFrom(mrcommons,toolHarmonize2Baseline) -importFrom(mrcommons,toolHoldConstantBeyondEnd) -importFrom(mrcommons,toolLPJmLVersion) -importFrom(mrcommons,toolSmooth) +importFrom(mrlandcore,toolLPJmLVersion) +importFrom(mstools,toolAggregateCell2Country) +importFrom(mstools,toolCell2isoCell) +importFrom(mstools,toolCoord2Isocell) +importFrom(mstools,toolCountryFillBilateral) +importFrom(mstools,toolGetMappingCoord2Country) +importFrom(mstools,toolHarmonize2Baseline) importFrom(mstools,toolHoldConstant) +importFrom(mstools,toolHoldConstantBeyondEnd) +importFrom(mstools,toolSmooth) importFrom(ncdf4,nc_open) importFrom(raster,aggregate) importFrom(raster,brick) diff --git a/R/SOMexogenous.R b/R/SOMexogenous.R index f6ce27a5..f4151a2d 100644 --- a/R/SOMexogenous.R +++ b/R/SOMexogenous.R @@ -1,34 +1,33 @@ #' @title calcSOMexogenous -#' @description +#' @description #' Uses an exogenous trajectory of Soil organic matter loss nitrogen release #' @return List of magpie objects with results on country level, weight on country level, unit and description. -#' +#' #' @author Benjamin Leon Bodirsky #' @seealso \code{\link{calcOutput}} #' @examples -#' -#' \dontrun{ +#' \dontrun{ #' calcOutput("SOMexogenous") #' } #' @export -#' @importFrom mrcommons toolHoldConstantBeyondEnd +#' @importFrom mstools toolHoldConstantBeyondEnd #' @importFrom magpiesets findset -calcSOMexogenous <- function(){ - - input <- calcOutput("SOMlossN",cellular=FALSE,aggregate = F) +calcSOMexogenous <- function() { + + input <- calcOutput("SOMlossN", cellular = FALSE, aggregate = FALSE) constant <- toolHoldConstantBeyondEnd(collapseNames(input)) - getNames(constant)="constant" - fadeout_2050 = constant - fadeout_2050 = convergence(origin = constant,aim = 0,start_year = "y2020",end_year = "y2050", type="linear") - getNames(fadeout_2050)="fadeout_2050" - x <- mbind(constant,fadeout_2050) - - x <- x[,findset("time"),] - - return(list(x=x, - weight=NULL, - unit="Tg Nr/yr", - description="Nr release through soil organic matter loss") + getNames(constant) <- "constant" + fadeout2050 <- constant + fadeout2050 <- convergence(origin = constant, aim = 0, start_year = "y2020", end_year = "y2050", type = "linear") + getNames(fadeout2050) <- "fadeout_2050" + x <- mbind(constant, fadeout2050) + + x <- x[, findset("time"), ] + + return(list(x = x, + weight = NULL, + unit = "Tg Nr/yr", + description = "Nr release through soil organic matter loss") ) } diff --git a/R/calcAvlCropland.R b/R/calcAvlCropland.R index a8876896..e132c862 100644 --- a/R/calcAvlCropland.R +++ b/R/calcAvlCropland.R @@ -44,7 +44,7 @@ #' @importFrom madrat readSource calcOutput #' @importFrom magclass dimSums getCells getYears getNames mbind collapseDim as.magpie #' @importFrom magpiesets addLocation -#' @importFrom mrcommons toolCoord2Isocell toolAggregateCell2Country +#' @importFrom mstools toolCoord2Isocell toolAggregateCell2Country #' calcAvlCropland <- function(marginal_land = "magpie", cell_upper_bound = 0.9, country_level = FALSE, # nolint diff --git a/R/calcBHIFL.R b/R/calcBHIFL.R index 0de526be..f47a20ed 100644 --- a/R/calcBHIFL.R +++ b/R/calcBHIFL.R @@ -21,11 +21,10 @@ #' #' @importFrom magpiesets findset addLocation #' @importFrom magclass collapseDim -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcBHIFL <- function(cells = "lpjcell", nclasses = "seven") { - # Land area (in Mha): iniLU <- calcOutput("LanduseInitialisation", cellular = TRUE, cells = cells, @@ -86,7 +85,7 @@ calcBHIFL <- function(cells = "lpjcell", nclasses = "seven") { # Conservation potential after 2020 consvPot <- landArea - dimSums(wdpaBase[, "y2020", ], dim = 3) - - setCells(urbanLand[, "y2020", "SSP2"], getCells(wdpaBase)) + setCells(urbanLand[, "y2020", "SSP2"], getCells(wdpaBase)) consvPot <- toolConditionalReplace(consvPot, "<0", 0) # Where conservation priority area is larger than conservation potential @@ -100,7 +99,7 @@ calcBHIFL <- function(cells = "lpjcell", nclasses = "seven") { if (nclasses == "seven") { # calulate share of respective natveg classes natvegShr <- iniLU[, , c("primforest", "secdforest", "other")] / - dimSums(iniLU[, , c("primforest", "secdforest", "other")], dim = 3) + dimSums(iniLU[, , c("primforest", "secdforest", "other")], dim = 3) natvegShr <- toolConditionalReplace(natvegShr, "is.na()", 0) # magpie object containing all land classes and their conservation land shares @@ -113,7 +112,7 @@ calcBHIFL <- function(cells = "lpjcell", nclasses = "seven") { } else if (nclasses == "nine") { # calulate share of respective natveg classes natvegShr <- iniLU[, , c("primforest", "secdforest", "primother", "secdother")] / - dimSums(iniLU[, , c("primforest", "secdforest", "primother", "secdother")], dim = 3) + dimSums(iniLU[, , c("primforest", "secdforest", "primother", "secdother")], dim = 3) natvegShr <- toolConditionalReplace(natvegShr, "is.na()", 0) # magpie object containing all land classes and their conservation land shares diff --git a/R/calcBrooks2005OldConservationPrios.R b/R/calcBrooks2005OldConservationPrios.R index 220996f0..a08965dd 100644 --- a/R/calcBrooks2005OldConservationPrios.R +++ b/R/calcBrooks2005OldConservationPrios.R @@ -21,11 +21,10 @@ #' #' @importFrom magpiesets findset addLocation #' @importFrom magclass collapseDim -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcBrooks2005OldConservationPrios <- function(cells = "lpjcell", nclasses = "seven") { - # Land area (in Mha): iniLU <- calcOutput("LanduseInitialisation", cellular = TRUE, cells = cells, @@ -99,7 +98,7 @@ calcBrooks2005OldConservationPrios <- function(cells = "lpjcell", nclasses = "se # Conservation potential after 2020 consvPot <- landArea - dimSums(wdpaBase[, "y2020", ], dim = 3) - - setCells(urbanLand[, "y2020", "SSP2"], getCells(wdpaBase)) + setCells(urbanLand[, "y2020", "SSP2"], getCells(wdpaBase)) consvPot <- toolConditionalReplace(consvPot, "<0", 0) # Where conservation priority area is larger than conservation potential @@ -113,7 +112,7 @@ calcBrooks2005OldConservationPrios <- function(cells = "lpjcell", nclasses = "se if (nclasses == "seven") { # calulate share of respective natveg classes natvegShr <- iniLU[, , c("primforest", "secdforest", "other")] / - dimSums(iniLU[, , c("primforest", "secdforest", "other")], dim = 3) + dimSums(iniLU[, , c("primforest", "secdforest", "other")], dim = 3) natvegShr <- toolConditionalReplace(natvegShr, "is.na()", 0) # magpie object containing all land classes and their conservation land shares @@ -126,7 +125,7 @@ calcBrooks2005OldConservationPrios <- function(cells = "lpjcell", nclasses = "se } else if (nclasses == "nine") { # calulate share of respective natveg classes natvegShr <- iniLU[, , c("primforest", "secdforest", "primother", "secdother")] / - dimSums(iniLU[, , c("primforest", "secdforest", "primother", "secdother")], dim = 3) + dimSums(iniLU[, , c("primforest", "secdforest", "primother", "secdother")], dim = 3) natvegShr <- toolConditionalReplace(natvegShr, "is.na()", 0) # magpie object containing all land classes and their conservation land shares diff --git a/R/calcConservationPriorities.R b/R/calcConservationPriorities.R index 0885d3d9..3b442bf1 100644 --- a/R/calcConservationPriorities.R +++ b/R/calcConservationPriorities.R @@ -28,11 +28,10 @@ #' #' @importFrom magpiesets findset addLocation #' @importFrom magclass collapseDim -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcConservationPriorities <- function(consvBaseYear = "y1750", cells = "lpjcell", nclasses = "seven") { - # =============================== # Get conservation templates # =============================== @@ -270,8 +269,8 @@ calcConservationPriorities <- function(consvBaseYear = "y1750", cells = "lpjcell weight = NULL, unit = "Mha", description = paste0("Land conservation priority targets in each land type. ", - "Land use in conservation priority areas is based on the ", - "reference year ", consvBaseYear, - ifelse(gsub("y", "", consvBaseYear) <= 1800, " (pre-industrial)", "")), + "Land use in conservation priority areas is based on the ", + "reference year ", consvBaseYear, + ifelse(gsub("y", "", consvBaseYear) <= 1800, " (pre-industrial)", "")), isocountries = FALSE)) } diff --git a/R/calcCriticalConnectivityAreas.R b/R/calcCriticalConnectivityAreas.R index 01671ff0..403a2243 100644 --- a/R/calcCriticalConnectivityAreas.R +++ b/R/calcCriticalConnectivityAreas.R @@ -27,14 +27,14 @@ #' calcOutput("calcCriticalConnectivityAreas", aggregate = FALSE) #' } #' -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcCriticalConnectivityAreas <- function(maginput = TRUE, nclasses = "seven", cells = "lpjcell", mask = "KBA_GSN") { if (mask == "KBA") { - cca <- readSource("Brennan2022", subtype = "KBA_masked", convert = "onlycorrect") + cca <- readSource("Brennan2022", subtype = "KBA_masked", convert = "onlycorrect") } else if (mask == "KBA_GSN") { - cca <- readSource("Brennan2022", subtype = "KBA_GSN_masked", convert = "onlycorrect") + cca <- readSource("Brennan2022", subtype = "KBA_GSN_masked", convert = "onlycorrect") } else { stop("Option specified for argument 'mask' does not exist.") } @@ -68,7 +68,6 @@ calcCriticalConnectivityAreas <- function(maginput = TRUE, nclasses = "seven", cca[, , "CCA"] <- cca[, , "CCA"] * landMismatch[, , "CCA"] if (nclasses %in% c("seven", "nine")) { - # differentiate primary and secondary forest based on LUH2v2 data totForestLUH <- dimSums(luh2v2[, , c("primf", "secdf")], dim = 3) # nolint primforestShr <- luh2v2[, , "primf"] / setNames(totForestLUH + 1e-10, NULL) @@ -94,7 +93,6 @@ calcCriticalConnectivityAreas <- function(maginput = TRUE, nclasses = "seven", } if (nclasses == "nine") { - # separate pasture into pasture and rangeland totGrassLUH <- dimSums(luh2v2[, , c("pastr", "range")], dim = 3) # nolint pastShr <- luh2v2[, , "pastr"] / setNames(totGrassLUH + 1e-10, NULL) diff --git a/R/calcCroplandTreecover.R b/R/calcCroplandTreecover.R index 679d3559..88af601f 100644 --- a/R/calcCroplandTreecover.R +++ b/R/calcCroplandTreecover.R @@ -16,7 +16,7 @@ #' calcOutput("CroplandTreecover", aggregate = FALSE) #' } #' -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcCroplandTreecover <- function(maginput = TRUE, cells = "magpiecell") { treecover <- readSource("Copernicus", subtype = "CroplandTreecover", convert = "onlycorrect") diff --git a/R/calcGlobalSafetyNet.R b/R/calcGlobalSafetyNet.R index e423342c..80e7fdeb 100644 --- a/R/calcGlobalSafetyNet.R +++ b/R/calcGlobalSafetyNet.R @@ -24,7 +24,7 @@ #' calcOutput("calcGlobalSafetyNet", aggregate = FALSE) #' } #' -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcGlobalSafetyNet <- function(maginput = TRUE, nclasses = "seven", cells = "lpjcell") { gsn <- mbind( diff --git a/R/calcHalfEarth.R b/R/calcHalfEarth.R index da74c186..abca976f 100644 --- a/R/calcHalfEarth.R +++ b/R/calcHalfEarth.R @@ -21,11 +21,10 @@ #' #' @importFrom magpiesets findset addLocation #' @importFrom magclass collapseDim -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcHalfEarth <- function(cells = "lpjcell", nclasses = "seven") { - # Land area (in Mha): iniLU <- calcOutput("LanduseInitialisation", cellular = TRUE, cells = cells, @@ -46,8 +45,8 @@ calcHalfEarth <- function(cells = "lpjcell", nclasses = "seven") { # get WDPA baseline data (1995 - 2020) wdpaBase <- calcOutput("ProtectedAreaBaseline", - aggregate = FALSE, cells = cells, - nclasses = nclasses, magpie_input = TRUE) + aggregate = FALSE, cells = cells, + nclasses = nclasses, magpie_input = TRUE) # make sure that current WDPA protected areas # are not part of conservation priority targets @@ -60,7 +59,7 @@ calcHalfEarth <- function(cells = "lpjcell", nclasses = "seven") { # Conservation potential after 2020 consvPot <- landArea - dimSums(wdpaBase[, "y2020", ], dim = 3) - - setCells(urbanLand[, "y2020", "SSP2"], getCells(wdpaBase)) + setCells(urbanLand[, "y2020", "SSP2"], getCells(wdpaBase)) consvPot <- toolConditionalReplace(consvPot, "<0", 0) # Where conservation priority area is larger than conservation potential @@ -74,7 +73,7 @@ calcHalfEarth <- function(cells = "lpjcell", nclasses = "seven") { if (nclasses == "seven") { # calulate share of respective natveg classes natvegShr <- iniLU[, , c("primforest", "secdforest", "other")] / - dimSums(iniLU[, , c("primforest", "secdforest", "other")], dim = 3) + dimSums(iniLU[, , c("primforest", "secdforest", "other")], dim = 3) natvegShr <- toolConditionalReplace(natvegShr, "is.na()", 0) # magpie object containing all land classes and their conservation land shares @@ -87,7 +86,7 @@ calcHalfEarth <- function(cells = "lpjcell", nclasses = "seven") { } else if (nclasses == "nine") { # calulate share of respective natveg classes natvegShr <- iniLU[, , c("primforest", "secdforest", "primother", "secdother")] / - dimSums(iniLU[, , c("primforest", "secdforest", "primother", "secdother")], dim = 3) + dimSums(iniLU[, , c("primforest", "secdforest", "primother", "secdother")], dim = 3) natvegShr <- toolConditionalReplace(natvegShr, "is.na()", 0) # magpie object containing all land classes and their conservation land shares diff --git a/R/calcISIMIP3bYields.R b/R/calcISIMIP3bYields.R index 7a6b0d12..c613ec85 100644 --- a/R/calcISIMIP3bYields.R +++ b/R/calcISIMIP3bYields.R @@ -17,7 +17,7 @@ #' @importFrom mstools toolHoldConstant #' @importFrom madrat toolSplitSubtype #' @importFrom magclass dimOrder magpply dimSums getNames mbind time_interpolate -#' @importFrom mrcommons toolCoord2Isocell toolSmooth +#' @importFrom mstools toolCoord2Isocell toolSmooth calcISIMIP3bYields <- function(subtype = "yields:EPIC-IIASA:ukesm1-0-ll:ssp585:default:3b", smooth = TRUE, cells = "lpjcell") { @@ -45,25 +45,21 @@ calcISIMIP3bYields <- function(subtype = "yields:EPIC-IIASA:ukesm1-0-ll:ssp585:d # Interpolation of y2015 after mbind of past and scen (NA due to harvest year correction) nameClean <- function(x, subtype) { - - getNames(x, dim = 1)[getNames(x, dim = 1) == "mai"] <- "maiz" - getNames(x, dim = 1)[getNames(x, dim = 1) == "soy"] <- "soybean" - getNames(x, dim = 1)[getNames(x, dim = 1) == "ri1"] <- "ricea" - getNames(x, dim = 1)[getNames(x, dim = 1) == "ri2"] <- "riceb" - getNames(x, dim = 1)[getNames(x, dim = 1) == "swh"] <- "springwheat" - getNames(x, dim = 1)[getNames(x, dim = 1) == "wwh"] <- "winterwheat" - getNames(x, dim = 2)[getNames(x, dim = 2) == "ir"] <- "irrigated" - getNames(x, dim = 2)[getNames(x, dim = 2) == "rf"] <- "rainfed" - + getNames(x, dim = 1)[getNames(x, dim = 1) == "mai"] <- "maiz" + getNames(x, dim = 1)[getNames(x, dim = 1) == "soy"] <- "soybean" + getNames(x, dim = 1)[getNames(x, dim = 1) == "ri1"] <- "ricea" + getNames(x, dim = 1)[getNames(x, dim = 1) == "ri2"] <- "riceb" + getNames(x, dim = 1)[getNames(x, dim = 1) == "swh"] <- "springwheat" + getNames(x, dim = 1)[getNames(x, dim = 1) == "wwh"] <- "winterwheat" + getNames(x, dim = 2)[getNames(x, dim = 2) == "ir"] <- "irrigated" + getNames(x, dim = 2)[getNames(x, dim = 2) == "rf"] <- "rainfed" return(x) } - plantDay <- collapseNames(readSource("GGCMICropCalendar", - subtype = "planting_day")[, , c("ri1", "ri2", "wwh", - "swh", "soy", "mai")][, , c("rf", "ir")]) - maturityDay <- collapseNames(readSource("GGCMICropCalendar", - subtype = "maturity_day")[, , c("ri1", "ri2", "wwh", - "swh", "soy", "mai")][, , c("rf", "ir")]) + plantDay <- readSource("GGCMICropCalendar", subtype = "planting_day") + plantDay <- collapseNames(plantDay[, , c("ri1", "ri2", "wwh", "swh", "soy", "mai")][, , c("rf", "ir")]) + maturityDay <- readSource("GGCMICropCalendar", subtype = "maturity_day") + maturityDay <- collapseNames(maturityDay[, , c("ri1", "ri2", "wwh", "swh", "soy", "mai")][, , c("rf", "ir")]) diff <- maturityDay - plantDay diff <- nameClean(diff, subtype) @@ -72,14 +68,14 @@ calcISIMIP3bYields <- function(subtype = "yields:EPIC-IIASA:ukesm1-0-ll:ssp585:d cellsCorr <- where(diff[, , n] < 0)$true$regions x[cellsCorr, "y2015", n] <- setYears((x[cellsCorr, "y2016", n] + x[cellsCorr, "y2014", n]) / 2, - "y2015") + "y2015") } # read in mask harvArea <- collapseNames(readSource("GGCMICropCalendar", - subtype = "fraction_of_harvested_area", - convert = FALSE)) + subtype = "fraction_of_harvested_area", + convert = FALSE)) harvArea <- nameClean(harvArea) # for wheat take higher yielding variety based on highest mean yield between 1981 and 2011 @@ -88,7 +84,7 @@ calcISIMIP3bYields <- function(subtype = "yields:EPIC-IIASA:ukesm1-0-ll:ssp585:d } else { # use mask to select between spring and winter wheat yields tece <- collapseNames(x[, , "springwheat"] * harvArea[, , "springwheat"] + - x[, , "winterwheat"] * harvArea[, , "winterwheat"]) + x[, , "winterwheat"] * harvArea[, , "winterwheat"]) # tece mask does not cover all cells, only current harv area. # Fill in other areas with higher yielding variety, based on historical 30 year averages higherw <- magpply(x[, 1981:2011, "springwheat", ], diff --git a/R/calcIrrecoverableCarbonLand.R b/R/calcIrrecoverableCarbonLand.R index 57132b6e..7d1ec3dd 100644 --- a/R/calcIrrecoverableCarbonLand.R +++ b/R/calcIrrecoverableCarbonLand.R @@ -25,7 +25,7 @@ #' calcOutput("calcIrrecoverableCarbonLand", aggregate = FALSE) #' } #' -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcIrrecoverableCarbonLand <- function(maginput = TRUE, nclasses = "seven", cells = "lpjcell") { diff --git a/R/calcKeyBiodiversityAreas.R b/R/calcKeyBiodiversityAreas.R index 4f61be95..f7fb9881 100644 --- a/R/calcKeyBiodiversityAreas.R +++ b/R/calcKeyBiodiversityAreas.R @@ -25,7 +25,7 @@ #' calcOutput("calcKeyBiodiversityAreas", aggregate = FALSE) #' } #' -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcKeyBiodiversityAreas <- function(maginput = TRUE, unprotected = TRUE, nclasses = "seven", cells = "lpjcell") { diff --git a/R/calcProtectArea.R b/R/calcProtectArea.R index 59865cba..27002209 100644 --- a/R/calcProtectArea.R +++ b/R/calcProtectArea.R @@ -15,7 +15,7 @@ #' #' @importFrom magpiesets findset addLocation #' @importFrom magclass collapseDim -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcProtectArea <- function(cells = "lpjcell", bhifl = TRUE) { diff --git a/R/calcProtectedAreaBaseline.R b/R/calcProtectedAreaBaseline.R index 023fb9a3..f6b1828e 100644 --- a/R/calcProtectedAreaBaseline.R +++ b/R/calcProtectedAreaBaseline.R @@ -25,7 +25,7 @@ #' calcOutput("ProtectedAreaBaseline", aggregate = FALSE) #' } #' -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcProtectedAreaBaseline <- function(magpie_input = TRUE, nclasses = "seven", # nolint cells = "lpjcell") { diff --git a/R/calcSNVTargetCropland.R b/R/calcSNVTargetCropland.R index 7db32af7..36ff1bcd 100644 --- a/R/calcSNVTargetCropland.R +++ b/R/calcSNVTargetCropland.R @@ -17,7 +17,7 @@ #' calcOutput("SNVTargetCropland", aggregate = FALSE) #' } #' -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' calcSNVTargetCropland <- function(maginput = TRUE, cells = "magpiecell") { targetCropland <- readSource("Copernicus", subtype = "SNVTargetCropland", convert = "onlycorrect") diff --git a/R/calcTradeMargin.R b/R/calcTradeMargin.R index b5da65b2..694aa7d6 100644 --- a/R/calcTradeMargin.R +++ b/R/calcTradeMargin.R @@ -18,6 +18,7 @@ #' @importFrom magpiesets findset #' @importFrom magclass is.magpie #' @importFrom GDPuc convertGDP +#' @importFrom mstools toolCountryFillBilateral calcTradeMargin <- function(gtap_version = "GTAP9", bilateral = FALSE, producer_price = "FAOini") { # nolint stopifnot(gtap_version %in% c("GTAP7", "GTAP8", "GTAP9")) diff --git a/R/calcTradeTariff.R b/R/calcTradeTariff.R index 9dc928bf..b50a284a 100644 --- a/R/calcTradeTariff.R +++ b/R/calcTradeTariff.R @@ -24,6 +24,7 @@ #' @importFrom magclass as.data.frame add_columns #' @importFrom magpiesets findset #' @importFrom GDPuc convertGDP +#' @importFrom mstools toolCountryFillBilateral #' calcTradeTariff<- function(gtap_version = "GTAP9", type_tariff = "total", bilateral = FALSE) { #nolint diff --git a/R/calcYields.R b/R/calcYields.R index 7ccce443..449e4628 100644 --- a/R/calcYields.R +++ b/R/calcYields.R @@ -61,7 +61,8 @@ #' @importFrom magpiesets findset #' @importFrom magclass getYears add_columns dimSums time_interpolate #' @importFrom madrat toolFillYears toolGetMapping toolTimeAverage -#' @importFrom mrcommons toolLPJmLVersion toolHarmonize2Baseline +#' @importFrom mrlandcore toolLPJmLVersion +#' @importFrom mstools toolHarmonize2Baseline #' @importFrom stringr str_split #' @importFrom withr local_options diff --git a/R/calcYieldsCalibrated.R b/R/calcYieldsCalibrated.R index 88671cf1..2d75b63d 100644 --- a/R/calcYieldsCalibrated.R +++ b/R/calcYieldsCalibrated.R @@ -65,7 +65,7 @@ #' @importFrom magpiesets findset #' @importFrom magclass getYears getNames dimSums mbind #' @importFrom madrat calcOutput toolConditionalReplace -#' @importFrom mrcommons toolCoord2Isocell +#' @importFrom mstools toolCoord2Isocell #' @importFrom withr local_options calcYieldsCalibrated <- function(source = c(lpjml = "ggcmi_phase3_nchecks_9ca735cb", isimip = NULL), diff --git a/R/calcYieldsLPJmL.R b/R/calcYieldsLPJmL.R index dd700922..d2f1b986 100644 --- a/R/calcYieldsLPJmL.R +++ b/R/calcYieldsLPJmL.R @@ -18,7 +18,6 @@ #' } #' #' @importFrom madrat toolGetMapping -#' @importFrom mrcommons toolLPJmLVersion #' @importFrom withr local_options calcYieldsLPJmL <- function(lpjml = "ggcmi_phase3_nchecks_bft_e511ac58", diff --git a/R/convertGTAP.R b/R/convertGTAP.R index f820de98..29f58a71 100644 --- a/R/convertGTAP.R +++ b/R/convertGTAP.R @@ -12,6 +12,7 @@ #' } #' @importFrom madrat toolAggregate #' @importFrom magclass as.magpie magpiesort +#' @importFrom mstools toolCountryFillBilateral convertGTAP <- function(x, subtype) { x <- magpiesort(x) diff --git a/R/correctProtectArea.R b/R/correctProtectArea.R index b31cff03..92921044 100644 --- a/R/correctProtectArea.R +++ b/R/correctProtectArea.R @@ -12,6 +12,7 @@ #' } #' #' @importFrom madrat toolConditionalReplace +#' @importFrom mstools toolCell2isoCell correctProtectArea <- function(x) { diff --git a/R/imports.R b/R/imports.R index d3eecb42..29b91025 100644 --- a/R/imports.R +++ b/R/imports.R @@ -1,4 +1,4 @@ # Generated by lucode2: do not edit by hand -#' @import madrat magclass mrdrivers mrcommons mrfactors +#' @import madrat magclass mrcommons mrfactors mrfaocore mrlandcore NULL diff --git a/R/readBrennan2022.R b/R/readBrennan2022.R index 9fbaf9a8..b56eb129 100644 --- a/R/readBrennan2022.R +++ b/R/readBrennan2022.R @@ -24,7 +24,7 @@ #' #' @importFrom terra rast classify cellSize aggregate terraOptions #' @importFrom withr local_tempdir defer -#' @importFrom mrcommons toolGetMappingCoord2Country +#' @importFrom mstools toolGetMappingCoord2Country #' readBrennan2022 <- function(subtype = "KBA_GSN_masked") { diff --git a/R/readCopernicus.R b/R/readCopernicus.R index 0b870cd7..6b6574a6 100644 --- a/R/readCopernicus.R +++ b/R/readCopernicus.R @@ -20,7 +20,7 @@ #' #' @importFrom terra rast terraOptions #' @importFrom withr local_tempdir defer -#' @importFrom mrcommons toolGetMappingCoord2Country +#' @importFrom mstools toolGetMappingCoord2Country #' readCopernicus <- function(subtype = "CroplandTreecover") { diff --git a/R/readDinerstein2020.R b/R/readDinerstein2020.R index 086fc4ef..7caded34 100644 --- a/R/readDinerstein2020.R +++ b/R/readDinerstein2020.R @@ -25,7 +25,7 @@ #' #' @importFrom terra rast classify cellSize aggregate terraOptions #' @importFrom withr local_tempdir defer -#' @importFrom mrcommons toolGetMappingCoord2Country +#' @importFrom mstools toolGetMappingCoord2Country #' readDinerstein2020 <- function(subtype = "GSN:distinct_species_assemblages") { diff --git a/R/readFRA2015Doc.R b/R/readFRA2015Doc.R index 06da2c5c..2d86adcf 100644 --- a/R/readFRA2015Doc.R +++ b/R/readFRA2015Doc.R @@ -21,7 +21,7 @@ readFRA2015Doc <- function(subtype){ ## Mapping file - iso_country <- read.csv2(system.file("extdata","FAOiso_faocode.csv",package = "mrland"),row.names=NULL) + iso_country <- read.csv2(system.file("extdata","FAOiso_faocode.csv",package = "mrfaocore"),row.names=NULL) ## Original data file name location <- "FRA2015_data.xlsx" diff --git a/R/readKeyBiodiversityAreas.R b/R/readKeyBiodiversityAreas.R index 638904f2..9f827a19 100644 --- a/R/readKeyBiodiversityAreas.R +++ b/R/readKeyBiodiversityAreas.R @@ -16,7 +16,7 @@ #' #' @importFrom terra rast classify cellSize aggregate terraOptions #' @importFrom withr local_tempdir defer -#' @importFrom mrcommons toolGetMappingCoord2Country +#' @importFrom mstools toolGetMappingCoord2Country #' readKeyBiodiversityAreas <- function(subtype = "unprotected") { diff --git a/R/readNoon2022.R b/R/readNoon2022.R index 2c73428a..e4fba21e 100644 --- a/R/readNoon2022.R +++ b/R/readNoon2022.R @@ -26,7 +26,7 @@ #' #' @importFrom terra rast classify cellSize aggregate terraOptions #' @importFrom withr local_tempdir defer -#' @importFrom mrcommons toolGetMappingCoord2Country +#' @importFrom mstools toolGetMappingCoord2Country #' readNoon2022 <- function(subtype = "land:IrrC_50pc") { diff --git a/R/readProtectedAreaBaseline.R b/R/readProtectedAreaBaseline.R index 2d4aff96..e952de58 100644 --- a/R/readProtectedAreaBaseline.R +++ b/R/readProtectedAreaBaseline.R @@ -12,7 +12,7 @@ #' readSource("ProtectedAreaBaseline", convert = "onlycorrect") #' } #' @importFrom terra aggregate cellSize classify extract rast segregate terraOptions tmpFiles -#' @importFrom mrcommons toolGetMappingCoord2Country +#' @importFrom mstools toolGetMappingCoord2Country #' @importFrom withr local_tempdir defer #' diff --git a/R/readZabel2014.R b/R/readZabel2014.R index fa2639d9..6acad40e 100644 --- a/R/readZabel2014.R +++ b/R/readZabel2014.R @@ -30,7 +30,7 @@ #' #' @importFrom terra rast classify extract aggregate terraOptions mask #' @importFrom withr local_tempdir defer -#' @importFrom mrcommons toolGetMappingCoord2Country +#' @importFrom mstools toolGetMappingCoord2Country #' readZabel2014 <- function(subtype = "all_marginal:rainfed_and_irrigated") { @@ -132,7 +132,7 @@ readZabel2014 <- function(subtype = "all_marginal:rainfed_and_irrigated") { ### Create magpie object # get spatial mapping - map <- mrcommons::toolGetMappingCoord2Country(pretty = TRUE) + map <- toolGetMappingCoord2Country(pretty = TRUE) # transform raster to magpie object out <- as.magpie(extract(cropsuitZabel05, map[c("lon", "lat")])[, 2], spatial = 1) # set dimension names diff --git a/README.md b/README.md index db4b2bbd..9757ae96 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRaT land data package -R package **mrland**, version **0.57.1** +R package **mrland**, version **0.59.0** [![CRAN status](https://www.r-pkg.org/badges/version/mrland)](https://cran.r-project.org/package=mrland) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822083.svg)](https://doi.org/10.5281/zenodo.3822083) [![R build status](https://github.com/pik-piam/mrland/workflows/check/badge.svg)](https://github.com/pik-piam/mrland/actions) [![codecov](https://codecov.io/gh/pik-piam/mrland/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrland) [![r-universe](https://pik-piam.r-universe.dev/badges/mrland)](https://pik-piam.r-universe.dev/builds) @@ -39,17 +39,17 @@ In case of questions / problems please contact Jan Philipp Dietrich . +Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D, Sauer P (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 , R package version 0.59.0, . A BibTeX entry for LaTeX users is ```latex @Manual{, title = {mrland: MadRaT land data package}, - author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten}, + author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten and Pascal Sauer}, year = {2024}, - note = {R package version 0.57.1}, - doi = {10.5281/zenodo.3822083}, + note = {R package version 0.59.0}, url = {https://github.com/pik-piam/mrland}, + doi = {10.5281/zenodo.3822083}, } ``` diff --git a/inst/extdata/FAOiso_faocode.csv b/inst/extdata/FAOiso_faocode.csv deleted file mode 100644 index de709f84..00000000 --- a/inst/extdata/FAOiso_faocode.csv +++ /dev/null @@ -1,244 +0,0 @@ -CountryCode;Country;ISO3;manuallyadded -2;Afghanistan;AFG;FALSE -3;Albania;ALB;FALSE -4;Algeria;DZA;FALSE -6;Andorra;AND;FALSE -7;Angola;AGO;FALSE -8;Antigua and Barbuda;ATG;FALSE -9;Argentina;ARG;FALSE -1;Armenia;ARM;FALSE -10;Australia;AUS;FALSE -11;Austria;AUT;FALSE -52;Azerbaijan;AZE;FALSE -12;Bahamas;BHS;FALSE -13;Bahrain;BHR;FALSE -16;Bangladesh;BGD;FALSE -14;Barbados;BRB;FALSE -57;Belarus;BLR;FALSE -255;Belgium;BEL;FALSE -23;Belize;BLZ;FALSE -53;Benin;BEN;FALSE -18;Bhutan;BTN;FALSE -19;Bolivia (Plurinational State of);BOL;FALSE -80;Bosnia and Herzegovina;BIH;FALSE -20;Botswana;BWA;FALSE -21;Brazil;BRA;FALSE -26;Brunei Darussalam;BRN;FALSE -27;Bulgaria;BGR;FALSE -233;Burkina Faso;BFA;FALSE -29;Burundi;BDI;FALSE -35;Cabo Verde;CPV;FALSE -115;Cambodia;KHM;FALSE -32;Cameroon;CMR;FALSE -33;Canada;CAN;FALSE -37;Central African Republic;CAF;FALSE -39;Chad;TCD;FALSE -40;Chile;CHL;FALSE -351;China;CHN;FALSE -44;Colombia;COL;FALSE -45;Comoros;COM;FALSE -46;Congo;COG;FALSE -47;Cook Islands;COK;FALSE -48;Costa Rica;CRI;FALSE -107;Cote d'Ivoire;CIV;FALSE -98;Croatia;HRV;FALSE -49;Cuba;CUB;FALSE -50;Cyprus;CYP;FALSE -167;Czech Republic;CZE;FALSE -116;Democratic People's Republic of Korea;PRK;FALSE -250;Democratic Republic of the Congo;COD;FALSE -54;Denmark;DNK;FALSE -72;Djibouti;DJI;FALSE -55;Dominica;DMA;FALSE -56;Dominican Republic;DOM;FALSE -58;Ecuador;ECU;FALSE -59;Egypt;EGY;FALSE -60;El Salvador;SLV;FALSE -61;Equatorial Guinea;GNQ;FALSE -178;Eritrea;ERI;FALSE -63;Estonia;EST;FALSE -238;Ethiopia;ETH;FALSE -66;Fiji;FJI;FALSE -67;Finland;FIN;FALSE -68;France;FRA;FALSE -74;Gabon;GAB;FALSE -75;Gambia;GMB;FALSE -73;Georgia;GEO;FALSE -79;Germany;DEU;FALSE -81;Ghana;GHA;FALSE -84;Greece;GRC;FALSE -86;Grenada;GRD;FALSE -89;Guatemala;GTM;FALSE -90;Guinea;GIN;FALSE -175;Guinea-Bissau;GNB;FALSE -91;Guyana;GUY;FALSE -93;Haiti;HTI;FALSE -95;Honduras;HND;FALSE -97;Hungary;HUN;FALSE -99;Iceland;ISL;FALSE -100;India;IND;FALSE -101;Indonesia;IDN;FALSE -102;Iran (Islamic Republic of);IRN;FALSE -103;Iraq;IRQ;FALSE -104;Ireland;IRL;FALSE -105;Israel;ISR;FALSE -106;Italy;ITA;FALSE -109;Jamaica;JAM;FALSE -110;Japan;JPN;FALSE -112;Jordan;JOR;FALSE -108;Kazakhstan;KAZ;FALSE -114;Kenya;KEN;FALSE -83;Kiribati;KIR;FALSE -118;Kuwait;KWT;FALSE -113;Kyrgyzstan;KGZ;FALSE -120;Lao People's Democratic Republic;LAO;FALSE -119;Latvia;LVA;FALSE -121;Lebanon;LBN;FALSE -122;Lesotho;LSO;FALSE -123;Liberia;LBR;FALSE -124;Libya;LBY;FALSE -126;Lithuania;LTU;FALSE -256;Luxembourg;LUX;FALSE -129;Madagascar;MDG;FALSE -130;Malawi;MWI;FALSE -131;Malaysia;MYS;FALSE -132;Maldives;MDV;FALSE -133;Mali;MLI;FALSE -134;Malta;MLT;FALSE -127;Marshall Islands;MHL;FALSE -136;Mauritania;MRT;FALSE -137;Mauritius;MUS;FALSE -138;Mexico;MEX;FALSE -145;Micronesia (Federated States of);FSM;FALSE -140;Monaco;MCO;FALSE -141;Mongolia;MNG;FALSE -273;Montenegro;MNE;FALSE -143;Morocco;MAR;FALSE -144;Mozambique;MOZ;FALSE -28;Myanmar;MMR;FALSE -147;Namibia;NAM;FALSE -148;Nauru;NRU;FALSE -149;Nepal;NPL;FALSE -150;Netherlands;NLD;FALSE -156;New Zealand;NZL;FALSE -157;Nicaragua;NIC;FALSE -158;Niger;NER;FALSE -159;Nigeria;NGA;FALSE -160;Niue;NIU;FALSE -162;Norway;NOR;FALSE -221;Oman;OMN;FALSE -165;Pakistan;PAK;FALSE -180;Palau;PLW;FALSE -166;Panama;PAN;FALSE -168;Papua New Guinea;PNG;FALSE -169;Paraguay;PRY;FALSE -170;Peru;PER;FALSE -171;Philippines;PHL;FALSE -173;Poland;POL;FALSE -174;Portugal;PRT;FALSE -179;Qatar;QAT;FALSE -117;Republic of Korea;KOR;FALSE -146;Republic of Moldova;MDA;FALSE -183;Romania;ROU;FALSE -185;Russian Federation;RUS;FALSE -184;Rwanda;RWA;FALSE -188;Saint Kitts and Nevis;KNA;FALSE -189;Saint Lucia;LCA;FALSE -191;Saint Vincent and the Grenadines;VCT;FALSE -244;Samoa;WSM;FALSE -192;San Marino;SMR;FALSE -193;Sao Tome and Principe;STP;FALSE -194;Saudi Arabia;SAU;FALSE -195;Senegal;SEN;FALSE -272;Serbia;SRB;FALSE -196;Seychelles;SYC;FALSE -197;Sierra Leone;SLE;FALSE -200;Singapore;SGP;FALSE -199;Slovakia;SVK;FALSE -198;Slovenia;SVN;FALSE -25;Solomon Islands;SLB;FALSE -201;Somalia;SOM;FALSE -202;South Africa;ZAF;FALSE -277;South Sudan;SSD;FALSE -203;Spain;ESP;FALSE -38;Sri Lanka;LKA;FALSE -276;Sudan;SDN;FALSE -207;Suriname;SUR;FALSE -209;Swaziland;SWZ;FALSE -210;Sweden;SWE;FALSE -211;Switzerland;CHE;FALSE -212;Syrian Arab Republic;SYR;FALSE -208;Tajikistan;TJK;FALSE -216;Thailand;THA;FALSE -154;The former Yugoslav Republic of Macedonia;MKD;FALSE -176;Timor-Leste;TLS;FALSE -217;Togo;TGO;FALSE -219;Tonga;TON;FALSE -220;Trinidad and Tobago;TTO;FALSE -222;Tunisia;TUN;FALSE -223;Turkey;TUR;FALSE -213;Turkmenistan;TKM;FALSE -227;Tuvalu;TUV;FALSE -226;Uganda;UGA;FALSE -230;Ukraine;UKR;FALSE -225;United Arab Emirates;ARE;FALSE -229;United Kingdom;GBR;FALSE -215;United Republic of Tanzania;TZA;FALSE -231;United States of America;USA;FALSE -234;Uruguay;URY;FALSE -235;Uzbekistan;UZB;FALSE -155;Vanuatu;VUT;FALSE -236;Venezuela (Bolivarian Republic of);VEN;FALSE -237;Viet Nam;VNM;FALSE -249;Yemen;YEM;FALSE -251;Zambia;ZMB;FALSE -181;Zimbabwe;ZWE;FALSE -5;American Samoa;ASM;TRUE -258;Anguilla;AIA;TRUE -22;Aruba;ABW;TRUE -15;Belgium-Luxembourg;XBL;TRUE -17;Bermuda;BMU;TRUE -239;British Virgin Islands;VGB;TRUE -36;Cayman Islands;CYM;TRUE -96;China, Hong Kong SAR;HKG;TRUE -128;China, Macao SAR;MAC;TRUE -41;China, mainland;XCN;TRUE -214;China, Taiwan Province of;TWN;TRUE -51;Czechoslovakia;CSK;TRUE -62;Ethiopia PDR;XET;TRUE -65;Falkland Islands (Malvinas);FLK;TRUE -64;Faroe Islands;FRO;TRUE -69;French Guiana;GUF;TRUE -70;French Polynesia;PYF;TRUE -82;Gibraltar;GIB;TRUE -85;Greenland;GRL;TRUE -87;Guadeloupe;GLP;TRUE -88;Guam;GUM;TRUE -94;Holy See;VAT;TRUE -125;Liechtenstein;LIE;TRUE -135;Martinique;MTQ;TRUE -270;Mayotte;MYT;TRUE -142;Montserrat;MSR;TRUE -151;Netherlands Antilles;ANT;TRUE -153;New Caledonia;NCL;TRUE -163;Northern Mariana Islands;MNP;TRUE -299;Occupied Palestinian Territory;PSE;TRUE -164;Pacific Islands Trust Territory;PCI;TRUE -177;Puerto Rico;PRI;TRUE -182;Reunion;REU;TRUE -187;Saint Helena, Ascension and Tristan da Cunha;SHN;TRUE -190;Saint Pierre and Miquelon;SPM;TRUE -186;Serbia and Montenegro;SCG;TRUE -206;Sudan (former);XSD;TRUE -218;Tokelau;TKL;TRUE -224;Turks and Caicos Islands;TCA;TRUE -240;United States Virgin Islands;VIR;TRUE -228;USSR;SUN;TRUE -243;Wallis and Futuna Islands;WLF;TRUE -205;Western Sahara;ESH;TRUE -248;Yugoslav SFR;YUG;TRUE -264;Isle of Man;IMN;TRUE -161;Norfolk Island;NFK;TRUE -172;Pitcairn Islands;PCN;TRUE -260;Svalbard and Jan Mayen Islands;SJM;TRUE -259;Channel Islands;JEY;TRUE diff --git a/man/calcSOMexogenous.Rd b/man/calcSOMexogenous.Rd index 7f97af18..17447e62 100644 --- a/man/calcSOMexogenous.Rd +++ b/man/calcSOMexogenous.Rd @@ -13,8 +13,7 @@ List of magpie objects with results on country level, weight on country level, u Uses an exogenous trajectory of Soil organic matter loss nitrogen release } \examples{ - -\dontrun{ +\dontrun{ calcOutput("SOMexogenous") } }