From de335035d9ad8d4ccbb6ad0b3a96de0bbe55850d Mon Sep 17 00:00:00 2001 From: florianh Date: Thu, 31 Oct 2024 10:05:12 +0100 Subject: [PATCH 1/3] bugfix output scripts report --- scripts/output/rds_report.R | 1 + scripts/output/rds_report_iso.R | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/scripts/output/rds_report.R b/scripts/output/rds_report.R index 2b3dea3f0..fab0e3ce8 100644 --- a/scripts/output/rds_report.R +++ b/scripts/output/rds_report.R @@ -48,6 +48,7 @@ for (mapping in c("AR6", "NAVIGATE", "SHAPE", "AR6_MAgPIE")) { } write.report(report, file = mif) +report <- read.report(file = mif, as.list=F) q <- as.quitte(report) # as.quitte converts "World" into "GLO". But we want to keep "World" and therefore undo these changes diff --git a/scripts/output/rds_report_iso.R b/scripts/output/rds_report_iso.R index 52cf2aa57..4f8ffdfcd 100644 --- a/scripts/output/rds_report_iso.R +++ b/scripts/output/rds_report_iso.R @@ -32,6 +32,10 @@ rds_iso <- paste0(outputdir, "/report_iso.rds") report <- getReportIso(gdx, scenario = cfg$title, dir = outputdir) +mif <- sub(".rds",".mif",rds_iso) +write.report(report, file = mif, scenario = cfg$title) +report <- read.report(file = mif, as.list=F) + q <- as.quitte(report) # as.quitte converts "World" into "GLO". But we want to keep "World" and therefore undo these changes q <- droplevels(q) From e073d786b709a85481fb480c25e15e76469eb62e Mon Sep 17 00:00:00 2001 From: Felicitas Beier <39262100+FelicitasBeier@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:32:51 +0100 Subject: [PATCH 2/3] Update rds_report.R linter rules --- scripts/output/rds_report.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/output/rds_report.R b/scripts/output/rds_report.R index fab0e3ce8..e63f4a896 100644 --- a/scripts/output/rds_report.R +++ b/scripts/output/rds_report.R @@ -39,7 +39,7 @@ resultsarchive <- "/p/projects/rd3mod/models/results/magpie" report <- getReport(gdx, scenario = cfg$title, dir = outputdir) for (mapping in c("AR6", "NAVIGATE", "SHAPE", "AR6_MAgPIE")) { - missingVariables <- sort(setdiff(unique(deletePlus(getMappingVariables(mapping,"M"))),unique(deletePlus(getNames(report,dim="variable"))))) + missingVariables <- sort(setdiff(unique(deletePlus(getMappingVariables(mapping, "M"))), unique(deletePlus(getNames(report, dim = "variable"))))) if (length(missingVariables) > 0) { warning("# The following ", length(missingVariables), " variables are expected in the piamInterfaces package ", "for mapping ", mapping, ", but cannot be found in the MAgPIE report.\nPlease either fix in magpie4 or adjust the mapping in piamInterfaces.\n- ", @@ -48,7 +48,7 @@ for (mapping in c("AR6", "NAVIGATE", "SHAPE", "AR6_MAgPIE")) { } write.report(report, file = mif) -report <- read.report(file = mif, as.list=F) +report <- read.report(file = mif, as.list = FALSE) q <- as.quitte(report) # as.quitte converts "World" into "GLO". But we want to keep "World" and therefore undo these changes From 02fdf50e191c60d6bc21c1838956936430992374 Mon Sep 17 00:00:00 2001 From: Felicitas Beier <39262100+FelicitasBeier@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:33:26 +0100 Subject: [PATCH 3/3] Update rds_report_iso.R --- scripts/output/rds_report_iso.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/output/rds_report_iso.R b/scripts/output/rds_report_iso.R index 4f8ffdfcd..7439b930f 100644 --- a/scripts/output/rds_report_iso.R +++ b/scripts/output/rds_report_iso.R @@ -34,7 +34,7 @@ report <- getReportIso(gdx, scenario = cfg$title, dir = outputdir) mif <- sub(".rds",".mif",rds_iso) write.report(report, file = mif, scenario = cfg$title) -report <- read.report(file = mif, as.list=F) +report <- read.report(file = mif, as.list = FALSE) q <- as.quitte(report) # as.quitte converts "World" into "GLO". But we want to keep "World" and therefore undo these changes