Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix aggregation errors #21

Merged
merged 1 commit into from
Oct 24, 2022
Merged

fix aggregation errors #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ValidationKey: '327913'
ValidationKey: '347202'
AutocreateReadme: yes
allowLinterWarnings: no
2 changes: 1 addition & 1 deletion .zenodo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "piamInterfaces: Project specific interfaces to REMIND / MAgPIE",
"version": "0.0.17",
"version": "0.0.18",
"description": "<p>Project specific interfaces to REMIND / MAgPIE.<\/p>",
"creators": [
{
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: piamInterfaces
Title: Project specific interfaces to REMIND / MAgPIE
Version: 0.0.17
Version: 0.0.18
Date: 2022-10-24
Authors@R: c(
person("Falk", "Benke", , "benke@pik-potsdam.de", role = c("aut", "cre")),
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Project specific interfaces to REMIND / MAgPIE

R package **piamInterfaces**, version **0.0.17**
R package **piamInterfaces**, version **0.0.18**

[![CRAN status](https://www.r-pkg.org/badges/version/piamInterfaces)](https://cran.r-project.org/package=piamInterfaces) [![R build status](https://github.com/pik-piam/piam_interfaces/workflows/check/badge.svg)](https://github.com/pik-piam/piam_interfaces/actions) [![codecov](https://codecov.io/gh/pik-piam/piam_interfaces/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/piam_interfaces) [![r-universe](https://pik-piam.r-universe.dev/badges/piamInterfaces)](https://pik-piam.r-universe.dev/ui#builds)

Expand Down Expand Up @@ -38,7 +38,7 @@ In case of questions / problems please contact Falk Benke <benke@pik-potsdam.de>

To cite package **piamInterfaces** in publications use:

Benke F, Richters O (2022). _piamInterfaces: Project specific interfaces to REMIND / MAgPIE_. R package version 0.0.17, <URL: https://github.com/pik-piam/piam_interfaces>.
Benke F, Richters O (2022). _piamInterfaces: Project specific interfaces to REMIND / MAgPIE_. R package version 0.0.18, <URL: https://github.com/pik-piam/piam_interfaces>.

A BibTeX entry for LaTeX users is

Expand All @@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
title = {piamInterfaces: Project specific interfaces to REMIND / MAgPIE},
author = {Falk Benke and Oliver Richters},
year = {2022},
note = {R package version 0.0.17},
note = {R package version 0.0.18},
url = {https://github.com/pik-piam/piam_interfaces},
}
```
11 changes: 2 additions & 9 deletions inst/summations/summation_groups_AR6.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,6 @@ Fertilizer Use|Nitrogen;Fertilizer Use|Nitrogen|Organic;1
Fertilizer Use|Nitrogen;Fertilizer Use|Nitrogen|Biological Fixation;1
Fertilizer Use|Potassium;Fertilizer Use|Potassium|Inorganic;1
Fertilizer Use|Potassium;Fertilizer Use|Potassium|Organic;1
Final Energy|Solids;Final Energy|Solids|Biomass;1
Final Energy|Solids;Final Energy|Solids|Coal;1
Final Energy|Non-Energy Use;Final Energy|Non-Energy Use|Biomass;1
Final Energy|Non-Energy Use;Final Energy|Non-Energy Use|Coal;1
Final Energy|Non-Energy Use;Final Energy|Non-Energy Use|Gas;1
Expand Down Expand Up @@ -449,15 +447,8 @@ Final Energy|Residential and Commercial|Residential;Final Energy|Residential and
Final Energy|Residential and Commercial|Residential;Final Energy|Residential and Commercial|Residential|Liquids;1
Final Energy|Residential and Commercial|Residential;Final Energy|Residential and Commercial|Residential|Other;1
Final Energy|Residential and Commercial|Residential;Final Energy|Residential and Commercial|Residential|Solids;1
Final Energy|Residential and Commercial|Solids;Final Energy|Residential and Commercial|Solids|Biomass;1
Final Energy|Residential and Commercial|Solids;Final Energy|Residential and Commercial|Solids|Coal;1
Final Energy|Transportation|Gases;Final Energy|Transportation|Gases|Bioenergy;1
Final Energy|Transportation|Gases;Final Energy|Transportation|Gases|Fossil;1
Final Energy|Transportation|Liquids;Final Energy|Transportation|Liquids|Bioenergy;1
Final Energy|Transportation|Liquids;Final Energy|Transportation|Liquids|Coal;1
Final Energy|Transportation|Liquids;Final Energy|Transportation|Liquids|Fossil synfuel;1
Final Energy|Transportation|Liquids;Final Energy|Transportation|Liquids|Natural Gas;1
Final Energy|Transportation|Liquids;Final Energy|Transportation|Liquids|Oil;1
Final Energy|Transportation|Passenger;Final Energy|Transportation|Passenger|Electricity;1
Final Energy|Transportation|Passenger;Final Energy|Transportation|Passenger|Gases;1
Final Energy|Transportation|Passenger;Final Energy|Transportation|Passenger|Hydrogen;1
Expand Down Expand Up @@ -523,6 +514,8 @@ Investment|Energy Supply|Electricity;Investment|Energy Supply|Electricity|Other;
Investment|Energy Supply|Electricity;Investment|Energy Supply|Electricity|Solar;1
Investment|Energy Supply|Electricity;Investment|Energy Supply|Electricity|Transmission and Distribution;1
Investment|Energy Supply|Electricity;Investment|Energy Supply|Electricity|Wind;1
Investment|Energy Supply|Electricity|Oil;Investment|Energy Supply|Electricity|Oil|w/ CCS;1
Investment|Energy Supply|Electricity|Oil;Investment|Energy Supply|Electricity|Oil|w/o CCS;1
Investment|Energy Supply|Hydrogen;Investment|Energy Supply|Hydrogen|Biomass;1
Investment|Energy Supply|Hydrogen;Investment|Energy Supply|Hydrogen|Electricity;1
Investment|Energy Supply|Hydrogen;Investment|Energy Supply|Hydrogen|Fossil;1
Expand Down
14 changes: 7 additions & 7 deletions inst/templates/mapping_template_AR6.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ idx;Variable;Unit;r21m42;r21m42_unit;r21m42_factor;r21m42_spatial;m42;m42_unit;m
1016;Final Energy|Transportation|Liquids|Bioenergy;EJ/yr;FE|Transport|Liquids|Biomass;EJ/yr;;;;;;FE|Transport|Liquids|+|Biomass;EJ/yr;;;;;;;;Final biofuels based (liquid or gas) energy consumed in the transport sector by passenger and freight vehicles
1018;Final Energy|Transportation|Liquids|Coal;EJ/yr;FE|Transport|Liquids|Coal;EJ/yr;;;;;;FE|Transport|Liquids|Fossil|+|Coal;EJ/yr;;;;;;;;final energy consumption by the transportation sector of coal based liquids (coal-to-liquids)
1019;Final Energy|Transportation|Liquids|Fossil synfuel;EJ/yr;;;;;;;;;;;;;;;;;Final energy,in the form of fossil synfuel (e.g. CTL,GTL,Methanol,and DME),consumed in the transport sector by passenger and freight vehicles
1020;Final Energy|Transportation|Liquids|Natural Gas;EJ/yr;;;;;;;;;;;;;;;;;final energy consumption by the transportation sector of natrual gas based liquids (gas-to-liquids)
1020;Final Energy|Transportation|Liquids|Natural Gas;EJ/yr;;;;;;;;FE|Transport|Liquids|Fossil|+|Gas;EJ/yr;;;;;;;;final energy consumption by the transportation sector of natural gas based liquids (gas-to-liquids)
1021;Final Energy|Transportation|Liquids|Oil;EJ/yr;FE|Transport|Liquids|Oil;EJ/yr;;;;;;FE|Transport|Liquids|Fossil|+|Oil;EJ/yr;;;;;;;;final energy consumption by the transportation sector of liquid oil products (from conventional & unconventional oil)
1022;Final Energy|Transportation|Maritime;EJ/yr;FE|Transport|Freight|Navigation;EJ/yr;;;;;;FE|Transport|Freight|Navigation;EJ/yr;;;;;;;;Final energy consumed in the transport sector by maritime mode
1022;Final Energy|Transportation|Maritime;EJ/yr;FE|Transport|Freight|International Shipping;EJ/yr;;;;;;FE|Transport|Freight|International Shipping;EJ/yr;;;;;;;;Final energy consumed in the transport sector by maritime mode
Expand Down Expand Up @@ -1441,8 +1441,8 @@ idx;Variable;Unit;r21m42;r21m42_unit;r21m42_factor;r21m42_spatial;m42;m42_unit;m
1332;Investment|Energy Supply|Electricity|Non-fossil;billion US$2010/yr;Energy Investments|Elec|Non-Fossil;billion US$2005/yr;1.10774;;;;;Energy Investments|Elec|Non-Fossil;billion US$2005/yr;1.10774;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1333;Investment|Energy Supply|Electricity|Nuclear;billion US$2010/yr;Energy Investments|Elec|Nuclear;billion US$2005/yr;1.10774;;;;;Energy Investments|Elec|Nuclear;billion US$2005/yr;1.10774;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1334;Investment|Energy Supply|Electricity|Ocean;billion US$2010/yr;;;;;;;;;;;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1335;Investment|Energy Supply|Electricity|Oil;billion US$2010/yr;;;;;;;;;;;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1336;Investment|Energy Supply|Electricity|Oil|w/ CCS;billion US$2010/yr;;;;;;;;;;;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1335;Investment|Energy Supply|Electricity|Oil;billion US$2010/yr;;;;;;;;Energy Investments|Elec|Oil;billion US$2005/yr;1.10774;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1336;Investment|Energy Supply|Electricity|Oil|w/ CCS;billion US$2010/yr;;;;;;;;Energy Investments|Elec|Oil|w/ CC;billion US$2005/yr;1.10774;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1337;Investment|Energy Supply|Electricity|Oil|w/o CCS;billion US$2010/yr;Energy Investments|Elec|Oil|w/o CCS;billion US$2005/yr;1.10774;;;;;Energy Investments|Elec|Oil|w/o CC;billion US$2005/yr;1.10774;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1338;Investment|Energy Supply|Electricity|Other;billion US$2010/yr;Energy Investments|Elec|Hydrogen;billion US$2005/yr;1.10774;;;;;Energy Investments|Elec|Hydrogen;billion US$2005/yr;1.10774;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1339;Investment|Energy Supply|Electricity|Solar;billion US$2010/yr;Energy Investments|Elec|Solar;billion US$2005/yr;1.10774;;;;;Energy Investments|Elec|Solar;billion US$2005/yr;1.10774;;;;;;;investments in new power generation for the specified power plant category. If the model features several sub-categories,the total investments should be reported. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
Expand All @@ -1463,7 +1463,7 @@ idx;Variable;Unit;r21m42;r21m42_unit;r21m42_factor;r21m42_spatial;m42;m42_unit;m
1354;Investment|Energy Supply|Hydrogen|Renewable;billion US$2010/yr;;;;;;;;Energy Investments|Hydrogen|RE;billion US$2005/yr;1.10774;;;;;;;investments for the production of hydrogen from the specified source. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1355;Investment|Energy Supply|Liquids;billion US$2010/yr;Energy Investments|Liquids;billion US$2005/yr;1.10774;;;;;Energy Investments|Liquids;billion US$2005/yr;1.10774;;;;;;;investments for the production of liquid fuels. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1356;Investment|Energy Supply|Liquids|Biomass;billion US$2010/yr;Energy Investments|Liquids|Bio;billion US$2005/yr;1.10774;;;;;Energy Investments|Liquids|Bio;billion US$2005/yr;1.10774;;;;;;;investments for the production of biofuels. These should not include the costs of the feedstock. For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1357;Investment|Energy Supply|Liquids|Coal and Gas;billion US$2010/yr;Energy Investments|Liquids|Fossil;billion US$2005/yr;1.10774;;;;;Energy Investments|Liquids|Fossil;billion US$2005/yr;1.10774;;;;;;;investments for the production of fossil-based synfuels (coal and gas). For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1357;Investment|Energy Supply|Liquids|Coal and Gas;billion US$2010/yr;Energy Investments|Liquids|Fossil;billion US$2005/yr;1.10774;;;;;Energy Investments|Liquids|Fossil|w/o oil;billion US$2005/yr;1.10774;;;;;;;investments for the production of fossil-based synfuels (coal and gas). For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1358;Investment|Energy Supply|Liquids|Oil;billion US$2010/yr;Energy Investments|Liquids|Oil Ref;billion US$2005/yr;1.10774;;;;;Energy Investments|Liquids|Oil Ref;billion US$2005/yr;1.10774;;;;;;;investments for the production of fossil fuels from oil refineries For plants equipped with CCS,the investment in the capturing equipment should be included but not the one on transport and storage.
1359;Investment|Energy Supply|Other;billion US$2010/yr;Energy Investments|Other;billion US$2005/yr;1.10774;;;;;Energy Investments|Other;billion US$2005/yr;1.10774;;;;;;;investments in other types of energy conversion facilities
;Investment|Energy Supply|Other;billion US$2010/yr;Energy Investments|Gases;billion US$2005/yr;1.10774;;;;;Energy Investments|Gases;billion US$2005/yr;1.10774;;;;;;;
Expand Down Expand Up @@ -1991,6 +1991,6 @@ idx;Variable;Unit;r21m42;r21m42_unit;r21m42_factor;r21m42_spatial;m42;m42_unit;m
;Ocean|New production;GtC/yr;Ocean|New production;GtC/yr;;;;;;Ocean|New production;GtC/yr;;;;;;;;New production of biomass in oceans
;Ocean|Extension of suboxic zones;km³;Ocean|Extension of suboxic zones;km3;;;;;;Ocean|Extension of suboxic zones;km3;;;;;;;;Extension of suboxic zones in oceans
;Political institutions|Equality before law and individual liberty;-;Political institutions|Equality before law and individual liberty;-;;;;;;Political institutions|Equality before law and individual liberty;-;;;;;;;;aggregated ‘Equality Before the Law and Individual Liberty' index (0-1) as defined by V-DEM
;Primary Energy|Biomass|Electricity;EJ/yr;PE|Biomass|Heat;EJ/yr;;;;;;PE|Biomass|Heat;EJ/yr;;;;;;;;coal primary energy input to electricity generation
;Primary Energy|Coal|Electricity;EJ/yr;PE|Coal|Heat;EJ/yr;;;;;;PE|Coal|Heat;EJ/yr;;;;;;;;coal primary energy input to electricity generation
;Primary Energy|Gas|Electricity;EJ/yr;PE|Gas|Heat;EJ/yr;;;;;;PE|Gas|Heat;EJ/yr;;;;;;;;
;Primary Energy|Biomass|Heat;EJ/yr;PE|Biomass|Heat;EJ/yr;;;;;;PE|Biomass|Heat;EJ/yr;;;;;;;;biomass primary energy input to heat generation
;Primary Energy|Coal|Heat;EJ/yr;PE|Coal|Heat;EJ/yr;;;;;;PE|Coal|Heat;EJ/yr;;;;;;;;coal primary energy input to heat generation
;Primary Energy|Gas|Heat;EJ/yr;PE|Gas|Heat;EJ/yr;;;;;;PE|Gas|Heat;EJ/yr;;;;;;;;gas primary energy input to heat generation
Loading