-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #352 from robinhasse/resComFloorReporting
Residential and commercial floor space.
- Loading branch information
Showing
8 changed files
with
55 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
Type: Package | ||
Package: mrremind | ||
Title: MadRat REMIND Input Data Package | ||
Version: 0.167.4 | ||
Date: 2023-08-14 | ||
Version: 0.168.0 | ||
Date: 2023-08-18 | ||
Authors@R: c( | ||
person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")), | ||
person("Renato", "Rodrigues", role = "aut"), | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,26 @@ | ||
#' Floor space in buildings | ||
#' | ||
#' Residential, commercial and total floor space from EDGE-B. Set | ||
#' | ||
#' @author Antoine Levesque, Robin Hasse | ||
#' | ||
#' @param onlyTotal boolean, only give total instead of sub-sectoral floor space | ||
#' @return MAgPIE object with buildings floor space | ||
#' | ||
#' @importFrom madrat readSource | ||
#' @importFrom magclass collapseNames | ||
#' @export | ||
#' | ||
calcFloorspace <- function(onlyTotal = FALSE) { | ||
|
||
calcFloorspace <- function() { | ||
|
||
data <- readSource("EDGE", subtype = "Floorspace") | ||
data <- collapseNames(data[,,"buildings"]) | ||
|
||
return(list(x=data,weight=NULL, unit = "million m2", description = "Buildings floorspace")) | ||
data <- readSource("EDGE", subtype = "Floorspace") | ||
|
||
if (onlyTotal) { | ||
data <- collapseNames(data[, , "buildings"]) | ||
} | ||
|
||
return(list(x = data, | ||
weight = NULL, | ||
unit = "million m2", | ||
description = "Buildings floor space")) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.