Skip to content

Commit

Permalink
Merge pull request pik-piam#130 from fbenke-pik/master
Browse files Browse the repository at this point in the history 
include additional UNFCCC data in readUNFCCC()
  • Loading branch information
@fbenke-pik
fbenke-pik authored Oct 7, 2021
2 parents 4ba988b + 531fd3a commit 9b866ee
Show file tree
Hide file tree
Showing 5 changed files with 186 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '15390298'
ValidationKey: '15503740'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
Expand Down
2 changes: 1 addition & 1 deletion .zenodo.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "mrremind: MadRat REMIND Input Data Package",
"version": "0.81.4",
"version": "0.82.0",
"description": "<p>The mrremind packages contains data preprocessing for the REMIND model.<\/p>",
"creators": [
{
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: mrremind
Type: Package
Title: MadRat REMIND Input Data Package
Version: 0.81.4
Version: 0.82.0
Date: 2021-10-07
Authors@R: c(person("Lavinia", "Baumstark", email = "lavinia@pik-potsdam.de", role = c("aut","cre")),
person("Renato", "Rodrigues", role = "aut"),
Expand Down
181 changes: 179 additions & 2 deletions R/readUNFCCC.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ readUNFCCC <- function() {
"Total industrial processes|Mineral industry|Lime production",
"Total industrial processes|Mineral industry|Glass production",
"Total industrial processes|Mineral industry|Other process uses of carbonates",
"Total industrial processes|Chemical industry ",
"Total industrial processes|Chemical industry",
"Total industrial processes|Chemical industry|Ammonia production",
"Total industrial processes|Chemical industry|Nitric acid production ",
"Total industrial processes|Chemical industry|Nitric acid production",
"Total industrial processes|Chemical industry|Adipic acid production",
"Total industrial processes|Chemical industry|Caprolactam, glyoxal and glyoxylic acid production",
"Total industrial processes|Chemical industry|Carbide production",
Expand All @@ -183,6 +183,183 @@ readUNFCCC <- function() {
)
}
)
),
"Table2(I)s2" = list(
range = "A7:D29",
colnames = paste0("kt ", c("CO2", "CH4", "N2O")),
rows = tibble(
name = {
c(
"Total industrial processes|Non-energy products from fuels and solvent use",
"Total industrial processes|Non-energy products from fuels and solvent use|Lubricant use",
"Total industrial processes|Non-energy products from fuels and solvent use|Paraffin wax use",
"Total industrial processes|Non-energy products from fuels and solvent use|Other",
"Total industrial processes|Electronics industry",
"Total industrial processes|Electronics industry|Integrated circuit or semiconductor",
"Total industrial processes|Electronics industry|TFT flat panel display",
"Total industrial processes|Electronics industry|Photovoltaics",
"Total industrial processes|Electronics industry|Heat transfer fluid",
"Total industrial processes|Electronics industry|Other (as specified in table 2(II))",
"Total industrial processes|Product uses as substitutes for ODS(2)",
"Total industrial processes|Product uses as substitutes for ODS(2)|Refrigeration and air conditioning",
"Total industrial processes|Product uses as substitutes for ODS(2)|Foam blowing agents",
"Total industrial processes|Product uses as substitutes for ODS(2)|Fire protection",
"Total industrial processes|Product uses as substitutes for ODS(2)|Aerosols",
"Total industrial processes|Product uses as substitutes for ODS(2)|Solvents",
"Total industrial processes|Product uses as substitutes for ODS(2)|Other applications",
"Total industrial processes|Other product manufacture and use",
"Total industrial processes|Other product manufacture and use|Electrical equipment",
"Total industrial processes|Other product manufacture and use|SF6 and PFCs from other product use",
"Total industrial processes|Other product manufacture and use|N2O from product uses",
"Total industrial processes|Other product manufacture and use|Other",
"Total industrial processes|Other"
)
}
)
),
"Table3s1" = list(
range = "A7:D57",
colnames = paste0("kt ", c("CO2", "CH4", "N2O")),
rows = tibble(
name = {
c(
"Total agriculture",
"Total agriculture|Livestock",
"Total agriculture|Enteric fermentation",
"Total agriculture|Enteric fermentation|Cattle",
NA,
"Total agriculture|Enteric fermentation|Cattle|Dairy cattle",
"Total agriculture|Enteric fermentation|Cattle|Non-dairy cattle",
NA,
"Total agriculture|Enteric fermentation|Cattle|Mature dairy cattle",
"Total agriculture|Enteric fermentation|Cattle|Other mature cattle",
"Total agriculture|Enteric fermentation|Cattle|Growing cattle",
NA,
"Total agriculture|Enteric fermentation|Cattle|Other",
"Total agriculture|Enteric fermentation|Sheep",
"Total agriculture|Enteric fermentation|Swine",
"Total agriculture|Enteric fermentation|Other livestock",
"Total agriculture|Enteric fermentation|Other livestock|Buffalo",
"Total agriculture|Enteric fermentation|Other livestock|Deer",
"Total agriculture|Enteric fermentation|Other livestock|Goats",
"Total agriculture|Enteric fermentation|Other livestock|Horses",
"Total agriculture|Enteric fermentation|Other livestock|Mules and Asses",
"Total agriculture|Enteric fermentation|Other livestock|Poultry",
"Total agriculture|Enteric fermentation|Other livestock|Other",
"Total agriculture|Enteric fermentation|Other livestock|Rabbit",
"Total agriculture|Enteric fermentation|Other livestock|Ostrich",
"Total agriculture|Enteric fermentation|Other livestock|Fur-bearing Animals",
"Total agriculture|Manure management",
"Total agriculture|Manure management|Cattle",
NA,
"Total agriculture|Manure management|Cattle|Dairy cattle",
"Total agriculture|Manure management|Cattle|Non-dairy cattle",
NA,
"Total agriculture|Manure management|Cattle|Mature dairy cattle",
"Total agriculture|Manure management|Cattle|Other mature cattle",
"Total agriculture|Manure management|Cattle|Growing cattle",
NA,
"Total agriculture|Manure management|Cattle|Other",
"Total agriculture|Manure management|Sheep",
"Total agriculture|Manure management|Swine",
"Total agriculture|Manure management|Other livestock",
"Total agriculture|Manure management|Other livestock|Buffalo",
"Total agriculture|Manure management|Other livestock|Deer",
"Total agriculture|Manure management|Other livestock|Goats",
"Total agriculture|Manure management|Other livestock|Horses",
"Total agriculture|Manure management|Other livestock|Mules and Asses",
"Total agriculture|Manure management|Other livestock|Poultry",
"Total agriculture|Manure management|Other livestock|Other",
"Total agriculture|Manure management|Other livestock|Rabbit",
"Total agriculture|Manure management|Other livestock|Ostrich",
"Total agriculture|Manure management|Other livestock|Fur-bearing Animals",
"Total agriculture|Manure management|Indirect N2O emissions"
)
}
)
),
"Table3s2" = list(
range = "A7:D18",
colnames = paste0("kt ", c("CO2", "CH4", "N2O")),
rows = tibble(
name = {
c(
"Total agriculture|Rice cultivation",
"Total agriculture|Agricultural soils",
"Total agriculture|Prescribed burning of savannas",
"Total agriculture|Field burning of agricultural residues",
"Total agriculture|Liming",
"Total agriculture|Urea application",
"Total agriculture|Other carbon-containing fertilizers",
"Total agriculture|Other",
"Total agriculture|Other|3B NOx Emissions",
"Total agriculture|Other|Digestate renewable raw material atmospheric deposition",
"Total agriculture|Other|Digestate renewable raw material storage of dry matter",
"Total agriculture|Other|Digestate renewable raw material"
)
}
)
),
"Table4" = list(
range = "A7:D29",
colnames = paste0("kt ", c("CO2", "CH4", "N2O")),
rows = tibble(
name = {
c(
"Total LULUCF",
"Total LULUCF|Forest land",
"Total LULUCF|Forest land|Forest land remaining forest land",
"Total LULUCF|Forest land|Land converted to forest land",
"Total LULUCF|Cropland",
"Total LULUCF|Cropland|Cropland remaining cropland",
"Total LULUCF|Cropland|Land converted to cropland",
"Total LULUCF|Grassland",
"Total LULUCF|Grassland|Grassland remaining grassland",
"Total LULUCF|Grassland|Land converted to grassland",
"Total LULUCF|Wetlands",
"Total LULUCF|Wetlands|Wetlands remaining wetlands",
"Total LULUCF|Wetlands|Land converted to wetlands",
"Total LULUCF|Settlements",
"Total LULUCF|Settlements|Settlements remaining settlements",
"Total LULUCF|Settlements|Land converted to settlements",
"Total LULUCF|Other land",
"Total LULUCF|Other land|Other land remaining other land",
"Total LULUCF|Other land|Land converted to other land",
"Total LULUCF|Harvested wood products",
"Total LULUCF|Other",
"Total LULUCF|Other|Settlements",
"Total LULUCF|Other|Other"
)
}
)
),
"Table5" = list(
range = "A7:D24",
colnames = paste0("kt ", c("CO2", "CH4", "N2O")),
rows = tibble(
name = {
c(
"Total waste",
"Total waste|Solid waste disposal",
"Total waste|Solid waste disposal|Managed waste disposal sites",
"Total waste|Solid waste disposal|Unmanaged waste disposal sites",
"Total waste|Solid waste disposal|Uncategorized waste disposal sites",
"Total waste|Biological treatment of solid waste",
"Total waste|Biological treatment of solid waste|Composting",
"Total waste|Biological treatment of solid waste|Anaerobic digestion at biogas facilities",
"Total waste|Incineration and open burning of waste",
"Total waste|Incineration and open burning of waste|Waste incineration",
"Total waste|Incineration and open burning of waste|Open burning of waste",
"Total waste|Wastewater treatment and discharge",
"Total waste|Wastewater treatment and discharge|Domestic wastewater",
"Total waste|Wastewater treatment and discharge|Industrial wastewater",
"Total waste|Wastewater treatment and discharge|Other",
"Total waste|Other",
"Total waste|Other|Mechanical-Biological Treatment MBT",
"Total waste|Other|Accidental fires"
)
}
)
)
)

Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# MadRat REMIND Input Data Package

R package **mrremind**, version **0.81.4**
R package **mrremind**, version **0.82.0**

[![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://codecov.io/gh/pik-piam/mrremind) [![r-universe](https://pik-piam.r-universe.dev/badges/mrremind)](https://pik-piam.r-universe.dev/ui#builds)
[![CRAN status](https://www.r-pkg.org/badges/version/mrremind)](https://cran.r-project.org/package=mrremind)

## Purpose and Functionality

Expand Down Expand Up @@ -38,7 +38,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 (2021). _mrremind: MadRat REMIND Input Data Package_. R package version 0.81.4.
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 (2021). _mrremind: MadRat REMIND Input Data Package_. R package version 0.82.0.

A BibTeX entry for LaTeX users is

Expand All @@ -47,7 +47,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},
year = {2021},
note = {R package version 0.81.4},
note = {R package version 0.82.0},
}
```

0 comments on commit 9b866ee

Please sign in to comment.