Merge pull request pik-piam#466 from fbenke-pik/ember

update Ember

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '34578748'
+ValidationKey: '34603752'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

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: 'mrremind: MadRat REMIND Input Data Package'
-version: 0.175.1
-date-released: '2024-01-26'
+version: 0.175.2
+date-released: '2024-01-29'
 abstract: The mrremind packages contains data preprocessing for the REMIND model.
 authors:
 - family-names: Baumstark

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrremind
 Title: MadRat REMIND Input Data Package
-Version: 0.175.1
-Date: 2024-01-26
+Version: 0.175.2
+Date: 2024-01-29
 Authors@R: c(
     person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
     person("Renato", "Rodrigues", role = "aut"),

R/calcEmber.R

@@ -41,7 +41,7 @@ calcEmber <- function(subtype = "all") {
   }
 
   # load and apply mapping to chosen variables
-  map <- toolGetMapping("Mapping_Ember.csv", type = "reportingVariables", where = "mappingfolder") %>%
+  map <- toolGetMapping("Mapping_Ember.csv", type = "reportingVariables", where = "mrremind") %>%
     filter(!is.na(!!sym("REMIND_Variable")), !!sym("REMIND_Variable") != "")  # remove incomplete mapping rows
 
   # combine variable and unit in mapping

R/readEmber.R

@@ -14,7 +14,7 @@
 
 readEmber <- function() {
   filename <- "yearly_full_release_long_format.csv"
-  df <- read.csv(filename)
+  df <- read.csv(file.path("2024", filename))
 
   # filter out aggregated regions by only choosing rows that don't have a blank country.code
   df <- df[df$Country.code != "", ]

README.md

@@ -1,6 +1,6 @@
 # MadRat REMIND Input Data Package
 
-R package **mrremind**, version **0.175.1**
+R package **mrremind**, version **0.175.2**
 
 [![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)
 
@@ -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 (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.175.1, <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 (2024). _mrremind: MadRat REMIND Input Data Package_. R package version 0.175.2, <https://github.com/pik-piam/mrremind>.
 
 A BibTeX entry for LaTeX users is
 
@@ -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},
   year = {2024},
-  note = {R package version 0.175.1},
+  note = {R package version 0.175.2},
   url = {https://github.com/pik-piam/mrremind},
 }
 ```

inst/extdata/reportingVariables/Mapping_Ember.csv

@@ -0,0 +1,67 @@
+Variable;Unit;REMIND_Variable;REMIND_Unit;Comment;Factor
+Capacity|Aggregate fuel|Clean;GW;;;;
+Capacity|Aggregate fuel|Fossil;GW;;;;
+Capacity|Aggregate fuel|Gas and Other Fossil;GW;;;;
+Capacity|Aggregate fuel|Hydro, Bioenergy and Other Renewables;GW;;;;
+Capacity|Aggregate fuel|Renewables;GW;;;;
+Capacity|Aggregate fuel|Wind and Solar;GW;;;;
+Capacity|Fuel|Bioenergy;GW;Cap|Electricity|Biomass;GW;better use � w/o CC?;1
+Capacity|Fuel|Coal;GW;Cap|Electricity|Coal;GW;;1
+Capacity|Fuel|Gas;GW;Cap|Electricity|Gas;GW;;1
+Capacity|Fuel|Hydro;GW;Cap|Electricity|Hydro;GW;;1
+Capacity|Fuel|Nuclear;GW;Cap|Electricity|Nuclear;GW;;1
+Capacity|Fuel|Other Fossil;GW;Cap|Electricity|Oil;GW;Assume to be all oil;1
+Capacity|Fuel|Other Renewables;GW;;;could add sum of other renewables, Geothermal + Hydrogen?;
+Capacity|Fuel|Solar;GW;Cap|Electricity|Solar;GW;;1
+Capacity|Fuel|Wind;GW;Cap|Electricity|Wind;GW;;1
+Electricity demand|Demand|Demand;TWh;;;;
+Electricity demand|Demand per capita|Demand per capita;MWh;;;;
+Electricity generation|Aggregate fuel|Clean;%;;;;
+Electricity generation|Aggregate fuel|Fossil;%;;;;
+Electricity generation|Aggregate fuel|Gas and Other Fossil;%;;;;
+Electricity generation|Aggregate fuel|Hydro, Bioenergy and Other Renewables;%;;;;
+Electricity generation|Aggregate fuel|Renewables;%;;;;
+Electricity generation|Aggregate fuel|Wind and Solar;%;;;;
+Electricity generation|Aggregate fuel|Clean;TWh;;;;
+Electricity generation|Aggregate fuel|Fossil;TWh;;;;
+Electricity generation|Aggregate fuel|Gas and Other Fossil;TWh;;;;
+Electricity generation|Aggregate fuel|Hydro, Bioenergy and Other Renewables;TWh;;;;
+Electricity generation|Aggregate fuel|Renewables;TWh;;;;
+Electricity generation|Aggregate fuel|Wind and Solar;TWh;;;;
+Electricity generation|Fuel|Bioenergy;%;;;;
+Electricity generation|Fuel|Coal;%;;;;
+Electricity generation|Fuel|Gas;%;;;;
+Electricity generation|Fuel|Hydro;%;;;;
+Electricity generation|Fuel|Nuclear;%;;;;
+Electricity generation|Fuel|Other Fossil;%;;;;
+Electricity generation|Fuel|Other Renewables;%;;;;
+Electricity generation|Fuel|Solar;%;;;;
+Electricity generation|Fuel|Wind;%;;;;
+Electricity generation|Fuel|Bioenergy;TWh;SE|Electricity|Biomass;EJ/yr;;0.0036
+Electricity generation|Fuel|Coal;TWh;SE|Electricity|Coal;EJ/yr;;0.0036
+Electricity generation|Fuel|Gas;TWh;SE|Electricity|Gas;EJ/yr;;0.0036
+Electricity generation|Fuel|Hydro;TWh;SE|Electricity|Hydro;EJ/yr;;0.0036
+Electricity generation|Fuel|Nuclear;TWh;SE|Electricity|Nuclear;EJ/yr;;0.0036
+Electricity generation|Fuel|Other Fossil;TWh;;;SE|Electricity|+|Oil ?;
+Electricity generation|Fuel|Other Renewables;TWh;;;SE|Electricity|+|Hydrogen ? SE|Electricity|+|Geothermal;
+Electricity generation|Fuel|Solar;TWh;SE|Electricity|Solar;EJ/yr;;0.0036
+Electricity generation|Fuel|Wind;TWh;SE|Electricity|Wind;EJ/yr;;0.0036
+Electricity generation|Total|Total Generation;TWh;SE|Electricity;EJ/yr;;0.0036
+Electricity imports|Electricity imports|Net Imports;TWh;;;;
+Power sector emissions|Aggregate fuel|Clean;mtCO2;;;actually is CO2eq;
+Power sector emissions|Aggregate fuel|Fossil;mtCO2;;;;
+Power sector emissions|Aggregate fuel|Gas and Other Fossil;mtCO2;;;;
+Power sector emissions|Aggregate fuel|Hydro, Bioenergy and Other Renewables;mtCO2;;;;
+Power sector emissions|Aggregate fuel|Renewables;mtCO2;;;;
+Power sector emissions|Aggregate fuel|Wind and Solar;mtCO2;;;;
+Power sector emissions|CO2 intensity|CO2 intensity;gCO2/kWh;;;;
+Power sector emissions|Fuel|Bioenergy;mtCO2;;;;
+Power sector emissions|Fuel|Coal;mtCO2;;;;
+Power sector emissions|Fuel|Gas;mtCO2;;;;
+Power sector emissions|Fuel|Hydro;mtCO2;;;;
+Power sector emissions|Fuel|Nuclear;mtCO2;;;;
+Power sector emissions|Fuel|Other Fossil;mtCO2;;;;
+Power sector emissions|Fuel|Other Renewables;mtCO2;;;;
+Power sector emissions|Fuel|Solar;mtCO2;;;;
+Power sector emissions|Fuel|Wind;mtCO2;;;;
+Power sector emissions|Total|Total emissions;mtCO2;Emi|CO2|Energy|Supply|Electricity w/ couple prod;Mt CO2eq/yr;;1