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

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '346207720'
+ValidationKey: '37758420'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'
@@ -9,6 +9,8 @@ AcceptedWarnings:
 AcceptedNotes:
 - unable to verify current time
 - Imports includes .* non-default packages.
+- installed size is
+- 'Undefined global functions or variables:'
 AutocreateReadme: yes
 allowLinterWarnings: yes
 enforceVersionUpdate: yes

.github/workflows/check.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -23,7 +23,6 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |
-            gamstransfer=?ignore
             any::lucode2
             any::covr
             any::madrat
@@ -36,7 +35,7 @@ jobs:
           # gms, goxygen, GDPuc) will usually have an outdated binary version
           # available; by using extra-packages we get the newest version
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: '^tests/testthat/_snaps/.*$'
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c  # frozen: v4.6.0
     hooks:
     -   id: check-case-conflict
     -   id: check-json
@@ -15,7 +15,7 @@ repos:
     -   id: mixed-line-ending
 
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.4.0
+    rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7  # frozen: v0.4.3
     hooks:
     -   id: parsable-R
     -   id: deps-in-desc

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: 'mrremind: MadRat REMIND Input Data Package'
-version: 0.175.10
-date-released: '2024-02-19'
+version: 0.189.0
+date-released: '2024-09-12'
 abstract: The mrremind packages contains data preprocessing for the REMIND model.
 authors:
 - family-names: Baumstark
@@ -61,6 +61,8 @@ authors:
   given-names: Sophie
 - family-names: Mandaroux
   given-names: Rahel
+- family-names: Koch
+  given-names: Johannes
 license: LGPL-3.0
 repository-code: https://github.com/pik-piam/mrremind
 

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrremind
 Title: MadRat REMIND Input Data Package
