From b9062e1fc770bc4289cddbb36a49f4acad56302a Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Fri, 8 Jul 2022 17:49:29 +0200 Subject: [PATCH 1/8] added primary and secondary other land adjustment to BII disaggregattion --- .../extra/disaggregation_BII_adjusted.R | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 scripts/output/extra/disaggregation_BII_adjusted.R diff --git a/scripts/output/extra/disaggregation_BII_adjusted.R b/scripts/output/extra/disaggregation_BII_adjusted.R new file mode 100644 index 0000000000..b956a36ec9 --- /dev/null +++ b/scripts/output/extra/disaggregation_BII_adjusted.R @@ -0,0 +1,147 @@ +# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) +# | authors, and contributors see CITATION.cff file. This file is part +# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +# | AGPL-3.0, you are granted additional permissions described in the +# | MAgPIE License Exception, version 1.0 (see LICENSE file). +# | Contact: magpie@pik-potsdam.de + +# -------------------------------------------------------------- +# description: Derives BII at 0.5 degree resolution from MAgPIE cluster-level biodiversity value results +# comparison script: FALSE +# --------------------------------------------------------------- + +library(lucode2) +library(magpie4) +library(luscale) +library(madrat) +library(mrcommons) + +############################# BASIC CONFIGURATION ############################## +if(!exists("source_include")) { + outputdir <- file.path("output/", list.dirs("output/", full.names = FALSE, recursive = FALSE)) + # Define arguments that can be read from command line + lucode2::readArgs("outputdir") +} + +map_file <- Sys.glob(file.path(outputdir, "clustermap_*.rds")) +gdx <- file.path(outputdir, "fulldata.gdx") +land_hr_file <- file.path(outputdir, "avl_land_full_t_0.5.mz") +urban_land_hr_file <- file.path(outputdir, "f34_urbanland_0.5.mz") +side_layers <- file.path(outputdir, "luh2_side_layers_0.5.mz") + +cfg <- gms::loadConfig(file.path(outputdir, "config.yml")) +title <- cfg$title +################################################################################ + +sizelimit <- getOption("magclass_sizeLimit") +options(magclass_sizeLimit = 1e+12) +on.exit(options(magclass_sizeLimit = sizelimit)) + +if(length(map_file) == 0) stop("Could not find map file!") +if(length(map_file) > 1) { + warning("More than one map file found. First occurrence will be used!") + map_file <- map_file[1] +} + +mapping <- readRDS(map_file) + +# Biodiversity intactness indicator (BII) at cluster level +bii_lr <- BII(gdx, file = NULL, level = "cell", mode = "auto", landClass = "all", + bii_coeff = NULL, side_layers = NULL) + +# add BII values for primary other land (BII = 1) +bii_lr <- mbind( + bii_lr[,,"other", invert=TRUE], + setNames(bii_lr[,,"other"], c("primother.forested", "primother.nonforested")), + setNames(bii_lr[,,"other"], c("secdother.forested", "secdother.nonforested")) +) +bii_lr[,,c("primother.forested", "primother.nonforested")] <- 1 + +# Load input data +land_ini_lr <- readGDX(gdx, "f10_land", "f_land", format = "first_found")[, "y1995", ] +land_lr <- land(gdx, sum = FALSE, level = "cell") +land_ini_hr <- read.magpie(land_hr_file)[, "y1995", ] +side_layers_hr <- toolCell2isoCell(read.magpie(side_layers)) +landarea <- dimSums(land_ini_hr, dim = 3) +side_layers_lr <- toolAggregate(x = side_layers_hr, rel = mapping, weight = landarea, from = "cell", to = "cluster") + +# Aggregate other land +land_ini_hr <- mbind(land_ini_hr[, , c("primother", "secdother"), invert = TRUE], + setNames(dimSums(land_ini_hr[, , c("primother", "secdother")], dim = 3), + nm = "other")) +getNames(land_ini_hr) <- gsub("range", "rangeland", getNames(land_ini_hr)) +getNames(land_ini_hr) <- gsub("past", "manpast", getNames(land_ini_hr)) + +# Disaggregate pasture +land_ini_lr <- mbind(land_ini_lr[, , c("past"), invert = TRUE], + collapseNames(land_ini_lr[, , "past"]) * side_layers_lr[, , c("manpast", "rangeland")]) + +land_lr <- mbind(land_lr[, , c("past"), invert = TRUE], + collapseNames(land_lr[, , "past"]) * side_layers_lr[, , c("manpast", "rangeland")]) + +# Disaggregate BII to grid cell level +message("Disaggregation BII") +bii_hr <- toolAggregate(x = bii_lr, rel = mapping, from = "cluster", to = "cell") + +# Disaggregate land use types +if(any(land_ini_hr < 0)) { + warning(paste0("Negative values in inital high resolution dataset detected and set to 0. Check the file ", land_hr_file)) + land_ini_hr[which(land_ini_hr < 0,arr.ind = T)] <- 0 +} + +# Prepare data for available cropland interpolation: +# read in hr urban land +if (cfg$gms$urban == "exo_nov21" ) { + urban_land_hr <- read.magpie(urban_land_hr_file) + ssp <- cfg$gms$c34_urban_scenario + urban_land_hr <- urban_land_hr[,,ssp] + getNames(urban_land_hr) <- "urban" +} else if (cfg$gms$urban == "static"){ + urban_land_hr <- "static" +} + +# account for country-specific SNV shares in post-processing +iso <- readGDX(gdx, "iso") +snv_pol_iso <- readGDX(gdx, "policy_countries30") +snv_pol_select <- readGDX(gdx, "s30_snv_shr") +snv_pol_noselect <- readGDX(gdx, "s30_snv_shr_noselect") +snv_pol_shr <- new.magpie(iso, fill = snv_pol_noselect) +snv_pol_shr[snv_pol_iso,,] <- snv_pol_select + +avl_cropland_hr <- file.path(outputdir, "avl_cropland_0.5.mz") # available cropland (at high resolution) +marginal_land <- cfg$gms$c30_marginal_land # marginal land scenario +target_year <- cfg$gms$c30_snv_target # target year of SNV policy (default: "none") +snv_pol_fader <- readGDX(gdx, "f30_scenario_fader", format = "first_found")[, , target_year] + +# Sort and rename +land_ini_hr <- land_ini_hr[,,getNames(land_ini_lr)] +getSets(land_ini_hr)["d3.1"] <- "land" + +# Start interpolation (use interpolateAvlCroplandWeighted from luscale) +message("Disaggregation Land use types") +land_hr <- interpolateAvlCroplandWeighted(x = land_lr, + x_ini_lr = land_ini_lr, + x_ini_hr = land_ini_hr, + avl_cropland_hr = avl_cropland_hr, + map = map_file, + marginal_land = marginal_land, + snv_pol_shr = snv_pol_shr, + snv_pol_fader = snv_pol_fader, + urban_land_hr = urban_land_hr, + unit = "share") + +# Add primary and secondaray other land +land_hr <- PrimSecdOtherLand(land_hr, land_hr_file) + +# specify potential natural vegetation +land_hr <- land_hr * side_layers_hr[, , c("forested", "nonforested")] + +# Sum over land classes +bii_hr <- dimSums(land_hr * bii_hr, dim = 3, na.rm = TRUE) + +# Save BII data as .nc file +write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_0.5.nc")), comment = "unitless") + +# Clean up +rm(bii_hr) +gc() From 80406d94e51f55596ecb9eaad5db1ccb53f0dd47 Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Mon, 11 Jul 2022 15:16:24 +0200 Subject: [PATCH 2/8] updated changelog --- CHANGELOG.md | 1 + scripts/output/extra/disaggregation_BII_adjusted.R | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89113abfdf..04a9a4f818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### changed ### added +- **scripts** output/extra/disaggregation_BII_adjusted.R for adjusted primary and secondary other land BII results - **scripts* added output scripts for FSEC FSDP runs ### removed diff --git a/scripts/output/extra/disaggregation_BII_adjusted.R b/scripts/output/extra/disaggregation_BII_adjusted.R index b956a36ec9..80a8795302 100644 --- a/scripts/output/extra/disaggregation_BII_adjusted.R +++ b/scripts/output/extra/disaggregation_BII_adjusted.R @@ -140,7 +140,7 @@ land_hr <- land_hr * side_layers_hr[, , c("forested", "nonforested")] bii_hr <- dimSums(land_hr * bii_hr, dim = 3, na.rm = TRUE) # Save BII data as .nc file -write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_0.5.nc")), comment = "unitless") +write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_adjusted_0.5.nc")), comment = "unitless") # Clean up rm(bii_hr) From 8b6b410f298fbeff4efdc8d96a5653c52a9d31ee Mon Sep 17 00:00:00 2001 From: florianh Date: Tue, 26 Jul 2022 16:43:44 +0200 Subject: [PATCH 3/8] added mz file format --- scripts/output/extra/disaggregation_BII_adjusted.R | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/output/extra/disaggregation_BII_adjusted.R b/scripts/output/extra/disaggregation_BII_adjusted.R index 80a8795302..8cd42210de 100644 --- a/scripts/output/extra/disaggregation_BII_adjusted.R +++ b/scripts/output/extra/disaggregation_BII_adjusted.R @@ -141,6 +141,7 @@ bii_hr <- dimSums(land_hr * bii_hr, dim = 3, na.rm = TRUE) # Save BII data as .nc file write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_adjusted_0.5.nc")), comment = "unitless") +write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_adjusted_0.5.mz")), comment = "unitless") # Clean up rm(bii_hr) From 248c722fcaf13be51ca5955d8dc45308f15f11d5 Mon Sep 17 00:00:00 2001 From: florianh Date: Tue, 26 Jul 2022 16:47:57 +0200 Subject: [PATCH 4/8] added output script --- scripts/start/projects/project_FSEC_Scenarios.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start/projects/project_FSEC_Scenarios.R b/scripts/start/projects/project_FSEC_Scenarios.R index ab51843b31..336c9fcc57 100644 --- a/scripts/start/projects/project_FSEC_Scenarios.R +++ b/scripts/start/projects/project_FSEC_Scenarios.R @@ -35,7 +35,7 @@ general_settings <- function(title) { cfg$qos <- "priority_maxMem" cfg$output <- c(cfg$output, "rds_report_iso", - "extra/disaggregation_BII" + "extra/disaggregation_BII_adjusted" #"extra/disaggregation_BII", "projects/FSEC_dietaryIndicators", #"projects/FSEC_environmentalPollution_grid" ) From 78ee8a28731d3cd243d2a89abacb9d6dcf368509 Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Wed, 27 Jul 2022 10:42:35 +0200 Subject: [PATCH 5/8] added other land differentiation to disaggregation_BII.R --- CHANGELOG.md | 4 +- scripts/output/extra/disaggregation_BII.R | 19 ++- .../extra/disaggregation_BII_adjusted.R | 148 ------------------ .../start/projects/project_FSEC_Scenarios.R | 4 +- 4 files changed, 19 insertions(+), 156 deletions(-) delete mode 100644 scripts/output/extra/disaggregation_BII_adjusted.R diff --git a/CHANGELOG.md b/CHANGELOG.md index 379e510944..7e07625f98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,11 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### changed +- **scripts** output/extra/disaggregation_BII.R adjusted BII output for primary and secondary other land - **59_som** Now calculates soil C for fallow -- **inputs** updated non-food initial prices, MACCs curves, and removed suitability threshold of 0.1 in all_marginal setting +- **inputs** updated non-food initial prices, MACCs curves, and removed suitability threshold of 0.1 in all_marginal setting ### added -- **scripts** output/extra/disaggregation_BII_adjusted.R for adjusted primary and secondary other land BII results - **scripts* added output scripts for FSEC FSDP runs - **15_food** added new realization with country level exogenous diets, product-specific intake estimates, new scenarios for exogenous BMI and decomposition switches for EAT Lancet diets. Simplified code and improved iteration procedure. diff --git a/scripts/output/extra/disaggregation_BII.R b/scripts/output/extra/disaggregation_BII.R index 46963b3fdd..2e1f8b7df4 100644 --- a/scripts/output/extra/disaggregation_BII.R +++ b/scripts/output/extra/disaggregation_BII.R @@ -49,6 +49,14 @@ mapping <- readRDS(map_file) bii_lr <- BII(gdx, file = NULL, level = "cell", mode = "auto", landClass = "all", bii_coeff = NULL, side_layers = NULL) +# add BII values for primary other land (BII = 1) +bii_lr <- mbind( + bii_lr[,,"other", invert=TRUE], + setNames(bii_lr[,,"other"], c("primother.forested", "primother.nonforested")), + setNames(bii_lr[,,"other"], c("secdother.forested", "secdother.nonforested")) +) +bii_lr[,,c("primother.forested", "primother.nonforested")] <- 1 + # Load input data land_ini_lr <- readGDX(gdx, "f10_land", "f_land", format = "first_found")[, "y1995", ] land_lr <- land(gdx, sum = FALSE, level = "cell") @@ -122,15 +130,18 @@ land_hr <- interpolateAvlCroplandWeighted(x = land_lr, urban_land_hr = urban_land_hr, unit = "share") -land_hr <- land_hr[, "y1985", invert = TRUE] +# Add primary and secondaray other land +land_hr <- PrimSecdOtherLand(land_hr, land_hr_file) + +# specify potential natural vegetation land_hr <- land_hr * side_layers_hr[, , c("forested", "nonforested")] # Sum over land classes bii_hr <- dimSums(land_hr * bii_hr, dim = 3, na.rm = TRUE) -# Save BII data as .nc and .mz file, the first for better transferabiltiy, the second one for faster processing -write.magpie(bii_hr, file.path(outputdir, paste0("cell.bii_0.5.mz")), comment = "unitless") -write.magpie(bii_hr, file.path(outputdir, paste0("cell.bii_0.5.nc")), comment = "unitless") +# Save disaggregated BII data +write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_0.5.nc")), comment = "unitless") +write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_0.5.mz")), comment = "unitless") # Clean up rm(bii_hr) diff --git a/scripts/output/extra/disaggregation_BII_adjusted.R b/scripts/output/extra/disaggregation_BII_adjusted.R deleted file mode 100644 index 8cd42210de..0000000000 --- a/scripts/output/extra/disaggregation_BII_adjusted.R +++ /dev/null @@ -1,148 +0,0 @@ -# | (C) 2008-2022 Potsdam Institute for Climate Impact Research (PIK) -# | authors, and contributors see CITATION.cff file. This file is part -# | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of -# | AGPL-3.0, you are granted additional permissions described in the -# | MAgPIE License Exception, version 1.0 (see LICENSE file). -# | Contact: magpie@pik-potsdam.de - -# -------------------------------------------------------------- -# description: Derives BII at 0.5 degree resolution from MAgPIE cluster-level biodiversity value results -# comparison script: FALSE -# --------------------------------------------------------------- - -library(lucode2) -library(magpie4) -library(luscale) -library(madrat) -library(mrcommons) - -############################# BASIC CONFIGURATION ############################## -if(!exists("source_include")) { - outputdir <- file.path("output/", list.dirs("output/", full.names = FALSE, recursive = FALSE)) - # Define arguments that can be read from command line - lucode2::readArgs("outputdir") -} - -map_file <- Sys.glob(file.path(outputdir, "clustermap_*.rds")) -gdx <- file.path(outputdir, "fulldata.gdx") -land_hr_file <- file.path(outputdir, "avl_land_full_t_0.5.mz") -urban_land_hr_file <- file.path(outputdir, "f34_urbanland_0.5.mz") -side_layers <- file.path(outputdir, "luh2_side_layers_0.5.mz") - -cfg <- gms::loadConfig(file.path(outputdir, "config.yml")) -title <- cfg$title -################################################################################ - -sizelimit <- getOption("magclass_sizeLimit") -options(magclass_sizeLimit = 1e+12) -on.exit(options(magclass_sizeLimit = sizelimit)) - -if(length(map_file) == 0) stop("Could not find map file!") -if(length(map_file) > 1) { - warning("More than one map file found. First occurrence will be used!") - map_file <- map_file[1] -} - -mapping <- readRDS(map_file) - -# Biodiversity intactness indicator (BII) at cluster level -bii_lr <- BII(gdx, file = NULL, level = "cell", mode = "auto", landClass = "all", - bii_coeff = NULL, side_layers = NULL) - -# add BII values for primary other land (BII = 1) -bii_lr <- mbind( - bii_lr[,,"other", invert=TRUE], - setNames(bii_lr[,,"other"], c("primother.forested", "primother.nonforested")), - setNames(bii_lr[,,"other"], c("secdother.forested", "secdother.nonforested")) -) -bii_lr[,,c("primother.forested", "primother.nonforested")] <- 1 - -# Load input data -land_ini_lr <- readGDX(gdx, "f10_land", "f_land", format = "first_found")[, "y1995", ] -land_lr <- land(gdx, sum = FALSE, level = "cell") -land_ini_hr <- read.magpie(land_hr_file)[, "y1995", ] -side_layers_hr <- toolCell2isoCell(read.magpie(side_layers)) -landarea <- dimSums(land_ini_hr, dim = 3) -side_layers_lr <- toolAggregate(x = side_layers_hr, rel = mapping, weight = landarea, from = "cell", to = "cluster") - -# Aggregate other land -land_ini_hr <- mbind(land_ini_hr[, , c("primother", "secdother"), invert = TRUE], - setNames(dimSums(land_ini_hr[, , c("primother", "secdother")], dim = 3), - nm = "other")) -getNames(land_ini_hr) <- gsub("range", "rangeland", getNames(land_ini_hr)) -getNames(land_ini_hr) <- gsub("past", "manpast", getNames(land_ini_hr)) - -# Disaggregate pasture -land_ini_lr <- mbind(land_ini_lr[, , c("past"), invert = TRUE], - collapseNames(land_ini_lr[, , "past"]) * side_layers_lr[, , c("manpast", "rangeland")]) - -land_lr <- mbind(land_lr[, , c("past"), invert = TRUE], - collapseNames(land_lr[, , "past"]) * side_layers_lr[, , c("manpast", "rangeland")]) - -# Disaggregate BII to grid cell level -message("Disaggregation BII") -bii_hr <- toolAggregate(x = bii_lr, rel = mapping, from = "cluster", to = "cell") - -# Disaggregate land use types -if(any(land_ini_hr < 0)) { - warning(paste0("Negative values in inital high resolution dataset detected and set to 0. Check the file ", land_hr_file)) - land_ini_hr[which(land_ini_hr < 0,arr.ind = T)] <- 0 -} - -# Prepare data for available cropland interpolation: -# read in hr urban land -if (cfg$gms$urban == "exo_nov21" ) { - urban_land_hr <- read.magpie(urban_land_hr_file) - ssp <- cfg$gms$c34_urban_scenario - urban_land_hr <- urban_land_hr[,,ssp] - getNames(urban_land_hr) <- "urban" -} else if (cfg$gms$urban == "static"){ - urban_land_hr <- "static" -} - -# account for country-specific SNV shares in post-processing -iso <- readGDX(gdx, "iso") -snv_pol_iso <- readGDX(gdx, "policy_countries30") -snv_pol_select <- readGDX(gdx, "s30_snv_shr") -snv_pol_noselect <- readGDX(gdx, "s30_snv_shr_noselect") -snv_pol_shr <- new.magpie(iso, fill = snv_pol_noselect) -snv_pol_shr[snv_pol_iso,,] <- snv_pol_select - -avl_cropland_hr <- file.path(outputdir, "avl_cropland_0.5.mz") # available cropland (at high resolution) -marginal_land <- cfg$gms$c30_marginal_land # marginal land scenario -target_year <- cfg$gms$c30_snv_target # target year of SNV policy (default: "none") -snv_pol_fader <- readGDX(gdx, "f30_scenario_fader", format = "first_found")[, , target_year] - -# Sort and rename -land_ini_hr <- land_ini_hr[,,getNames(land_ini_lr)] -getSets(land_ini_hr)["d3.1"] <- "land" - -# Start interpolation (use interpolateAvlCroplandWeighted from luscale) -message("Disaggregation Land use types") -land_hr <- interpolateAvlCroplandWeighted(x = land_lr, - x_ini_lr = land_ini_lr, - x_ini_hr = land_ini_hr, - avl_cropland_hr = avl_cropland_hr, - map = map_file, - marginal_land = marginal_land, - snv_pol_shr = snv_pol_shr, - snv_pol_fader = snv_pol_fader, - urban_land_hr = urban_land_hr, - unit = "share") - -# Add primary and secondaray other land -land_hr <- PrimSecdOtherLand(land_hr, land_hr_file) - -# specify potential natural vegetation -land_hr <- land_hr * side_layers_hr[, , c("forested", "nonforested")] - -# Sum over land classes -bii_hr <- dimSums(land_hr * bii_hr, dim = 3, na.rm = TRUE) - -# Save BII data as .nc file -write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_adjusted_0.5.nc")), comment = "unitless") -write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_adjusted_0.5.mz")), comment = "unitless") - -# Clean up -rm(bii_hr) -gc() diff --git a/scripts/start/projects/project_FSEC_Scenarios.R b/scripts/start/projects/project_FSEC_Scenarios.R index 336c9fcc57..9c8bcfa79f 100644 --- a/scripts/start/projects/project_FSEC_Scenarios.R +++ b/scripts/start/projects/project_FSEC_Scenarios.R @@ -35,8 +35,8 @@ general_settings <- function(title) { cfg$qos <- "priority_maxMem" cfg$output <- c(cfg$output, "rds_report_iso", - "extra/disaggregation_BII_adjusted" - #"extra/disaggregation_BII", "projects/FSEC_dietaryIndicators", + "extra/disaggregation_BII" + #"projects/FSEC_dietaryIndicators", #"projects/FSEC_environmentalPollution_grid" ) From 98558d49f9c9d45524329ed993edb953c0703de8 Mon Sep 17 00:00:00 2001 From: pvjeetze <50408549+pvjeetze@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:54:01 +0200 Subject: [PATCH 6/8] Update scripts/output/extra/disaggregation_BII.R --- scripts/output/extra/disaggregation_BII.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/output/extra/disaggregation_BII.R b/scripts/output/extra/disaggregation_BII.R index 2e1f8b7df4..dca800a2c9 100644 --- a/scripts/output/extra/disaggregation_BII.R +++ b/scripts/output/extra/disaggregation_BII.R @@ -139,7 +139,7 @@ land_hr <- land_hr * side_layers_hr[, , c("forested", "nonforested")] # Sum over land classes bii_hr <- dimSums(land_hr * bii_hr, dim = 3, na.rm = TRUE) -# Save disaggregated BII data +# Save BII data as .nc and .mz file, the first for better transferabiltiy, the second one for faster processing write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_0.5.nc")), comment = "unitless") write.magpie(bii_hr, file.path(outputdir, paste0(title, "_cell.bii_0.5.mz")), comment = "unitless") From 95288dfbbfbb569cf16858e6540c6f8466729546 Mon Sep 17 00:00:00 2001 From: pvjeetze <50408549+pvjeetze@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:54:59 +0200 Subject: [PATCH 7/8] Update scripts/start/projects/project_FSEC_Scenarios.R --- scripts/start/projects/project_FSEC_Scenarios.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start/projects/project_FSEC_Scenarios.R b/scripts/start/projects/project_FSEC_Scenarios.R index 9c8bcfa79f..61032519ea 100644 --- a/scripts/start/projects/project_FSEC_Scenarios.R +++ b/scripts/start/projects/project_FSEC_Scenarios.R @@ -36,7 +36,7 @@ general_settings <- function(title) { cfg$output <- c(cfg$output, "rds_report_iso", "extra/disaggregation_BII" - #"projects/FSEC_dietaryIndicators", + "projects/FSEC_dietaryIndicators", #"projects/FSEC_environmentalPollution_grid" ) From efe42d76f7f1666cd02e5569c0ab00eeb7ed64d6 Mon Sep 17 00:00:00 2001 From: pvjeetze <50408549+pvjeetze@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:55:39 +0200 Subject: [PATCH 8/8] Update scripts/start/projects/project_FSEC_Scenarios.R --- scripts/start/projects/project_FSEC_Scenarios.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start/projects/project_FSEC_Scenarios.R b/scripts/start/projects/project_FSEC_Scenarios.R index 61032519ea..77b2fcb521 100644 --- a/scripts/start/projects/project_FSEC_Scenarios.R +++ b/scripts/start/projects/project_FSEC_Scenarios.R @@ -35,7 +35,7 @@ general_settings <- function(title) { cfg$qos <- "priority_maxMem" cfg$output <- c(cfg$output, "rds_report_iso", - "extra/disaggregation_BII" + "extra/disaggregation_BII", "projects/FSEC_dietaryIndicators", #"projects/FSEC_environmentalPollution_grid" )