Add GDP and GDPpc ISIMIP scenario definitions

pik-piam · Jul 13, 2023 · 0ab2e6c · 0ab2e6c
1 parent 334373c
commit 0ab2e6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/R/calcDriver.R b/R/calcDriver.R
@@ -125,8 +125,10 @@ calcScenarioConstructor <- function(driver,
     weight <- calcOutput("Population", scenario = scenario, extension2150 = extension2150, aggregate = FALSE)
     # Give weight same names as data, so that aggregate doesn't mess up data dim
     getNames(weight) <- getNames(harmonizedData$x)
-    # Make sure weight has the same yearly resolution as harmonizedData
-    # (this relates specifically to the noCovid scenario)
+    # Make sure weight and harmonizedData have the same yearly resolution. Sometimes x has more years than weigth,
+    # thus the intersect operation. Then if weight has more years than x, only years that exist in x are used.
+    # (this applies specifically to the noCovid and ISIMIP scenarios)
+    harmonizedData$x <- harmonizedData$x[, intersect(getYears(harmonizedData$x), getYears(weight)), ]
     weight <- weight[, getYears(harmonizedData$x), ]
   }
 

diff --git a/R/toolGetScenarioDefinition.R b/R/toolGetScenarioDefinition.R
@@ -37,13 +37,15 @@ toolGetScenarioDefinition <- function(driver = NULL, scen = NULL, aslist = FALSE
     "GDPpc",      "SSPs",       "WDI-MI",                     "SSPsOld-MI",           "calibSSPs",
     "GDPpc",      "SDPs",       "-",                          "-",                    "calibSDPs",
     "GDPpc",      "SSP2EU",     "-",                          "-",                    "GDPoverPop",
+    "GDPpc",      "ISIMIP",     "WDI-MI",                     "SSPsOld-MI",           "calibSSPs",
     "GDPpc",      "noCovid",    "WDI-MI",                     "SSPsOld-MI",           "calibNoCovid",
     "GDPpc",      "longCovid",  "-",                          "-",                    "calibLongCovid",
     "GDPpc",      "shortCovid", "-",                          "-",                    "calibShortCovid",
     "GDPpc",      "SSPsOld",    "-",                          "-",                    "GDPoverPop",
     # GDP scenarios
     "GDP",        "SSPs",       "-",                          "-",                    "GDPpcWithPop",
     "GDP",        "SDPs",       "-",                          "-",                    "GDPpcWithPop",
+    "GDP",        "ISIMIP",     "-",                          "-",                    "GDPpcWithPop",
     "GDP",        "SSP2EU",     "Eurostat-WDI-MI",            "SSP2EU-MI",            "calibSSP2EU",
     "GDP",        "noCovid",    "-",                          "-",                    "GDPpcWithPop",
     "GDP",        "longCovid",  "-",                          "-",                    "GDPpcWithPop",