Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update scenarios SSP3, SSP2 #547

Merged
merged 6 commits into from
Sep 18, 2024
Merged

update scenarios SSP3, SSP2 #547

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0629bb3
refactor transport mrremind functions
johannah-pik Feb 28, 2024
73acb1a
update readEDGEtransport
johannah-pik Feb 28, 2024
014be51
Update readEDGETransport.R
johannah-pik Feb 28, 2024
234e5b0
Merge branch 'master' of https://github.com/pik-piam/mrremind
johannah-pik Sep 17, 2024
89b41c4
add SSP3
johannah-pik Sep 17, 2024
be458c5
fix linter
johannah-pik Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '37758420'
ValidationKey: '37967700'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cff-version: 1.2.0
message: If you use this software, please cite it using the metadata from this file.
type: software
title: 'mrremind: MadRat REMIND Input Data Package'
version: 0.189.0
date-released: '2024-09-12'
version: 0.190.0
date-released: '2024-09-17'
abstract: The mrremind packages contains data preprocessing for the REMIND model.
authors:
- family-names: Baumstark
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Type: Package
Package: mrremind
Title: MadRat REMIND Input Data Package
Version: 0.189.0
Date: 2024-09-12
Version: 0.190.0
Date: 2024-09-17
Authors@R: c(
person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
person("Renato", "Rodrigues", role = "aut"),
Expand Down
52 changes: 28 additions & 24 deletions R/readEDGETransport.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,39 @@ readEDGETransport <- function(subtype) {
## for all "default" SSP variants we ship the whole zoo of standard
## EDGE-T scenarios
expand_grid(
SSPscen = c("SSP1", "SSP2", "SSP5", "SSP2EU", "SDP"),
SSPscen = c("SSP2", "SSP3","SSP5", "SDP"),
transportPolScen = c("Mix1", "Mix2", "Mix3", "Mix4"),
isICEban = c(TRUE, FALSE),
demScen = c("default")),
# Specific project scenarios
tribble(
~SSPscen, ~transportPolScen, ~isICEban, ~demScen,
'SSP2', 'Mix1', FALSE, 'SSP2EU_demRedStrong',
'SSP2', 'Mix2', FALSE, 'SSP2EU_demRedStrong',
'SSP2', 'Mix3', TRUE, 'SSP2EU_demRedStrong',
'SSP2', 'Mix4', TRUE, 'SSP2EU_demRedStrong',
'SSP2', 'Mix4', TRUE, 'SSP2_demDiffer',
'SDP_EI', 'Mix4', TRUE, 'default',
'SDP_MC', 'Mix4', TRUE, 'default',
'SDP_RC', 'Mix3', TRUE, 'default',
'SSP2EU', 'HydrHype4', TRUE, 'default',
'SSP2EU', 'ECEMF_HighEl_HighEff', TRUE, 'default',
'SSP2EU', 'ECEMF_HighEl_LifestCha', TRUE, 'SSP2EU_demRedStrong',
'SSP2EU', 'ECEMF_HighEl_ModEff', TRUE, 'default',
'SSP2EU', 'ECEMF_HighH2_HighEff', TRUE, 'default',
'SSP2EU', 'ECEMF_HighH2_LifestCha', TRUE, 'SSP2EU_demRedStrong',
'SSP2EU', 'ECEMF_HighH2_ModEff', TRUE, 'default',
'SSP2EU', 'NAV_act', FALSE, 'SSP2EU_demRedStrong',
'SSP2EU', 'NAV_tec', FALSE, 'default',
'SSP2EU', 'NAV_ele', TRUE, 'default',
'SSP2EU', 'NAV_all', TRUE, 'SSP2EU_demRedStrong',
'SSP2EU', 'NAV_lce', FALSE, 'SSP2EU_demRedStrong',
'SSP2EU', 'CAMP_lscWeak', TRUE, 'SSP2EU_demRedWeak',
'SSP2EU', 'CAMP_lscStrong', TRUE, 'SSP2EU_demRedStrong'
~SSPscen, ~transportPolScen, ~isICEban, ~demScen,
'SSP1', 'Mix1', FALSE, 'default',
'SSP1', 'Mix2', FALSE, 'default',
'SSP1', 'Mix3', TRUE, 'default',
'SSP1', 'Mix4', TRUE, 'default',
'SSP2', 'Mix1', FALSE, 'SSP2_demRedStrong',
'SSP2', 'Mix2', FALSE, 'SSP2_demRedStrong',
'SSP2', 'Mix3', TRUE, 'SSP2_demRedStrong',
'SSP2', 'Mix4', TRUE, 'SSP2_demRedStrong',
'SSP2', 'Mix4', TRUE, 'SSP2_demDiffer',
'SDP_EI', 'Mix4', TRUE, 'default',
'SDP_MC', 'Mix4', TRUE, 'default',
'SDP_RC', 'Mix3', TRUE, 'default',
'SSP2', 'HydrHype4', TRUE, 'default',
'SSP2', 'ECEMF_HighEl_HighEff', TRUE, 'default',
'SSP2', 'ECEMF_HighEl_LifestCha', TRUE, 'SSP2_demRedStrong',
'SSP2', 'ECEMF_HighEl_ModEff', TRUE, 'default',
'SSP2', 'ECEMF_HighH2_HighEff', TRUE, 'default',
'SSP2', 'ECEMF_HighH2_LifestCha', TRUE, 'SSP2_demRedStrong',
'SSP2', 'ECEMF_HighH2_ModEff', TRUE, 'default',
'SSP2', 'NAV_act', FALSE, 'SSP2_demRedStrong',
'SSP2', 'NAV_tec', FALSE, 'default',
'SSP2', 'NAV_ele', TRUE, 'default',
'SSP2', 'NAV_all', TRUE, 'SSP2_demRedStrong',
'SSP2', 'NAV_lce', FALSE, 'SSP2_demRedStrong',
'SSP2', 'CAMP_lscWeak', TRUE, 'SSP2_demRedWeak',
'SSP2', 'CAMP_lscStrong', TRUE, 'SSP2_demRedStrong'
)
)

Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MadRat REMIND Input Data Package

R package **mrremind**, version **0.189.0**
R package **mrremind**, version **0.190.0**

[![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://app.codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -39,7 +39,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, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.189.0, <https://github.com/pik-piam/mrremind>.
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, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R, Koch J (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.190.0, <https://github.com/pik-piam/mrremind>.

A BibTeX entry for LaTeX users is

Expand All @@ -48,7 +48,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 and Pascal Weigmann and Oliver Richters and Robin Hasse and Sophie Fuchs and Rahel Mandaroux and Johannes Koch},
year = {2024},
note = {R package version 0.189.0},
note = {R package version 0.190.0},
url = {https://github.com/pik-piam/mrremind},
}
```
Loading