diff --git a/DESCRIPTION b/DESCRIPTION index 28b810ce..8254d0bb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -88,6 +88,6 @@ Suggests: VignetteBuilder: knitr Encoding: UTF-8 -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.0 Config/testthat/parallel: true Config/testthat/edition: 3 diff --git a/R/convGDX2MIF.R b/R/convGDX2MIF.R index e635c6da..7152170b 100644 --- a/R/convGDX2MIF.R +++ b/R/convGDX2MIF.R @@ -40,10 +40,7 @@ convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default", # make the reporting output <- NULL - # onlyReportFE <- TRUE - onlyReportFE <- FALSE - if (! onlyReportFE) { message("running reportMacroEconomy...") output <- mbind(output,reportMacroEconomy(gdx,regionSubsetList,t)[,t,]) message("running reportTrade...") @@ -52,10 +49,8 @@ convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default", output <- mbind(output,reportPE(gdx,regionSubsetList,t)[,t,]) message("running reportSE...") output <- mbind(output,reportSE(gdx,regionSubsetList,t)[,t,]) - } message("running reportFE...") output <- mbind(output,reportFE(gdx,regionSubsetList,t)) - if (! onlyReportFE) { message("running reportExtraction...") output <- mbind(output,reportExtraction(gdx,regionSubsetList,t)[,t,]) message("running reportCapacity...") @@ -118,7 +113,7 @@ convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default", } else { message("function reportSDPVariables does not work and is skipped") } - } + # Add dimension names "scenario.model.variable" getSets(output)[3] <- "variable" output <- add_dimension(output,dim=3.1,add = "model",nm = "REMIND") diff --git a/man/remind2-package.Rd b/man/remind2-package.Rd index 0d429646..1fa7c63d 100644 --- a/man/remind2-package.Rd +++ b/man/remind2-package.Rd @@ -8,3 +8,47 @@ \description{ Contains the REMIND-specific routines for data and model output manipulation. } +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/pik-piam/remind2} +} + +} +\author{ +\strong{Maintainer}: Renato Rodrigues \email{renato.rodrigues@pik-potsdam.de} + +Authors: +\itemize{ + \item Lavinia Baumstark + \item Falk Benke + \item Jan Philipp Dietrich + \item Alois Dirnaichner + \item Pascal Führlich + \item Anastasis Giannousakis + \item Robin Hasse + \item Jérome Hilaire + \item David Klein + \item Johannes Koch + \item Katarzyna Kowalczyk + \item Antoine Levesque + \item Aman Malik + \item Anne Merfort + \item Leon Merfort + \item Simón Morena-Leiva + \item Michaja Pehl + \item Robert Pietzcker + \item Sebastian Rauner + \item Oliver Richters + \item Marianna Rottoli + \item Christof Schötz + \item Felix Schreyer + \item Kais Siala + \item Björn Sörgel + \item Mike Spahr + \item Jessica Strefler + \item Philipp Verpoort + \item Pascal Weigmann +} + +}