-
Notifications
You must be signed in to change notification settings - Fork 45
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 #531 from pweigmann/projectPipelines
more project pipelines, CCS subtype change
- Loading branch information
Showing
15 changed files
with
226 additions
and
64 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,7 +1,7 @@ | ||
Type: Package | ||
Package: mrremind | ||
Title: MadRat REMIND Input Data Package | ||
Version: 0.188.0 | ||
Version: 0.189.0 | ||
Date: 2024-09-12 | ||
Authors@R: c( | ||
person("Lavinia", "Baumstark", , "[email protected]", role = c("aut", "cre")), | ||
|
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
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 |
---|---|---|
@@ -0,0 +1,14 @@ | ||
#' convert IEA Hydro Special Market Report | ||
#' | ||
#' @param x a magclass object returned from `readIEA_HSMR()` | ||
#' @author Pascal Weigmann | ||
|
||
convertIEA_HSMR <- function(x) { | ||
|
||
getItems(x, dim = 1) <- toolCountry2isocode(getItems(x, dim = 1)) | ||
x <- toolCountryFill(x, fill = 0, verbosity = 2) | ||
x[, 2030, "operational"] <- x[, 2020, "operational"] | ||
x <- x[, 2030, ] | ||
|
||
return(x) | ||
} |
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
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 |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#' read IEA Hydro Special Market Report | ||
#' | ||
#' read Hydro capacities and near-term outlook from data scraped from | ||
#' https://www.iea.org/data-and-statistics/data-tools/hydropower-data-explorer | ||
#' | ||
#' @author Pascal Weigmann | ||
#' @importFrom readxl read_xlsx | ||
#' | ||
#' @export | ||
readIEA_HSMR <- function() { | ||
|
||
x <- read_xlsx("IEA_Hydropower_Special_Market_Report.xlsx") %>% | ||
# get capacities in 2030 by adding 2020 values to additions | ||
# subtract pumped storage as it is not part of Cap Hydro in REMIND | ||
mutate("2020_operational" = capacity_2020, | ||
"2030_expected" = capacity_2020 + add_expected_2030 - of_that_pumped, | ||
"2030_accelerated" = capacity_2020 + add_accelerated_2030 - of_that_pumped, | ||
variable = "Cap|Electricity|Hydro") %>% | ||
pivot_longer(cols = c("2020_operational", "2030_expected", "2030_accelerated"), | ||
names_to = "year_scen") %>% | ||
select(country, variable, year_scen, unit, value) %>% | ||
separate(year_scen, c("year", "status")) %>% | ||
as.magpie(spatial = "country") | ||
|
||
x[, 2020, "accelerated"] <- x[, 2020,"operational"] | ||
x[, 2020, "expected"] <- x[, 2020,"operational"] | ||
|
||
x <- add_dimension(x, dim = 3.1, add = "model", nm = "IEA_HSMR") | ||
|
||
return(x) | ||
} |
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.
Oops, something went wrong.