Add NAV_lce scenario.

robinhasse · Jan 17, 2023 · dda0dc2 · dda0dc2
1 parent 6d5b00a
commit dda0dc2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/R/calcFEdemand.R b/R/calcFEdemand.R
@@ -1975,7 +1975,7 @@ calcFEdemand <- function(subtype = "FE") {
         mselect(reminditems, scenario = navigateScenarios, item = nonIndustryItems),
         addDim(mselect(reminditems, scenario = "gdp_SSP2EU", item = industryItems,
                        collapseNames = TRUE),
-               paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "all")),
+               paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "lce", "all")),
                "scenario", 3.1)
       )
     }

diff --git a/R/convertEDGE.R b/R/convertEDGE.R
@@ -18,7 +18,7 @@ convertEDGE <- function(x, subtype = "FE_stationary") {
   addSSPnames <- function(x) {
     do.call("mbind", lapply(c(paste0("SSP", c(1:5, "2EU", "2_lowEn")),
                               paste0("SDP", c("", "_EI", "_RC", "_MC")),
-                              paste0("SSP2EU_NAV_", c("act", "tec", "ele", "all"))),
+                              paste0("SSP2EU_NAV_", c("act", "tec", "ele", "lce", "all"))),
       function(s) setNames(x, paste(s, getNames(x), sep = "."))
     ))
   }
@@ -89,7 +89,7 @@ convertEDGE <- function(x, subtype = "FE_stationary") {
     # duplicate SSP2 for SSP2_lowEn an SSP2EU for Navigate scenarios
     wg <- mbind(
       wg,
-      do.call("mbind", lapply(paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "all")),
+      do.call("mbind", lapply(paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "lce", "all")),
                               function(navScen) {
                                 setItems(wg[,, "gdp_SSP2EU"], 3, navScen)
                               })),
@@ -319,7 +319,7 @@ convertEDGE <- function(x, subtype = "FE_stationary") {
     # duplicate SSP2 for SSP2_lowEn an SSP2EU for Navigate scenarios
     wg <- mbind(
       wg,
-      do.call("mbind", lapply(paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "all")),
+      do.call("mbind", lapply(paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "lce", "all")),
                               function(navScen) {
                                 setItems(wg[,, "gdp_SSP2EU"], 3, navScen)
                               })),
@@ -344,7 +344,7 @@ convertEDGE <- function(x, subtype = "FE_stationary") {
     # duplicate SSP2 for SSP2_lowEn an SSP2EU for Navigate scenarios
     wp <- mbind(
       wp,
-      do.call("mbind", lapply(paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "all")),
+      do.call("mbind", lapply(paste0("gdp_SSP2EU_NAV_", c("act", "tec", "ele", "lce", "all")),
                               function(navScen) {
                                 setItems(wp[,, "gdp_SSP2EU"], 3, navScen)
                               })),

diff --git a/R/readEDGE.R b/R/readEDGE.R
@@ -33,7 +33,8 @@ readEDGE <- function(subtype = c("FE_stationary", "FE_buildings", "Capital", "Ca
       # duplicate: SSP2 -> SSP2EU, SSP2_lowEn and SSP1 -> SDPs
       mstationarySPP2s <- addDim(
         mselect(mstationary, scenario = "SSP2", collapseNames = TRUE),
-        c("SSP2EU", "SSP2_lowEn", "SSP2EU_NAV_act", "SSP2EU_NAV_tec", "SSP2EU_NAV_ele", "SSP2EU_NAV_all"),
+        c("SSP2EU", "SSP2_lowEn", "SSP2EU_NAV_act", "SSP2EU_NAV_tec",
+        "SSP2EU_NAV_ele", "SSP2EU_NAV_lce", "SSP2EU_NAV_all"),
         "scenario", 3.1)
       mstationarySDPs <- addDim(
         mselect(mstationary, scenario = "SSP1", collapseNames = TRUE),