Merge pull request pik-piam#210 from pfuehrlich-pik/master

remove edge buildings specific functions

.buildlibrary

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

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "mrremind: MadRat REMIND Input Data Package",
-  "version": "0.107.0",
+  "version": "0.107.1",
   "description": "<p>The mrremind packages contains data preprocessing for the REMIND model.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: mrremind
 Type: Package
 Title: MadRat REMIND Input Data Package
-Version: 0.107.0
-Date: 2022-02-11
+Version: 0.107.1
+Date: 2022-02-14
 Authors@R: c(person("Lavinia", "Baumstark", email = "[email protected]", role = c("aut","cre")),
              person("Renato", "Rodrigues", role = "aut"),
              person("Antoine", "Levesque", role = "aut"),
@@ -32,7 +32,7 @@ Depends:
     R(>= 2.10.0),
     magclass(>= 3.17),
     madrat(>= 2.5.1),
-    mrcommons(>= 1.0.0)
+    mrcommons(>= 1.7.1)
 Imports:
     assertr,
     assertthat,

NAMESPACE

@@ -63,7 +63,6 @@ importFrom(dplyr,across)
 importFrom(dplyr,add_row)
 importFrom(dplyr,anti_join)
 importFrom(dplyr,arrange)
-importFrom(dplyr,arrange_)
 importFrom(dplyr,as_tibble)
 importFrom(dplyr,between)
 importFrom(dplyr,bind_cols)
@@ -144,7 +143,6 @@ importFrom(magclass,getRegions)
 importFrom(magclass,getSets)
 importFrom(magclass,getYears)
 importFrom(magclass,is.magpie)
-importFrom(magclass,lowpass)
 importFrom(magclass,magpiesort)
 importFrom(magclass,magpply)
 importFrom(magclass,mbind)

R/calcFEShares.R

@@ -9,7 +9,7 @@ calcFEShares <- function(subtype) {
 
    #---- READ Data -----
 
-  edge_buildings = calcOutput("IO", subtype = "output_EDGE_buildings", aggregate = F)
+  edge_buildings = calcOutput("IOEdgeBuildings", subtype = "output_EDGE_buildings", aggregate = F)
   output = calcOutput("IO",subtype  = "output", aggregate = F)
   fe_demand = calcOutput("FEdemand", aggregate = F)[,,"gdp_SSP1"]
   fe_demand = collapseNames(fe_demand)