diff --git a/DESCRIPTION b/DESCRIPTION index 57739ffc2..787f67c35 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: remind Type: Package Title: The REMIND R package -Version: 36.162.0 -Date: 2020-05-05 +Version: 36.162.1 +Date: 2020-05-06 Author: Anastasis Giannousakis, Michaja Pehl Maintainer: Anastasis Giannousakis Description: Contains the REMIND-specific routines for data and model output manipulation. @@ -43,5 +43,5 @@ RoxygenNote: 7.1.0 Suggests: testthat, sr15data -ValidationKey: 6649106940 +ValidationKey: 6649486948 VignetteBuilder: knitr diff --git a/R/reportFE.R b/R/reportFE.R index b6b844bce..810d3b999 100644 --- a/R/reportFE.R +++ b/R/reportFE.R @@ -116,6 +116,7 @@ reportFE <- function(gdx,regionSubsetList=NULL) { y <- Reduce(intersect,list(getYears(prodFE),getYears(prodSE))) prodFE <- prodFE[,y,] prodSE <- prodSE[,y,] + vm_cesIO <- vm_cesIO[,y,] vm_otherFEdemand <- vm_otherFEdemand[,y,] v33_grindrock_onfield<- v33_grindrock_onfield[,y,] @@ -130,9 +131,8 @@ reportFE <- function(gdx,regionSubsetList=NULL) { pf <- paste0(getNames(vm_cesIO), '.offset_quantity') offset <- collapseNames(pm_cesdata[,,pf]) * TWa_2_EJ vm_cesIO = vm_cesIO + offset[,y,getNames(vm_cesIO)] - } else { - # old gdxes don't have offset_quantities - vm_cesIO <- vm_cesIO[,y,] + } + } #--- Stationary Module ---