Regionalised demand scenarios used in Ikea (#278)

* add demDiverge scenario: Global North has demRedStrong factors f, Emerging regions have 1-f, others stay at 1

* build

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '5194020'
+ValidationKey: '5214258'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

CITATION.cff

@@ -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: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model'
-version: 2.6.0
-date-released: '2024-09-11'
+version: 2.6.1
+date-released: '2024-09-12'
 abstract: EDGE-T is a fork of the GCAM transport module https://jgcri.github.io/gcam-doc/energy.html#transportation
   with a high level of detail in its representation of technological and modal options.
   It is a partial equilibrium model with a nested multinomial logit structure and

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: edgeTransport
 Title: Prepare EDGE Transport Data for the REMIND model
-Version: 2.6.0
+Version: 2.6.1
 Authors@R: c(
     person("Johanna", "Hoppe", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0009-0004-6753-5090")),
@@ -18,7 +18,7 @@ Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.3.2
 VignetteBuilder: knitr
-Date: 2024-09-11
+Date: 2024-09-12
 Config/testthat/edition: 3
 Imports:
     rmndt,

README.md

@@ -1,6 +1,6 @@
 # Prepare EDGE Transport Data for the REMIND model
 
-R package **edgeTransport**, version **2.6.0**
+R package **edgeTransport**, version **2.6.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/edgeTransport)](https://cran.r-project.org/package=edgeTransport)  [![R build status](https://github.com/pik-piam/edgeTransport/workflows/check/badge.svg)](https://github.com/pik-piam/edgeTransport/actions) [![codecov](https://codecov.io/gh/pik-piam/edgeTransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/edgeTransport) [![r-universe](https://pik-piam.r-universe.dev/badges/edgeTransport)](https://pik-piam.r-universe.dev/builds)
 
@@ -46,7 +46,7 @@ In case of questions / problems please contact Johanna Hoppe <johanna.hoppe@pik-
 
 To cite package **edgeTransport** in publications use:
 
-Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.6.0, <https://github.com/pik-piam/edgeTransport>.
+Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.6.1, <https://github.com/pik-piam/edgeTransport>.
 
 A BibTeX entry for LaTeX users is
 
@@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is
   title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model},
   author = {Johanna Hoppe and Alois Dirnaichner and Marianna Rottoli and Jarusch Muessel},
   year = {2024},
-  note = {R package version 2.6.0},
+  note = {R package version 2.6.1},
   url = {https://github.com/pik-piam/edgeTransport},
 }
 ```

inst/extdata/scenParDemFactors.csv

@@ -251,3 +251,87 @@ SSP2EU_demRedLow;REF;trn_pass;2050;0.98
 SSP2EU_demRedLow;SSA;trn_pass;2050;0.98
 SSP2EU_demRedLow;UKI;trn_pass;2050;0.98
 SSP2EU_demRedLow;USA;trn_pass;2050;0.98
+SSP2_demDiffer;CAZ;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;CHA;trn_aviation_intl;2040;1
+SSP2_demDiffer;DEU;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;ECE;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;ECS;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;ENC;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;ESC;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;ESW;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;EWN;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;FRA;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;IND;trn_aviation_intl;2040;1.3
+SSP2_demDiffer;JPN;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;LAM;trn_aviation_intl;2040;1.3
+SSP2_demDiffer;MEA;trn_aviation_intl;2040;1
+SSP2_demDiffer;NEN;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;NES;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;OAS;trn_aviation_intl;2040;1.3
+SSP2_demDiffer;REF;trn_aviation_intl;2040;1
+SSP2_demDiffer;SSA;trn_aviation_intl;2040;1.3
+SSP2_demDiffer;UKI;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;USA;trn_aviation_intl;2040;0.7
+SSP2_demDiffer;CAZ;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;CHA;trn_shipping_intl;2040;1
+SSP2_demDiffer;DEU;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;ECE;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;ECS;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;ENC;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;ESC;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;ESW;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;EWN;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;FRA;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;IND;trn_shipping_intl;2040;1.1
+SSP2_demDiffer;JPN;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;LAM;trn_shipping_intl;2040;1.1
+SSP2_demDiffer;MEA;trn_shipping_intl;2040;1
+SSP2_demDiffer;NEN;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;NES;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;OAS;trn_shipping_intl;2040;1.1
+SSP2_demDiffer;REF;trn_shipping_intl;2040;1
+SSP2_demDiffer;SSA;trn_shipping_intl;2040;1.1
+SSP2_demDiffer;UKI;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;USA;trn_shipping_intl;2040;0.9
+SSP2_demDiffer;CAZ;trn_freight;2040;0.82
+SSP2_demDiffer;CHA;trn_freight;2040;1
+SSP2_demDiffer;DEU;trn_freight;2040;0.82
+SSP2_demDiffer;ECE;trn_freight;2040;0.82
+SSP2_demDiffer;ECS;trn_freight;2040;0.82
+SSP2_demDiffer;ENC;trn_freight;2040;0.82
+SSP2_demDiffer;ESC;trn_freight;2040;0.82
+SSP2_demDiffer;ESW;trn_freight;2040;0.82
+SSP2_demDiffer;EWN;trn_freight;2040;0.82
+SSP2_demDiffer;FRA;trn_freight;2040;0.82
+SSP2_demDiffer;IND;trn_freight;2040;1.18
+SSP2_demDiffer;JPN;trn_freight;2040;0.82
+SSP2_demDiffer;LAM;trn_freight;2040;1.18
+SSP2_demDiffer;MEA;trn_freight;2040;1
+SSP2_demDiffer;NEN;trn_freight;2040;0.82
+SSP2_demDiffer;NES;trn_freight;2040;0.82
+SSP2_demDiffer;OAS;trn_freight;2040;1.18
+SSP2_demDiffer;REF;trn_freight;2040;1
+SSP2_demDiffer;SSA;trn_freight;2040;1.18
+SSP2_demDiffer;UKI;trn_freight;2040;0.82
+SSP2_demDiffer;USA;trn_freight;2040;0.82
+SSP2_demDiffer;CAZ;trn_pass;2040;0.92
+SSP2_demDiffer;CHA;trn_pass;2040;1
+SSP2_demDiffer;DEU;trn_pass;2040;0.92
+SSP2_demDiffer;ECE;trn_pass;2040;0.92
+SSP2_demDiffer;ECS;trn_pass;2040;0.92
+SSP2_demDiffer;ENC;trn_pass;2040;0.92
+SSP2_demDiffer;ESC;trn_pass;2040;0.92
+SSP2_demDiffer;ESW;trn_pass;2040;0.92
+SSP2_demDiffer;EWN;trn_pass;2040;0.92
+SSP2_demDiffer;FRA;trn_pass;2040;0.92
+SSP2_demDiffer;IND;trn_pass;2040;1.08
+SSP2_demDiffer;JPN;trn_pass;2040;0.92
+SSP2_demDiffer;LAM;trn_pass;2040;1.08
+SSP2_demDiffer;MEA;trn_pass;2040;1
+SSP2_demDiffer;NEN;trn_pass;2040;0.92
+SSP2_demDiffer;NES;trn_pass;2040;0.92
+SSP2_demDiffer;OAS;trn_pass;2040;1.08
+SSP2_demDiffer;REF;trn_pass;2040;1
+SSP2_demDiffer;SSA;trn_pass;2040;1.08
+SSP2_demDiffer;UKI;trn_pass;2040;0.92
+SSP2_demDiffer;USA;trn_pass;2040;0.92