Merge pull request #166 from orichters/sectoralCO2tax

reporting for sector-differentiated CO2 taxes for NGFS project
pik-piam · Jan 25, 2022 · 555634c · 555634c
2 parents d1c3148 + f4e50bd
commit 555634c
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 80 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,10 +1,11 @@
-ValidationKey: '32728257'
+ValidationKey: '32899410'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'
 - .*qpdf.* is needed for checks on size reduction of PDFs
 AcceptedNotes:
 - Imports includes .* non-default packages.
 - unable to verify current time
+- checking installed package size
 AutocreateReadme: yes
 allowLinterWarnings: yes
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
   "title": "remind2: The REMIND R package (2nd generation)",
-  "version": "1.72.1",
+  "version": "1.73.0",
   "description": "<p>Contains the REMIND-specific routines for data and model output manipulation.<\/p>",
   "creators": [
     {

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: remind2
 Type: Package
 Title: The REMIND R package (2nd generation)
-Version: 1.72.1
+Version: 1.73.0
 Date: 2022-01-25
 Authors@R: as.person(c(
     "Renato Rodrigues <renato.rodrigues@pik-potsdam.de> [aut,cre]"))

diff --git a/NAMESPACE b/NAMESPACE
@@ -68,6 +68,7 @@ export(reportTrade)
 export(toolRegionSubsets)
 export(validationREMIND)
 export(validationSummary)
+import(magclass)
 importFrom(RColorBrewer,brewer.pal)
 importFrom(abind,abind)
 importFrom(assertr,assert)

diff --git a/R/reportFE.R b/R/reportFE.R
@@ -71,7 +71,7 @@ reportFE <- function(gdx, regionSubsetList = NULL,
   vm_demFeSector[is.na(vm_demFeSector)] <- 0
 
   # only retain combinations of SE, FE, sector, and emiMkt which actually exist in the model (see qm_balFe)
-  vm_demFeSector_new <- vm_demFeSector[demFemapping]
+  vm_demFeSector <- vm_demFeSector[demFemapping]
 
   # only retain combinations of SE, FE, te which actually exist in the model (qm_balFe)
   vm_prodFe <- vm_prodFe[se2fe]

diff --git a/R/reportPrices.R b/R/reportPrices.R
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.72.1**
+R package **remind2**, version **1.73.0**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2)  [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/ui#builds)
 
@@ -47,7 +47,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R (2022). _remind2: The REMIND R package (2nd generation)_. R package version 1.72.1, <URL: https://github.com/pik-piam/remind2>.
+Rodrigues R (2022). _remind2: The REMIND R package (2nd generation)_. R package version 1.73.0, <URL: https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is
   title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues},
   year = {2022},
-  note = {R package version 1.72.1},
+  note = {R package version 1.73.0},
   url = {https://github.com/pik-piam/remind2},
 }
 ```