Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
fbenke-pik committed Feb 19, 2024
1 parent 5518bd1 commit 8782b5a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
25 changes: 15 additions & 10 deletions R/calcClinker_to_cement_ratio.R
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
#' Calculate Clinker-to-Cement Ratio
#'
#'
#' @md
#' @return A list with a [`magpie`][magclass::magclass] object `x`, `weight`,
#' `unit`, and `description`.
#'
#'
#' @author Michaja Pehl
#'
#'
#' @seealso [`calcOutput()`], [`readADVANCE_WP2()`], [`convertADVANCE_WP2()`]
#'
#'
#' @importFrom madrat readSource calcOutput
#'
#'
#' @export
calcClinker_to_cement_ratio <- function() {
list(x = `getYears<-`(readSource('ADVANCE_WP2', 'clinker-to-cement-ratio'),
2005),
weight = calcOutput('GDPPast', aggregate = FALSE)[,2015,],
unit = 'ratio',
description = 'clinker-to-cement ratio') %>%

x <- readSource("ADVANCE_WP2", "clinker-to-cement-ratio")
getYears(x) <- 2005

list(
x = x,
weight = calcOutput("GDPPast", aggregate = FALSE)[, 2015, ],
unit = "ratio",
description = "clinker-to-cement ratio"
) %>%
return()
}
2 changes: 1 addition & 1 deletion R/fullREMIND.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fullREMIND <- function() {

rem_years <- seq(2005, 2150, 5)
rem_years_hist <- seq(1990, 2150, 5)

# some comment
madratAttach("edgeTransport") # enable madrat caching for edgeTransport

#-------------- macro-economic parameters -----------------------------------------------------------
Expand Down

0 comments on commit 8782b5a

Please sign in to comment.