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

bugfix warnings #403

Merged
merged 1 commit into from
Nov 15, 2024
Merged

bugfix warnings #403

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,4 +1,4 @@
ValidationKey: '7355414'
ValidationKey: '7375456'
AutocreateReadme: yes
allowLinterWarnings: no
AddInReadme: tutorial.md
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'piamInterfaces: Project specific interfaces to REMIND / MAgPIE'
version: 0.36.7
version: 0.36.8
date-released: '2024-11-15'
abstract: Project specific interfaces to REMIND / MAgPIE.
authors:
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.36.7
Version: 0.36.8
Date: 2024-11-15
Authors@R: c(
person("Falk", "Benke", , "[email protected]", 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.36.7**
R package **piamInterfaces**, version **0.36.8**

[![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/piamInterfaces/workflows/check/badge.svg)](https://github.com/pik-piam/piamInterfaces/actions) [![codecov](https://codecov.io/gh/pik-piam/piamInterfaces/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/piamInterfaces) [![r-universe](https://pik-piam.r-universe.dev/badges/piamInterfaces)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -120,7 +120,7 @@ In case of questions / problems please contact Falk Benke <[email protected]>

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

Benke F, Richters O (2024). _piamInterfaces: Project specific interfaces to REMIND / MAgPIE_. R package version 0.36.7, <https://github.com/pik-piam/piamInterfaces>.
Benke F, Richters O (2024). _piamInterfaces: Project specific interfaces to REMIND / MAgPIE_. R package version 0.36.8, <https://github.com/pik-piam/piamInterfaces>.

A BibTeX entry for LaTeX users is

Expand All @@ -129,7 +129,7 @@ A BibTeX entry for LaTeX users is
title = {piamInterfaces: Project specific interfaces to REMIND / MAgPIE},
author = {Falk Benke and Oliver Richters},
year = {2024},
note = {R package version 0.36.7},
note = {R package version 0.36.8},
url = {https://github.com/pik-piam/piamInterfaces},
}
```
6 changes: 3 additions & 3 deletions inst/mappings/mapping_AR6.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,10 +1526,10 @@ idx;variable;unit;piam_variable;piam_unit;piam_factor;piam_spatial;internal_comm
;Land Cover|Cropland|Rainfed;million ha;Resources|Land Cover|Cropland|Croparea|Forage|rainfed;million ha;;;;;area of land that is rain-fed;M
;Land Cover|Cropland|Rainfed;million ha;Resources|Land Cover|Cropland|Croparea|Bioenergy crops|rainfed;million ha;;;;;area of land that is rain-fed;M
1404;Land Cover|Forest;million ha;Resources|Land Cover|+|Forest;million ha;;;;;managed and unmanaged forest area;M
1405;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Managed Forest|+|NPI/NDC;million ha;;;;;area with afforestation and reforestation;M
;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Managed Forest|+|Afforestation;million ha;;;;;area with afforestation and reforestation;M
1405;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Planted Forest|Natural|+|NPI_NDC AR;million ha;;;;;area with afforestation and reforestation;M
;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Planted Forest|Natural|+|CO2-price AR;million ha;;;;;area with afforestation and reforestation;M
1406;Land Cover|Forest|Forestry|Harvested Area;million ha;;;;;;;Forest area harvested;
1407;Land Cover|Forest|Managed;million ha;Resources|Land Cover|Forest|Managed Forest|+|Plantations;million ha;;;;;managed forests producing commercial wood supply for timber or energy (note: woody energy crops reported under ‘energy crops’);M
1407;Land Cover|Forest|Managed;million ha;Resources|Land Cover|Forest|Planted Forest|Plantations|+|Timber;million ha;;;;;managed forests producing commercial wood supply for timber or energy (note: woody energy crops reported under ‘energy crops’);M
1408;Land Cover|Forest|Natural Forest;million ha;Resources|Land Cover|Forest|Natural Forest|+|Primary Forest;million ha;;;;;undisturbed natural forests,modified natural forests;M
1409;Land Cover|Forest|Secondary;million ha;Resources|Land Cover|Forest|Natural Forest|+|Secondary Forest;million ha;;;;;regrown (unmanaged) secondary forests,e.g. from abandoned agricultural land;M
1410;Land Cover|Other Arable Land;million ha;;;;;;;other arable land that is unmanaged (e.g.,grassland,savannah,shrubland),excluding unmanaged forests that are arable;
Expand Down
6 changes: 3 additions & 3 deletions inst/mappings/mapping_AR6_MAgPIE.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,10 +1498,10 @@ idx;variable;unit;piam_variable;piam_unit;piam_factor;source;internal_comment;Co
;Land Cover|Cropland|Rainfed;million ha;Resources|Land Cover|Cropland|Croparea|Forage|rainfed;million ha;;M;;;area of land that is rain-fed
;Land Cover|Cropland|Rainfed;million ha;Resources|Land Cover|Cropland|Croparea|Bioenergy crops|rainfed;million ha;;M;;;area of land that is rain-fed
1404;Land Cover|Forest;million ha;Resources|Land Cover|+|Forest;million ha;;M;;;managed and unmanaged forest area
1405;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Managed Forest|+|NPI/NDC;million ha;;M;;;area with afforestation and reforestation
;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Managed Forest|+|Afforestation;million ha;;M;;;area with afforestation and reforestation
1405;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Planted Forest|Natural|+|NPI_NDC AR;million ha;;M;;;area with afforestation and reforestation
;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Planted Forest|Natural|+|CO2-price AR;million ha;;M;;;area with afforestation and reforestation
1406;Land Cover|Forest|Forestry|Harvested Area;million ha;;;;;;;Forest area harvested
1407;Land Cover|Forest|Managed;million ha;Resources|Land Cover|Forest|Managed Forest|+|Plantations;million ha;;M;;;managed forests producing commercial wood supply for timber or energy (note: woody energy crops reported under ‘energy crops’)
1407;Land Cover|Forest|Managed;million ha;Resources|Land Cover|Forest|Planted Forest|Plantations|+|Timber;million ha;;M;;;managed forests producing commercial wood supply for timber or energy (note: woody energy crops reported under ‘energy crops’)
1408;Land Cover|Forest|Natural Forest;million ha;Resources|Land Cover|Forest|Natural Forest|+|Primary Forest;million ha;;M;;;undisturbed natural forests,modified natural forests
1409;Land Cover|Forest|Secondary;million ha;Resources|Land Cover|Forest|Natural Forest|+|Secondary Forest;million ha;;M;;;regrown (unmanaged) secondary forests,e.g. from abandoned agricultural land
1410;Land Cover|Other Arable Land;million ha;;;;;;;other arable land that is unmanaged (e.g.,grassland,savannah,shrubland),excluding unmanaged forests that are arable
Expand Down
6 changes: 3 additions & 3 deletions inst/mappings/mapping_NAVIGATE.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,10 +1509,10 @@ idx;Tier;Category;variable;unit;piam_variable;piam_unit;piam_factor;internal_com
1410;2;land cover;Land Cover|Cropland|Irrigated;million ha;Resources|Land Cover|Cropland|Croparea|Crops|irrigated;million ha;;;;irrigated arable land, i.e. land in non-forest bioenergy crop, food, and feed/fodder crops, as well as other arable land (cultivated area);M
1410;2;land cover;Land Cover|Cropland|Irrigated;million ha;Resources|Land Cover|Cropland|Croparea|Forage|irrigated;million ha;;;;irrigated arable land, i.e. land in non-forest bioenergy crop, food, and feed/fodder crops, as well as other arable land (cultivated area);M
1410;2;land cover;Land Cover|Cropland|Irrigated;million ha;Resources|Land Cover|Cropland|Croparea|Bioenergy crops|irrigated;million ha;;;;irrigated arable land, i.e. land in non-forest bioenergy crop, food, and feed/fodder crops, as well as other arable land (cultivated area);M
1411;2;land cover;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Managed Forest|+|NPI/NDC;million ha;;;;Area for afforestation and reforestation;M
1411;2;land cover;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Managed Forest|+|Afforestation;million ha;;;;Area for afforestation and reforestation;M
1411;2;land cover;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Planted Forest|Natural|+|NPI_NDC AR;million ha;;;;Area for afforestation and reforestation;M
1411;2;land cover;Land Cover|Forest|Afforestation and Reforestation;million ha;Resources|Land Cover|Forest|Planted Forest|Natural|+|CO2-price AR;million ha;;;;Area for afforestation and reforestation;M
1412;2;land cover;Land Cover|Forest|Forestry|Harvested Area;million ha;;;;;;Forest area harvested;
1413;2;land cover;Land Cover|Forest|Managed;million ha;Resources|Land Cover|Forest|Managed Forest|+|Plantations;million ha;;;;managed forests producing commercial wood supply for timber or energy (note: woody energy crops reported under energy crops);M
1413;2;land cover;Land Cover|Forest|Managed;million ha;Resources|Land Cover|Forest|Planted Forest|Plantations|+|Timber;million ha;;;;managed forests producing commercial wood supply for timber or energy (note: woody energy crops reported under energy crops);M
1414;2;land cover;Land Cover|Forest|Natural Forest;million ha;Resources|Land Cover|Forest|Natural Forest|+|Primary Forest;million ha;;;;Undisturbed natural forests and modified natural forests;M
1414;2;land cover;Land Cover|Forest|Natural Forest;million ha;Resources|Land Cover|Forest|Natural Forest|+|Secondary Forest;million ha;;;;Undisturbed natural forests and modified natural forests;M
1415;2;land cover;Land Cover|Other Arable Land;million ha;;;;;;other arable land that is unmanaged (e.g., grassland, savannah, shrubland), excluding unmanaged forests that are arable;
Expand Down
5 changes: 5 additions & 0 deletions inst/renamed_piam_variables.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ Timber|Volumetric|Production|Roundwood|+|Industrial roundwood;Timber|Volumetric|
Timber|Volumetric|Production|Roundwood|+|Timber for construction;Timber|Volumetric|Production|Timber for construction
Timber|Volumetric|Production|Roundwood|+|Wood fuel;Timber|Volumetric|Production|Wood fuel

# magpie4 forest
Resources|Land Cover|Forest|Planted Forest|Natural|+|CO2-price AR;Resources|Land Cover|Forest|Managed Forest|+|Afforestation
Resources|Land Cover|Forest|Planted Forest|Natural|+|NPI_NDC AR;Resources|Land Cover|Forest|Managed Forest|+|NPI/NDC
Resources|Land Cover|Forest|Planted Forest|Plantations|+|Timber;Resources|Land Cover|Forest|Managed Forest|+|Plantations

# magpie4 reporting variables for cropland changed with magpie4 2.3.2
Resources|Land Cover|Cropland|Croparea|Bioenergy crops* ;Resources|Land Cover|Cropland|Bioenergy crops*
Resources|Land Cover|Cropland|Croparea|Crops* ;Resources|Land Cover|Cropland|Crops*
Expand Down