Skip to content

Commit

Permalink
fix remindmodel#41 filter vm_cesIO for unused periods before doing an…
Browse files Browse the repository at this point in the history
…y calculations
  • Loading branch information
0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q committed May 6, 2020
1 parent 6510589 commit a990898
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 <giannou@pik-potsdam.de>
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
6 changes: 3 additions & 3 deletions R/reportFE.R
Original file line number Diff line number Diff line change
@@ -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 ---

0 comments on commit a990898

Please sign in to comment.