-Version: 0.175.10
-Date: 2024-02-19
+Version: 0.189.0
+Date: 2024-09-12
 Authors@R: c(
     person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")),
     person("Renato", "Rodrigues", role = "aut"),
@@ -30,22 +30,22 @@ Authors@R: c(
     person("Oliver", "Richters", role = "aut"),
     person("Robin", "Hasse", role = "aut"),
     person("Sophie", "Fuchs", role = "aut"),
-    person("Rahel", "Mandaroux", role = "aut")
+    person("Rahel", "Mandaroux", role = "aut"),
+    person("Johannes", "Koch", role = "aut")
   )
 Description: The mrremind packages contains data preprocessing for the
     REMIND model.
 License: LGPL-3 | file LICENSE
 URL: https://github.com/pik-piam/mrremind
 Depends:
-    edgeTransport (>= 0.17.0),
+    edgeTransport (>= 1.5.5),
     madrat (>= 3.7.1),
-    magclass (>= 6.11.3),
+    magclass (>= 6.16.1),
     mrcommons (>= 1.38.0),
-    mrdrivers (>= 1.0.0),
+    mrdrivers (>= 2.0.0),
     R (>= 2.10.0)
 Imports:
     assertr,
-    assertthat,
     broom,
     car,
     countrycode,
@@ -55,16 +55,13 @@ Imports:
     Hmisc,
     luscale,
     magrittr,
-    mgsub,
     nnls,
-    plyr,
     purrr,
     quitte (>= 0.3105.0),
     R.utils,
     readODS,
     readr,
     readxl,
-    reshape,
     reshape2,
     rlang,
     rmndt,
@@ -81,4 +78,4 @@ VignetteBuilder:
     knitr
 Encoding: UTF-8
 LazyData: no
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2

NAMESPACE

@@ -2,6 +2,7 @@
 
 export(calcAGEB)
 export(calcBP)
+export(calcCCScapacity)
 export(calcCement)
 export(calcCementShare)
 export(calcChemicalFeedstocksShare)
@@ -10,17 +11,20 @@ export(calcEDGAR7Fgases)
 export(calcEEAGHGProjections)
 export(calcEmber)
 export(calcEmissionFactorsFeedstocks)
+export(calcExpertGuess)
 export(calcFloorspace)
 export(calcGlobalEnergyMonitor)
 export(calcHRE)
 export(calcIEA_ETP)
 export(calcIEA_EVOutlook)
-export(calcIEA_WEO_2021)
+export(calcIEA_WorldEnergyOutlook)
+export(calcIndustry_CCS_limits)
 export(calcIndustry_EEK)
 export(calcIndustry_Value_Added)
 export(calcODYM_RECC)
 export(calcOtherFossilInElectricity)
 export(calcPlasticsEoL)
+export(calcProjectPipelines)
 export(calcShareIndFE)
 export(calcSteelStock)
 export(calcSteel_Projections)
@@ -30,26 +34,31 @@ export(calcUNIDO)
 export(calcindustry_max_secondary_steel_share)
 export(calcindustry_specific_FE_limits)
 export(calcindustry_subsectors_specific)
-export(calcpm_delta_kap_industry)
 export(convertADVANCE_WP2)
 export(convertAGEB)
 export(convertEDGAR7Fgases)
 export(convertEmber)
+export(convertGlobalCCSinstitute)
 export(convertGlobalEnergyMonitor)
 export(convertHRE)
+export(convertIEA_CCUS)
 export(convertMueller)
 export(convertUBA)
 export(convertUNFCCC)
 export(convertUNIDO)
 export(convertUSGS)
+export(exportThresholds)
 export(filter_historical_mif)
 export(readADVANCE_WP2)
 export(readAGEB)
 export(readAR6GWP)
 export(readEDGAR7Fgases)
 export(readEmber)
+export(readGlobalCCSinstitute)
 export(readGlobalEnergyMonitor)
 export(readHRE)
+export(readIEA_CCUS)
+export(readIEA_HSMR)
 export(readIEA_WEIO_2014)
 export(readMueller)
 export(readODYM_RECC)
@@ -73,29 +82,18 @@ import(madrat)
 import(magclass)
 import(mrcommons)
 import(mrdrivers)
-importFrom(Hmisc,wtd.quantile)
-importFrom(R.utils,isZero)
 importFrom(assertr,assert)
 importFrom(assertr,in_set)
 importFrom(assertr,not_na)
 importFrom(assertr,verify)
 importFrom(assertr,within_bounds)
-importFrom(broom,tidy)
-importFrom(car,logit)
-importFrom(countrycode,countrycode)
 importFrom(data.table,":=")
-importFrom(data.table,as.data.table)
 importFrom(data.table,data.table)
-importFrom(data.table,dcast)
-importFrom(data.table,fread)
 importFrom(data.table,rbindlist)
 importFrom(data.table,setDT)
-importFrom(data.table,setcolorder)
 importFrom(data.table,setkeyv)
 importFrom(data.table,setnames)
-importFrom(dplyr,"%>%")
 importFrom(dplyr,across)
-importFrom(dplyr,add_row)
 importFrom(dplyr,anti_join)
 importFrom(dplyr,arrange)
 importFrom(dplyr,as_tibble)
@@ -107,11 +105,9 @@ importFrom(dplyr,desc)
 importFrom(dplyr,distinct)
 importFrom(dplyr,everything)
 importFrom(dplyr,filter)
-importFrom(dplyr,filter_)
 importFrom(dplyr,first)
 importFrom(dplyr,full_join)
 importFrom(dplyr,group_by)
-importFrom(dplyr,group_by_)
 importFrom(dplyr,inner_join)
 importFrom(dplyr,lag)
 importFrom(dplyr,last)
@@ -120,23 +116,20 @@ importFrom(dplyr,left_join)
 importFrom(dplyr,matches)
 importFrom(dplyr,min_rank)
 importFrom(dplyr,mutate)
-importFrom(dplyr,mutate_)
 importFrom(dplyr,n)
 importFrom(dplyr,pull)
 importFrom(dplyr,recode)
 importFrom(dplyr,relocate)
 importFrom(dplyr,rename)
-importFrom(dplyr,rename_)
 importFrom(dplyr,rename_all)
 importFrom(dplyr,right_join)
 importFrom(dplyr,row_number)
 importFrom(dplyr,select)
-importFrom(dplyr,select_)
 importFrom(dplyr,semi_join)
 importFrom(dplyr,starts_with)
 importFrom(dplyr,summarise)
-importFrom(dplyr,summarise_)
 importFrom(dplyr,summarize)
+importFrom(dplyr,tibble)
 importFrom(dplyr,tribble)
 importFrom(dplyr,ungroup)
 importFrom(dplyr,vars)
@@ -159,68 +152,10 @@ importFrom(ggplot2,scale_linetype_manual)
 importFrom(ggplot2,scale_shape_manual)
 importFrom(ggplot2,theme)
 importFrom(ggplot2,theme_minimal)
-importFrom(madrat,calcOutput)
-importFrom(madrat,getConfig)
-importFrom(madrat,getISOlist)
 importFrom(madrat,madratAttach)
-importFrom(madrat,readSource)
 importFrom(madrat,toolAggregate)
-importFrom(madrat,toolCountry2isocode)
-importFrom(madrat,toolCountryFill)
-importFrom(madrat,toolFillWithRegionAvg)
-importFrom(madrat,toolFillYears)
-importFrom(madrat,toolGetMapping)
-importFrom(madrat,toolISOhistorical)
-importFrom(madrat,toolNAreplace)
-importFrom(madrat,toolSubtypeSelect)
-importFrom(madrat,vcat)
-importFrom(magclass,"getItems<-")
-importFrom(magclass,"getNames<-")
-importFrom(magclass,"getRegions<-")
-importFrom(magclass,"getSets<-")
-importFrom(magclass,"getYears<-")
-importFrom(magclass,"mselect<-")
-importFrom(magclass,add_columns)
-importFrom(magclass,add_dimension)
-importFrom(magclass,as.data.frame)
-importFrom(magclass,as.magpie)
-importFrom(magclass,clean_magpie)
-importFrom(magclass,collapseDim)
-importFrom(magclass,collapseNames)
-importFrom(magclass,complete_magpie)
-importFrom(magclass,dimReduce)
-importFrom(magclass,dimSums)
-importFrom(magclass,getCells)
-importFrom(magclass,getItems)
-importFrom(magclass,getNames)
-importFrom(magclass,getRegions)
-importFrom(magclass,getSets)
-importFrom(magclass,getYears)
-importFrom(magclass,is.magpie)
-importFrom(magclass,magpiesort)
-importFrom(magclass,magpply)
-importFrom(magclass,mbind)
-importFrom(magclass,mselect)
-importFrom(magclass,ndim)
-importFrom(magclass,new.magpie)
-importFrom(magclass,nregions)
-importFrom(magclass,nyears)
-importFrom(magclass,read.magpie)
-importFrom(magclass,read.report)
-importFrom(magclass,replace_non_finite)
-importFrom(magclass,setCells)
-importFrom(magclass,setItems)
-importFrom(magclass,setNames)
-importFrom(magclass,setYears)
-importFrom(magclass,time_interpolate)
-importFrom(magclass,where)
-importFrom(magclass,write.magpie)
-importFrom(magclass,write.report)
-importFrom(magrittr,"%<>%")
+importFrom(magclass,matchDim)
 importFrom(magrittr,"%>%")
-importFrom(plyr,round_any)
-importFrom(purrr,map)
-importFrom(purrr,reduce)
 importFrom(quitte,add_countrycode_)
 importFrom(quitte,as.quitte)
 importFrom(quitte,calc_addVariable)
@@ -229,7 +164,6 @@ importFrom(quitte,cartesian)
 importFrom(quitte,character.data.frame)
 importFrom(quitte,df_populate_range)
 importFrom(quitte,duplicate)
-importFrom(quitte,duplicate_)
 importFrom(quitte,inline.data.frame)
 importFrom(quitte,interpolate_missing_periods)
 importFrom(quitte,interpolate_missing_periods_)
@@ -241,7 +175,6 @@ importFrom(quitte,overwrite)
 importFrom(quitte,removeColNa)
 importFrom(quitte,seq_range)
 importFrom(quitte,sum_total_)
-importFrom(readODS,read_ods)
 importFrom(readr,col_character)
 importFrom(readr,col_skip)
 importFrom(readr,cols)
@@ -252,8 +185,6 @@ importFrom(readr,write_rds)
 importFrom(readxl,excel_sheets)
 importFrom(readxl,read_excel)
 importFrom(readxl,read_xlsx)
-importFrom(reshape2,acast)
-importFrom(reshape2,melt)
 importFrom(rlang,"!!!")
 importFrom(rlang,"!!")
 importFrom(rlang,.data)
@@ -270,10 +201,7 @@ importFrom(stats,na.exclude)
 importFrom(stats,na.omit)
 importFrom(stats,na.pass)
 importFrom(stats,nls)
-importFrom(stats,qnorm)
-importFrom(stats,reshape)
 importFrom(stats,sd)
-importFrom(stats,uniroot)
 importFrom(stats,weighted.mean)
 importFrom(tibble,as_tibble)
 importFrom(tibble,tibble)
@@ -284,15 +212,14 @@ importFrom(tidyr,drop_na)
 importFrom(tidyr,everything)
 importFrom(tidyr,expand_grid)
 importFrom(tidyr,extract)
+importFrom(tidyr,fill)
 importFrom(tidyr,gather)
-importFrom(tidyr,gather_)
 importFrom(tidyr,nest)
 importFrom(tidyr,nesting)
 importFrom(tidyr,pivot_longer)
 importFrom(tidyr,pivot_wider)
 importFrom(tidyr,replace_na)
 importFrom(tidyr,separate)
-importFrom(tidyr,separate_)
 importFrom(tidyr,spread)
 importFrom(tidyr,unite)
 importFrom(tidyr,unnest)