Migrate functions to mrenergy and mrenergycore

.buildlibrary

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

.gitignore

@@ -3,6 +3,6 @@
 .RData
 .Ruserdata
 .positai
-mrcommons.Rproj
+*.Rproj
 .Rproj.user
 .positai

.lintr

@@ -1,2 +1,2 @@
-linters: lucode2::lintrRules()
+linters: lucode2::lintrRules(modification = list(pipe_consistency_linter = pipe_consistency_linter(pipe = c("auto"))))
 encoding: "UTF-8"

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: 'mrcommons: MadRat commons Input Data Library'
-version: 1.68.3
-date-released: '2026-05-29'
+version: 1.69.0
+date-released: '2026-06-02'
 abstract: Provides useful functions and a common structure to all the input data required
   to run models like MAgPIE and REMIND of model input data.
 authors:

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrcommons
 Title: MadRat commons Input Data Library
-Version: 1.68.3
-Date: 2026-05-29
+Version: 1.69.0
+Date: 2026-06-02
 Authors@R: c(
     person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = "aut"),
     person("Kristine", "Karstens", role = "aut"),
@@ -51,6 +51,7 @@ Depends:
     madrat (>= 3.10.0),
     magclass (>= 3.17),
     mrdrivers (>= 7.1.1),
+    mrenergycore (>= 0.2.0),
     mrfaocore (>= 1.0.0),
     mrlandcore (>= 1.0.0),
     mstools (>= 0.6.0),
@@ -64,7 +65,6 @@ Imports:
     magpiesets (>= 0.44.2),
     methods,
     ncdf4,
-    openxlsx,
     purrr,
     quitte,
     raster,
@@ -73,7 +73,6 @@ Imports:
     rlang,
     stringr,
     terra,
-    tibble,
     tidyr,
     withr,
     zoo

NAMESPACE

@@ -16,37 +16,27 @@ export(calcPlantEstablishCalib)
 export(calcTimberDemand)
 export(calcTimberTradeBilateral)
 export(calcWoodDensity)
-export(convertEU_ReferenceScenario)
-export(convertJRC_IDEES)
 export(convertMAgPIE)
-export(readEU_ReferenceScenario)
-export(readEurostat)
 export(readFeedEfficiencyReg)
 export(readFeedShareReg)
 export(readHoulton2018)
-export(readJRC_IDEES)
 export(toolCalcIEAfromStructureMappingPEFE)
 export(toolPregnant)
-export(toolSplitBiomass)
 import(GDPuc)
 import(madrat)
 import(magclass)
 import(mrdrivers)
+import(mrenergycore)
 import(mrfaocore)
 import(mrlandcore)
 import(mstools)
 importFrom(countrycode,countrycode)
-importFrom(data.table,":=")
 importFrom(data.table,as.data.table)
 importFrom(data.table,fread)
 importFrom(dplyr,"%>%")
-importFrom(dplyr,.data)
 importFrom(dplyr,`%>%`)
 importFrom(dplyr,across)
-importFrom(dplyr,all_of)
 importFrom(dplyr,arrange)
-importFrom(dplyr,bind_cols)
-importFrom(dplyr,bind_rows)
 importFrom(dplyr,count)
 importFrom(dplyr,distinct)
 importFrom(dplyr,filter)
@@ -55,11 +45,9 @@ importFrom(dplyr,group_by)
 importFrom(dplyr,inner_join)
 importFrom(dplyr,last)
 importFrom(dplyr,left_join)
-importFrom(dplyr,matches)
 importFrom(dplyr,mutate)
 importFrom(dplyr,mutate_all)
 importFrom(dplyr,n)
-importFrom(dplyr,pull)
 importFrom(dplyr,recode)
 importFrom(dplyr,relocate)
 importFrom(dplyr,rename)
@@ -71,7 +59,6 @@ importFrom(luscale,getAggregationMatrix)
 importFrom(luscale,groupAggregate)
 importFrom(luscale,rename_dimnames)
 importFrom(madrat,calcOutput)
-importFrom(madrat,getISOlist)
 importFrom(madrat,metadataGFZ)
 importFrom(madrat,readSource)
 importFrom(madrat,regionscode)
@@ -85,11 +72,9 @@ importFrom(madrat,toolSplitSubtype)
 importFrom(madrat,toolSubtypeSelect)
 importFrom(magclass,"getItems<-")
 importFrom(magclass,"getNames<-")
-importFrom(magclass,"getSets<-")
 importFrom(magclass,"getYears<-")
 importFrom(magclass,add_columns)
 importFrom(magclass,add_dimension)
-importFrom(magclass,as.data.frame)
 importFrom(magclass,as.magpie)
 importFrom(magclass,clean_magpie)
 importFrom(magclass,collapseDim)
@@ -114,7 +99,6 @@ importFrom(magclass,new.magpie)
 importFrom(magclass,read.magpie)
 importFrom(magclass,read.report)
 importFrom(magclass,setCells)
-importFrom(magclass,setItems)
 importFrom(magclass,setNames)
 importFrom(magclass,setYears)
 importFrom(magclass,time_interpolate)
@@ -130,15 +114,11 @@ importFrom(mstools,toolGetMappingCoord2Country)
 importFrom(ncdf4,nc_close)
 importFrom(ncdf4,nc_open)
 importFrom(ncdf4,ncvar_get)
-importFrom(openxlsx,read.xlsx)
 importFrom(purrr,map)
 importFrom(purrr,map2)
 importFrom(purrr,pmap)
 importFrom(purrr,walk)
-importFrom(quitte,add_countrycode_)
 importFrom(quitte,as.quitte)
-importFrom(quitte,calc_addVariable)
-importFrom(quitte,character.data.frame)
 importFrom(quitte,inline.data.frame)
 importFrom(raster,"res<-")
 importFrom(raster,aggregate)
@@ -154,16 +134,12 @@ importFrom(raster,resample)
 importFrom(raster,stack)
 importFrom(raster,subset)
 importFrom(raster,writeRaster)
-importFrom(readxl,excel_sheets)
 importFrom(readxl,read_excel)
 importFrom(readxl,read_xlsx)
 importFrom(reshape2,acast)
 importFrom(reshape2,dcast)
 importFrom(reshape2,melt)
 importFrom(rlang,.data)
-importFrom(rlang,is_empty)
-importFrom(rlang,sym)
-importFrom(rlang,syms)
 importFrom(stats,na.omit)
 importFrom(stats,quantile)
 importFrom(stats,reshape)
@@ -181,18 +157,10 @@ importFrom(terra,subset)
 importFrom(terra,terraOptions)
 importFrom(terra,tmpFiles)
 importFrom(terra,vect)
-importFrom(tibble,as_tibble)
-importFrom(tibble,tibble)
-importFrom(tidyr,complete)
-importFrom(tidyr,drop_na)
 importFrom(tidyr,expand_grid)
 importFrom(tidyr,matches)
-importFrom(tidyr,nesting)
 importFrom(tidyr,pivot_longer)
-importFrom(tidyr,replace_na)
-importFrom(tidyr,separate_wider_delim)
 importFrom(tidyr,starts_with)
-importFrom(tidyr,unite)
 importFrom(tidyr,unnest)
 importFrom(utils,bibentry)
 importFrom(utils,capture.output)

R/calc1stBioenergyPast.R

@@ -19,8 +19,7 @@ calc1stBioenergyPast <- function() {
       name = "structuremappingPE.csv",
       where = "mrcommons",
       returnPathOnly = TRUE
-    ),
-    subtype = "magpie"
+    )
   )
 
   # Unit conversion from ktoe to PJ