Skip to content

Commit

Permalink
Add SHAPE szenarios.
Browse files Browse the repository at this point in the history
  • Loading branch information
Loisel committed Oct 7, 2021
1 parent 5c21fdb commit 4f45857
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '15370578'
ValidationKey: '15390298'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "mrremind: MadRat REMIND Input Data Package",
"version": "0.81.3",
"version": "0.81.4",
"description": "<p>The mrremind packages contains data preprocessing for the REMIND model.<\/p>",
"creators": [
{
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: mrremind
Type: Package
Title: MadRat REMIND Input Data Package
Version: 0.81.3
Date: 2021-10-06
Version: 0.81.4
Date: 2021-10-07
Authors@R: c(person("Lavinia", "Baumstark", email = "[email protected]", role = c("aut","cre")),
person("Renato", "Rodrigues", role = "aut"),
person("Antoine", "Levesque", role = "aut"),
Expand Down
10 changes: 9 additions & 1 deletion R/calcEDGETrData.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,22 @@ calcEDGETrData <- function() {
regionmapping2use <- infoConfig$regionmapping
setConfig(regionmapping = "2b1450bc.csv")

## for all "default" SSP variants we ship the whole zoo of EDGE-T scenarios
edgetScenarios <- strsplit(cartesian(
c("SSP1", "SSP2", "SSP5", "SSP2EU", "SDP"),
c("ElecEra", "HydrHype", "Mix", "ConvCase")), split=".", fixed=TRUE)

## add both smartlifestyle and default lifestyle variants for all scenarios
allscens <- append(
## add both smartlifestyle and default lifestyle variants for all scenarios
lapply(edgetScenarios, function(sc){c(sc, TRUE)}),
lapply(edgetScenarios, function(sc){c(sc, FALSE)}))
## SHAPE scenarios are coupled to specific technologies
allscens <- append(
allscens,
list(
c("SDP_EI", "ElecEra", FALSE),
c("SDP_MC", "ElecEra", TRUE),
c("SDP_RC", "ElecEra", TRUE)))

## run EDGE-T
EDGETdata = lapply(allscens,
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MadRat REMIND Input Data Package

R package **mrremind**, version **0.81.3**
R package **mrremind**, version **0.81.4**

[![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind) [![R build status](https://github.com/pik-piam/mrremind/workflows/check/badge.svg)](https://github.com/pik-piam/mrremind/actions) [![codecov](https://codecov.io/gh/pik-piam/mrremind/branch/master/graph/badge.svg)](https://codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/ui#builds)

Expand Down Expand Up @@ -38,7 +38,7 @@ In case of questions / problems please contact Lavinia Baumstark <lavinia@pik-po

To cite package **mrremind** in publications use:

Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F (2021). _mrremind: MadRat REMIND Input Data Package_. R package version 0.81.3.
Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F (2021). _mrremind: MadRat REMIND Input Data Package_. R package version 0.81.4.

A BibTeX entry for LaTeX users is

Expand All @@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
title = {mrremind: MadRat REMIND Input Data Package},
author = {Lavinia Baumstark and Renato Rodrigues and Antoine Levesque and Julian Oeser and Christoph Bertram and Ioanna Mouratiadou and Aman Malik and Felix Schreyer and Bjoern Soergel and Marianna Rottoli and Abhijeet Mishra and Alois Dirnaichner and Michaja Pehl and Anastasis Giannousakis and David Klein and Jessica Strefler and Lukas Feldhaus and Regina Brecha and Sebastian Rauner and Jan Philipp Dietrich and Stephen Bi and Falk Benke},
year = {2021},
note = {R package version 0.81.3},
note = {R package version 0.81.4},
}
```

0 comments on commit 4f45857

Please sign in to comment.