Merge branch 'master' of https://github.com/pik-piam/mrremind into wa…

…rnings

.buildlibrary

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

CITATION.cff

@@ -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: 'mrremind: MadRat REMIND Input Data Package'
-version: 0.192.5
+version: 0.192.8
 date-released: '2024-09-27'
 abstract: The mrremind packages contains data preprocessing for the REMIND model.
 authors:

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: mrremind
 Title: MadRat REMIND Input Data Package
-Version: 0.192.5
+Version: 0.192.8
 Date: 2024-09-27
 Authors@R: c(
     person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),

NAMESPACE

@@ -48,7 +48,7 @@ export(convertUNFCCC)
 export(convertUNIDO)
 export(convertUSGS)
 export(filter_historical_mif)
-export(fullThresholds)
+export(fullTHRESHOLDS)
 export(readADVANCE_WP2)
 export(readAGEB)
 export(readAR6GWP)
@@ -83,6 +83,7 @@ import(madrat)
 import(magclass)
 import(mrcommons)
 import(mrdrivers)
+importFrom(GDPuc,convertGDP)
 importFrom(assertr,assert)
 importFrom(assertr,in_set)
 importFrom(assertr,not_na)