Merge pull request pik-piam#112 from deleip/hardcore

split of mrfacocore and mrlandcore + moved technical tool functions to mstools

.buildlibrary

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

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.40.8
-date-released: '2024-05-07'
+version: 1.41.0
+date-released: '2024-05-13'
 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 @@
 Package: mrcommons
 Type: Package
 Title: MadRat commons Input Data Library
-Version: 1.40.8
-Date: 2024-05-07
+Version: 1.41.0
+Date: 2024-05-13
 Authors@R: c(person("Benjamin Leon", "Bodirsky", email = "[email protected]", role = "aut"),
              person("Kristine", "Karstens", role = "aut"),
              person("Lavinia", "Baumstark", role = "aut"),
@@ -43,18 +43,17 @@ Depends:
     magclass (>= 3.17),
     madrat (>= 2.20.9),
     mrdrivers (>= 1.0.0),
-    mstools
+    mrfaocore (>= 1.0.0),
+    mrlandcore (>= 1.0.0),
+    mstools (>= 0.6.0)
 Imports:
     data.table,
     dplyr,
     hdf5r,
     GDPuc,
-    lpjclass,
-    lpjmlkit,
     luscale,
     magpiesets (>= 0.44.2),
     ncdf4,
-    nleqslv,
     openxlsx,
     purrr,
     quitte,
@@ -63,7 +62,6 @@ Imports:
     readxl,
     reshape2,
     rlang,
-    SPEI,
     stringr,
     tidyr,
     tibble,

NAMESPACE

@@ -6,7 +6,6 @@ export(calcBodyHeight)
 export(calcClimateClass)
 export(calcConstructionWoodDemand)
 export(calcDemography)
-export(calcForestArea)
 export(calcGovernanceIndicator)
 export(calcGrowingStock)
 export(calcGrowingStockNRF)
@@ -23,38 +22,19 @@ export(convertJRC_IDEES)
 export(convertMAgPIE)
 export(readEU_ReferenceScenario)
 export(readEurostat)
-export(readFAO_FRA2015)
-export(readFRA2020)
 export(readFeedEfficiencyReg)
 export(readFeedShareReg)
 export(readHoulton2018)
 export(readJRC_IDEES)
-export(readLPJmLClimateInput)
-export(toolAggregateCell2Country)
 export(toolCalcIEAfromStructureMappingPEFE)
-export(toolCell2isoCell)
-export(toolClimateInputVersion)
-export(toolCoord2Isocell)
-export(toolCoord2Isocoord)
-export(toolCountryFillBilateral)
-export(toolExtrapolateFodder)
-export(toolFAOcombine)
-export(toolForestRelocate)
-export(toolFreezeEffect)
-export(toolGetMappingCoord2Country)
-export(toolHarmonize2Baseline)
-export(toolHoldConstantBeyondEnd)
-export(toolIso2CellCountries)
-export(toolLPJmLVersion)
 export(toolPregnant)
-export(toolSmooth)
-export(toolSum2Country)
 import(madrat)
 import(magclass)
 import(mrdrivers)
+import(mrfaocore)
+import(mrlandcore)
 import(mstools)
 importFrom(GDPuc,convertGDP)
-importFrom(SPEI,thornthwaite)
 importFrom(countrycode,countrycode)
 importFrom(data.table,":=")
 importFrom(data.table,as.data.table)
@@ -84,12 +64,7 @@ importFrom(dplyr,rename)
 importFrom(dplyr,right_join)
 importFrom(dplyr,select)
 importFrom(dplyr,summarise)
-importFrom(dplyr,ungroup)
-importFrom(graphics,plot)
 importFrom(hdf5r,h5file)
-importFrom(lpjclass,read.LPJ_input)
-importFrom(lpjclass,readLPJ)
-importFrom(lpjmlkit,read_io)
 importFrom(luscale,getAggregationMatrix)
 importFrom(luscale,groupAggregate)
 importFrom(luscale,rename_dimnames)
@@ -106,11 +81,8 @@ importFrom(madrat,toolFillWithRegionAvg)
 importFrom(madrat,toolFillYears)
 importFrom(madrat,toolGetMapping)
 importFrom(madrat,toolNAreplace)
-importFrom(madrat,toolOrderCells)
 importFrom(madrat,toolSplitSubtype)
 importFrom(madrat,toolSubtypeSelect)
-importFrom(madrat,toolTimeAverage)
-importFrom(madrat,toolTimeSpline)
 importFrom(magclass,"getItems<-")
 importFrom(magclass,"getNames<-")
 importFrom(magclass,"getSets<-")
@@ -122,14 +94,11 @@ importFrom(magclass,as.magpie)
 importFrom(magclass,clean_magpie)
 importFrom(magclass,collapseDim)
 importFrom(magclass,collapseNames)
-importFrom(magclass,complete_magpie)
 importFrom(magclass,convergence)
-importFrom(magclass,dimExists)
 importFrom(magclass,dimOrder)
 importFrom(magclass,dimReduce)
 importFrom(magclass,dimSums)
 importFrom(magclass,getCPR)
-importFrom(magclass,getCells)
 importFrom(magclass,getCoords)
 importFrom(magclass,getItems)
 importFrom(magclass,getNames)
@@ -139,13 +108,10 @@ importFrom(magclass,getYears)
 importFrom(magclass,hasCoords)
 importFrom(magclass,lowpass)
 importFrom(magclass,magpie_expand)
-importFrom(magclass,magpiesort)
 importFrom(magclass,mbind)
 importFrom(magclass,mselect)
-importFrom(magclass,ncells)
 importFrom(magclass,ndim)
 importFrom(magclass,new.magpie)
-importFrom(magclass,nyears)
 importFrom(magclass,read.magpie)
 importFrom(magclass,read.report)
 importFrom(magclass,setCells)
@@ -162,11 +128,9 @@ importFrom(magpiesets,reporthelper)
 importFrom(magpiesets,reportingnames)
 importFrom(methods,new)
 importFrom(mstools,toolFertilizerDistribution)
-importFrom(mstools,toolHoldConstant)
 importFrom(ncdf4,nc_close)
 importFrom(ncdf4,nc_open)
 importFrom(ncdf4,ncvar_get)
-importFrom(nleqslv,nleqslv)
 importFrom(openxlsx,read.xlsx)
 importFrom(purrr,map)
 importFrom(purrr,map2)
@@ -205,21 +169,12 @@ importFrom(stats,na.omit)
 importFrom(stats,quantile)
 importFrom(stats,reshape)
 importFrom(stats,xtabs)
-importFrom(stringr,str_count)
 importFrom(stringr,str_detect)
 importFrom(stringr,str_extract)
-importFrom(stringr,str_match)
-importFrom(stringr,str_split)
 importFrom(stringr,str_sub)
-importFrom(stringr,str_subset)
-importFrom(stringr,str_trim)
-importFrom(terra,"ext<-")
-importFrom(terra,aggregate)
 importFrom(terra,app)
 importFrom(terra,classify)
-importFrom(terra,ext)
 importFrom(terra,focal)
-importFrom(terra,project)
 importFrom(terra,rast)
 importFrom(terra,rasterize)
 importFrom(terra,segregate)
@@ -239,17 +194,13 @@ importFrom(tidyr,replace_na)
 importFrom(tidyr,starts_with)
 importFrom(tidyr,unite)
 importFrom(tidyr,unnest)
-importFrom(tools,file_ext)
-importFrom(tools,file_path_sans_ext)
 importFrom(utils,bibentry)
 importFrom(utils,capture.output)
 importFrom(utils,download.file)
 importFrom(utils,head)
-importFrom(utils,packageVersion)
 importFrom(utils,person)
 importFrom(utils,read.csv)
 importFrom(utils,read.csv2)
-importFrom(utils,read.delim)
 importFrom(utils,read.table)
 importFrom(utils,tail)
 importFrom(utils,unzip)