From 89d5628f1ec2064eded384e465983f55c4fe7e27 Mon Sep 17 00:00:00 2001
From: johannah-pik <89136160+johannah-pik@users.noreply.github.com>
Date: Mon, 4 Nov 2024 16:09:30 +0100
Subject: [PATCH] add unsaved file

---
 .buildlibrary                |  2 +-
 CITATION.cff                 |  2 +-
 DESCRIPTION                  |  2 +-
 R/iterativeEDGETransport.R   |  2 +-
 README.md                    |  6 +++---
 man/toolCalculateFVdemand.Rd | 34 ++++++++++++++++++++++++++++++++++
 6 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 man/toolCalculateFVdemand.Rd

diff --git a/.buildlibrary b/.buildlibrary
index a7c9097..93afadb 100644
--- a/.buildlibrary
+++ b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '5628711'
+ValidationKey: '5648742'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
diff --git a/CITATION.cff b/CITATION.cff
index edc0eb6..aae166d 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -2,7 +2,7 @@ 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.8.1
+version: 2.8.2
 date-released: '2024-11-04'
 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.
diff --git a/DESCRIPTION b/DESCRIPTION
index 1b2d4fa..17b6c7d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: edgeTransport
 Title: Prepare EDGE Transport Data for the REMIND model
-Version: 2.8.1
+Version: 2.8.2
 Authors@R: c(
     person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"),
            comment = c(ORCID = "0009-0004-6753-5090")),
diff --git a/R/iterativeEDGETransport.R b/R/iterativeEDGETransport.R
index 505ad1a..4ceeef9 100644
--- a/R/iterativeEDGETransport.R
+++ b/R/iterativeEDGETransport.R
@@ -216,7 +216,7 @@ iterativeEdgeTransport <- function() {
       hybridElecShare = hybridElecShare,
       fleetSizeAndComposition = fleetSizeAndComposition,
       endogenousCosts = endogenousCosts,
-      vehSalesAndModeShares = vehSalesAndModeShares,
+      vehSalesAndModeShares = vehSalesAndModeShares$shares,
       ESdemandFVsalesLevel = ESdemandFVsalesLevel,
       helpers = helpers
     )
diff --git a/README.md b/README.md
index 5415c58..07372f8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Prepare EDGE Transport Data for the REMIND model
 
-R package **edgeTransport**, version **2.8.1**
+R package **edgeTransport**, version **2.8.2**
 
 [![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.8.1, <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.8.2, <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.8.1},
+  note = {R package version 2.8.2},
   url = {https://github.com/pik-piam/edgeTransport},
 }
 ```
diff --git a/man/toolCalculateFVdemand.Rd b/man/toolCalculateFVdemand.Rd
new file mode 100644
index 0000000..eeda359
--- /dev/null
+++ b/man/toolCalculateFVdemand.Rd
@@ -0,0 +1,34 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/toolCalculateFVdemand.R
+\name{toolCalculateFVdemand}
+\alias{toolCalculateFVdemand}
+\title{Calculate eneryg service demand on fuel vehicle level}
+\usage{
+toolCalculateFVdemand(
+  sectorESdemand,
+  salesAndModeShares,
+  helpers,
+  histESdemand = NULL,
+  baseYear = NULL
+)
+}
+\arguments{
+\item{sectorESdemand}{energy service demand on CES node level}
+
+\item{salesAndModeShares}{vehicle sales and mode shares}
+
+\item{helpers}{List with helpers}
+
+\item{histESdemand}{historcial energy service demand for iterative EDGE-T}
+
+\item{baseYear}{ned year of historical energy service demand}
+}
+\value{
+data.table
+}
+\description{
+Calculate eneryg service demand on fuel vehicle level
+}
+\author{
+Johanna Hoppe
+}