merge master branch

.buildlibrary

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

CITATION.cff

@@ -3,7 +3,7 @@ message: If you use this software, please cite it using the metadata from this f
 type: software
 title: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model'
 version: 2.12.3
-date-released: '2024-12-18'
+date-released: '2024-12-20'
 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

@@ -19,7 +19,7 @@ Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.3.2
 VignetteBuilder: knitr
-Date: 2024-12-18
+Date: 2024-12-20
 Config/testthat/edition: 3
 Imports:
     rmndt,

R/toolEdgeTransportSA.R

@@ -52,6 +52,9 @@ toolEdgeTransportSA <- function(SSPscen,
   if (is.null(outputFolder) & isStored) stop("Please provide an outputfolder to store your results")
 
   inputs <- toolLoadInputs(SSPscen, transportPolScen, demScen, gdxPath, hybridElecShare)
+  if (is.null(gdxPath)) {gdxPath <- file.path(getConfig("sourcefolder"),
+                                              "REMINDinputForTransportStandalone", "v1.2", "fulldata.gdx")}
+  if (!file.exists(gdxPath)) stop("Please provide valid path to REMIND fulldata.gdx as input for fuel costs")
 
   helpers <- inputs$helpers
   genModelPar <- inputs$genModelPar

README.md

@@ -54,7 +54,7 @@ A BibTeX entry for LaTeX users is
 @Misc{,
   title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model},
   author = {Johanna Hoppe and Alois Dirnaichner and Marianna Rottoli and Jarusch Muessel},
-  date = {2024-12-18},
+  date = {2024-12-20},
   year = {2024},
   url = {https://github.com/pik-piam/edgeTransport},
   note = {Version: 2.12.3},