Merge pull request #20 from 0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q/dev/move…

…_structure_mappings

move structuremappingFE_PFU to package

.Rbuildignore

@@ -11,3 +11,4 @@
 ^tests/.lintr$
 ^Makefile$
 ^.*CITATION.cff$
+^\.git$

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '606081'
+ValidationKey: '786800'
 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: 'mredgebuildings: Prepare data to be used by the EDGE-Buildings model'
-version: 0.3.1
-date-released: '2023-07-13'
+version: 0.4.0
+date-released: '2023-11-09'
 abstract: Prepare data to be used by the EDGE-Buildings model.
 authors:
 - family-names: Hasse

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mredgebuildings
 Title: Prepare data to be used by the EDGE-Buildings model
-Version: 0.3.1
-Date: 2023-07-13
+Version: 0.4.0
+Date: 2023-11-09
 Authors@R: c(
     person("Robin", "Hasse", , "robin.hasse@pik-potsdam.de", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1818-3186")),

R/calcIEAPFU.R

@@ -23,8 +23,8 @@ calcIEAPFU <- function() {
 
   mapping <- toolGetMapping(type = "sectoral",
                             name = "structuremappingFE_PFU.csv",
-                            returnPathOnly = TRUE,
-                            where = "mappingfolder") %>%
+                            where = "mredgebuildings",
+                            returnPathOnly = TRUE) %>%
     read.csv2(stringsAsFactors = FALSE, na.strings = "") %>%
     select("iea_product", "iea_flows", "pfu") %>%
     na.omit()

README.md

@@ -1,6 +1,6 @@
 # Prepare data to be used by the EDGE-Buildings model
 
-R package **mredgebuildings**, version **0.3.1**
+R package **mredgebuildings**, version **0.4.0**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mredgebuildings)](https://cran.r-project.org/package=mredgebuildings)  [![R build status](https://github.com/pik-piam/mredgebuildings/workflows/check/badge.svg)](https://github.com/pik-piam/mredgebuildings/actions) [![codecov](https://codecov.io/gh/pik-piam/mredgebuildings/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mredgebuildings) [![r-universe](https://pik-piam.r-universe.dev/badges/mredgebuildings)](https://pik-piam.r-universe.dev/builds)
 
@@ -38,7 +38,7 @@ In case of questions / problems please contact Robin Hasse <robin.hasse@pik-pots
 
 To cite package **mredgebuildings** in publications use:
 
-Hasse R, Führlich P, Levesque A, Tockhorn H (2023). _mredgebuildings: Prepare data to be used by the EDGE-Buildings model_. R package version 0.3.1, <https://github.com/pik-piam/mredgebuildings>.
+Hasse R, Führlich P, Levesque A, Tockhorn H (2023). _mredgebuildings: Prepare data to be used by the EDGE-Buildings model_. R package version 0.4.0, <https://github.com/pik-piam/mredgebuildings>.
 
 A BibTeX entry for LaTeX users is
 
@@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
   title = {mredgebuildings: Prepare data to be used by the EDGE-Buildings model},
   author = {Robin Hasse and Pascal Führlich and Antoine Levesque and Hagen Tockhorn},
   year = {2023},
-  note = {R package version 0.3.1},
+  note = {R package version 0.4.0},
   url = {https://github.com/pik-piam/mredgebuildings},
 }
 ```

inst/extdata/sectoral/structuremappingFE_PFU.csv

@@ -0,0 +1,257 @@
+iea_product;iea_flows;pfu
+CRUDEOIL;RESIDENT;Petroleum Products
+NGL;RESIDENT;Petroleum Products
+CRNGFEED;RESIDENT;Petroleum Products
+NONBIODIES;RESIDENT;Petroleum Products
+OTHKERO;RESIDENT;Petroleum Products
+RESFUEL;RESIDENT;Petroleum Products
+AVGAS;RESIDENT;Petroleum Products
+JETGAS;RESIDENT;Petroleum Products
+JETKERO;RESIDENT;Petroleum Products
+NONBIOJETK;RESIDENT;Petroleum Products
+REFINGAS;RESIDENT;Petroleum Products
+PARWAX;RESIDENT;Petroleum Products
+ONONSPEC;RESIDENT;Petroleum Products
+WHITESP;RESIDENT;Petroleum Products
+NAPHTHA;RESIDENT;Petroleum Products
+BITUMEN;RESIDENT;Petroleum Products
+LUBRIC;RESIDENT;Petroleum Products
+NONBIOGASO;RESIDENT;Petroleum Products
+REFFEEDS;RESIDENT;Petroleum Products
+NONCRUDE;RESIDENT;Petroleum Products
+OILSHALE;RESIDENT;Petroleum Products
+LPG;RESIDENT;Petroleum Products
+ADDITIVE;RESIDENT;Petroleum Products
+ETHANE;RESIDENT;Petroleum Products
+PETCOKE;RESIDENT;Petroleum Products
+HEATNS;RESIDENT;Petroleum Products
+MOTORGAS;RESIDENT;Petroleum Products
+GASDIES;RESIDENT;Petroleum Products
+SBIOMASS;RESIDENT;Petroleum Products
+GBIOMASS;RESIDENT;Petroleum Products
+HEAT;RESIDENT;Heat
+GEOTHERM;RESIDENT;Geothermal
+SOLARTH;RESIDENT;Solar
+MUNWASTER;RESIDENT;Biomass
+MUNWASTEN;RESIDENT;Biomass
+INDWASTE;RESIDENT;Biomass
+PRIMSBIO;RESIDENT;Biomass
+BIOGASOL;RESIDENT;Biomass
+BIOGASES;RESIDENT;Biomass
+BIODIESEL;RESIDENT;Biomass
+OBIOLIQ;RESIDENT;Biomass
+RENEWNS;RESIDENT;Biomass
+CHARCOAL;RESIDENT;Biomass
+NATGAS;RESIDENT;Natural Gas
+ELECTR;RESIDENT;Electricity
+CRUDEOIL;COMMPUB;Petroleum Products
+NGL;COMMPUB;Petroleum Products
+CRNGFEED;COMMPUB;Petroleum Products
+NONBIODIES;COMMPUB;Petroleum Products
+OTHKERO;COMMPUB;Petroleum Products
+RESFUEL;COMMPUB;Petroleum Products
+AVGAS;COMMPUB;Petroleum Products
+JETGAS;COMMPUB;Petroleum Products
+JETKERO;COMMPUB;Petroleum Products
+NONBIOJETK;COMMPUB;Petroleum Products
+REFINGAS;COMMPUB;Petroleum Products
+PARWAX;COMMPUB;Petroleum Products
+ONONSPEC;COMMPUB;Petroleum Products
+WHITESP;COMMPUB;Petroleum Products
+NAPHTHA;COMMPUB;Petroleum Products
+BITUMEN;COMMPUB;Petroleum Products
+LUBRIC;COMMPUB;Petroleum Products
+NONBIOGASO;COMMPUB;Petroleum Products
+REFFEEDS;COMMPUB;Petroleum Products
+NONCRUDE;COMMPUB;Petroleum Products
+OILSHALE;COMMPUB;Petroleum Products
+LPG;COMMPUB;Petroleum Products
+ADDITIVE;COMMPUB;Petroleum Products
+ETHANE;COMMPUB;Petroleum Products
+PETCOKE;COMMPUB;Petroleum Products
+HEATNS;COMMPUB;Petroleum Products
+MOTORGAS;COMMPUB;Petroleum Products
+GASDIES;COMMPUB;Petroleum Products
+SBIOMASS;COMMPUB;Petroleum Products
+GBIOMASS;COMMPUB;Petroleum Products
+HEAT;COMMPUB;Heat
+GEOTHERM;COMMPUB;Geothermal
+SOLARTH;COMMPUB;Solar
+MUNWASTER;COMMPUB;Biomass
+MUNWASTEN;COMMPUB;Biomass
+INDWASTE;COMMPUB;Biomass
+PRIMSBIO;COMMPUB;Biomass
+BIOGASOL;COMMPUB;Biomass
+BIOGASES;COMMPUB;Biomass
+BIODIESEL;COMMPUB;Biomass
+OBIOLIQ;COMMPUB;Biomass
+RENEWNS;COMMPUB;Biomass
+CHARCOAL;COMMPUB;Biomass
+NATGAS;COMMPUB;Natural Gas
+ELECTR;COMMPUB;Electricity
+CRUDEOIL;ONONSPEC;Petroleum Products
+NGL;ONONSPEC;Petroleum Products
+CRNGFEED;ONONSPEC;Petroleum Products
+NONBIODIES;ONONSPEC;Petroleum Products
+OTHKERO;ONONSPEC;Petroleum Products
+RESFUEL;ONONSPEC;Petroleum Products
+AVGAS;ONONSPEC;Petroleum Products
+JETGAS;ONONSPEC;Petroleum Products
+JETKERO;ONONSPEC;Petroleum Products
+NONBIOJETK;ONONSPEC;Petroleum Products
+REFINGAS;ONONSPEC;Petroleum Products
+PARWAX;ONONSPEC;Petroleum Products
+ONONSPEC;ONONSPEC;Petroleum Products
+WHITESP;ONONSPEC;Petroleum Products
+NAPHTHA;ONONSPEC;Petroleum Products
+BITUMEN;ONONSPEC;Petroleum Products
+LUBRIC;ONONSPEC;Petroleum Products
+NONBIOGASO;ONONSPEC;Petroleum Products
+REFFEEDS;ONONSPEC;Petroleum Products
+NONCRUDE;ONONSPEC;Petroleum Products
+OILSHALE;ONONSPEC;Petroleum Products
+LPG;ONONSPEC;Petroleum Products
+ADDITIVE;ONONSPEC;Petroleum Products
+ETHANE;ONONSPEC;Petroleum Products
+PETCOKE;ONONSPEC;Petroleum Products
+HEATNS;ONONSPEC;Petroleum Products
+MOTORGAS;ONONSPEC;Petroleum Products
+GASDIES;ONONSPEC;Petroleum Products
+SBIOMASS;ONONSPEC;Petroleum Products
+GBIOMASS;ONONSPEC;Petroleum Products
+HEAT;ONONSPEC;Heat
+GEOTHERM;ONONSPEC;Geothermal
+SOLARTH;ONONSPEC;Solar
+MUNWASTER;ONONSPEC;Biomass
+MUNWASTEN;ONONSPEC;Biomass
+INDWASTE;ONONSPEC;Biomass
+PRIMSBIO;ONONSPEC;Biomass
+BIOGASOL;ONONSPEC;Biomass
+BIOGASES;ONONSPEC;Biomass
+BIODIESEL;ONONSPEC;Biomass
+OBIOLIQ;ONONSPEC;Biomass
+RENEWNS;ONONSPEC;Biomass
+CHARCOAL;ONONSPEC;Biomass
+NATGAS;ONONSPEC;Natural Gas
+ELECTR;ONONSPEC;Electricity
+CRUDEOIL;AGRICULT;Petroleum Products
+NGL;AGRICULT;Petroleum Products
+CRNGFEED;AGRICULT;Petroleum Products
+NONBIODIES;AGRICULT;Petroleum Products
+OTHKERO;AGRICULT;Petroleum Products
+RESFUEL;AGRICULT;Petroleum Products
+AVGAS;AGRICULT;Petroleum Products
+JETGAS;AGRICULT;Petroleum Products
+JETKERO;AGRICULT;Petroleum Products
+NONBIOJETK;AGRICULT;Petroleum Products
+REFINGAS;AGRICULT;Petroleum Products
+PARWAX;AGRICULT;Petroleum Products
+ONONSPEC;AGRICULT;Petroleum Products
+WHITESP;AGRICULT;Petroleum Products
+NAPHTHA;AGRICULT;Petroleum Products
+BITUMEN;AGRICULT;Petroleum Products
+LUBRIC;AGRICULT;Petroleum Products
+NONBIOGASO;AGRICULT;Petroleum Products
+REFFEEDS;AGRICULT;Petroleum Products
+NONCRUDE;AGRICULT;Petroleum Products
+OILSHALE;AGRICULT;Petroleum Products
+LPG;AGRICULT;Petroleum Products
+ADDITIVE;AGRICULT;Petroleum Products
+ETHANE;AGRICULT;Petroleum Products
+PETCOKE;AGRICULT;Petroleum Products
+HEATNS;AGRICULT;Petroleum Products
+MOTORGAS;AGRICULT;Petroleum Products
+GASDIES;AGRICULT;Petroleum Products
+SBIOMASS;AGRICULT;Petroleum Products
+GBIOMASS;AGRICULT;Petroleum Products
+HEAT;AGRICULT;Heat
+GEOTHERM;AGRICULT;Geothermal
+SOLARTH;AGRICULT;Solar
+MUNWASTER;AGRICULT;Biomass
+MUNWASTEN;AGRICULT;Biomass
+INDWASTE;AGRICULT;Biomass
+PRIMSBIO;AGRICULT;Biomass
+BIOGASOL;AGRICULT;Biomass
+BIOGASES;AGRICULT;Biomass
+BIODIESEL;AGRICULT;Biomass
+OBIOLIQ;AGRICULT;Biomass
+RENEWNS;AGRICULT;Biomass
+CHARCOAL;AGRICULT;Biomass
+NATGAS;AGRICULT;Natural Gas
+ELECTR;AGRICULT;Electricity
+HARDCOAL;RESIDENT;Coal Products
+BROWN;RESIDENT;Coal Products
+ANTCOAL;RESIDENT;Coal Products
+COKCOAL;RESIDENT;Coal Products
+BITCOAL;RESIDENT;Coal Products
+SUBCOAL;RESIDENT;Coal Products
+LIGNITE;RESIDENT;Coal Products
+PATFUEL;RESIDENT;Coal Products
+OVENCOKE;RESIDENT;Coal Products
+GASCOKE;RESIDENT;Coal Products
+COALTAR;RESIDENT;Coal Products
+BKB;RESIDENT;Coal Products
+GASWKSGS;RESIDENT;Coal Products
+COKEOVGS;RESIDENT;Coal Products
+BLFURGS;RESIDENT;Coal Products
+OGASES;RESIDENT;Coal Products
+PEAT;RESIDENT;Coal Products
+PEATPROD;RESIDENT;Coal Products
+MANGAS;RESIDENT;Coal Products
+HARDCOAL;COMMPUB;Coal Products
+BROWN;COMMPUB;Coal Products
+ANTCOAL;COMMPUB;Coal Products
+COKCOAL;COMMPUB;Coal Products
+BITCOAL;COMMPUB;Coal Products
+SUBCOAL;COMMPUB;Coal Products
+LIGNITE;COMMPUB;Coal Products
+PATFUEL;COMMPUB;Coal Products
+OVENCOKE;COMMPUB;Coal Products
+GASCOKE;COMMPUB;Coal Products
+COALTAR;COMMPUB;Coal Products
+BKB;COMMPUB;Coal Products
+GASWKSGS;COMMPUB;Coal Products
+COKEOVGS;COMMPUB;Coal Products
+BLFURGS;COMMPUB;Coal Products
+OGASES;COMMPUB;Coal Products
+PEAT;COMMPUB;Coal Products
+PEATPROD;COMMPUB;Coal Products
+MANGAS;COMMPUB;Coal Products
+HARDCOAL;ONONSPEC;Coal Products
+BROWN;ONONSPEC;Coal Products
+ANTCOAL;ONONSPEC;Coal Products
+COKCOAL;ONONSPEC;Coal Products
+BITCOAL;ONONSPEC;Coal Products
+SUBCOAL;ONONSPEC;Coal Products
+LIGNITE;ONONSPEC;Coal Products
+PATFUEL;ONONSPEC;Coal Products
+OVENCOKE;ONONSPEC;Coal Products
+GASCOKE;ONONSPEC;Coal Products
+COALTAR;ONONSPEC;Coal Products
+BKB;ONONSPEC;Coal Products
+GASWKSGS;ONONSPEC;Coal Products
+COKEOVGS;ONONSPEC;Coal Products
+BLFURGS;ONONSPEC;Coal Products
+OGASES;ONONSPEC;Coal Products
+PEAT;ONONSPEC;Coal Products
+PEATPROD;ONONSPEC;Coal Products
+MANGAS;ONONSPEC;Coal Products
+HARDCOAL;AGRICULT;Coal Products
+BROWN;AGRICULT;Coal Products
+ANTCOAL;AGRICULT;Coal Products
+COKCOAL;AGRICULT;Coal Products
+BITCOAL;AGRICULT;Coal Products
+SUBCOAL;AGRICULT;Coal Products
+LIGNITE;AGRICULT;Coal Products
+PATFUEL;AGRICULT;Coal Products
+OVENCOKE;AGRICULT;Coal Products
+GASCOKE;AGRICULT;Coal Products
+COALTAR;AGRICULT;Coal Products
+BKB;AGRICULT;Coal Products
+GASWKSGS;AGRICULT;Coal Products
+COKEOVGS;AGRICULT;Coal Products
+BLFURGS;AGRICULT;Coal Products
+OGASES;AGRICULT;Coal Products
+PEAT;AGRICULT;Coal Products
+PEATPROD;AGRICULT;Coal Products
+MANGAS;AGRICULT;Coal Products