Merge branch 'master' of github.com:pik-piam/remind2 into cleanup

.buildlibrary

@@ -1,16 +1,9 @@
-ValidationKey: '231537870'
+ValidationKey: '231770553'
 AcceptedWarnings:
-- 'Warning: package ''.*'' was built under R version'
-- 'Warning: namespace ''.*'' is not available and has been replaced'
-- .*qpdf.* is needed for checks on size reduction of PDFs
 - .*following variables are expected in the piamInterfaces.*
 - Summation checks have revealed some gaps.*
 - .*to check if summation groups add up.*
-AcceptedNotes:
-- All declared Imports should be used.
-- Imports includes .* non-default packages.
-- unable to verify current time
-- checking installed package size
+AcceptedNotes: Imports includes .* non-default packages.
 AutocreateReadme: yes
 allowLinterWarnings: yes
 enforceVersionUpdate: yes

.github/workflows/check.yaml

@@ -23,14 +23,14 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |
-            any::lucode2
-            any::covr
-            any::madrat
-            any::magclass
-            any::citation
-            any::gms
-            any::goxygen
-            any::GDPuc
+            lucode2
+            covr
+            madrat
+            magclass
+            citation
+            gms
+            goxygen
+            GDPuc
           # piam packages also available on CRAN (madrat, magclass, citation,
           # gms, goxygen, GDPuc) will usually have an outdated binary version
           # available; by using extra-packages we get the newest version

CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'remind2: The REMIND R package (2nd generation)'
-version: 1.157.4
-date-released: '2024-10-09'
+version: 1.158.1
+date-released: '2024-10-17'
 abstract: Contains the REMIND-specific routines for data and model output manipulation.
 authors:
 - family-names: Rodrigues

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: remind2
 Title: The REMIND R package (2nd generation)
-Version: 1.157.4
-Date: 2024-10-09
+Version: 1.158.1
+Date: 2024-10-17
 Authors@R: c(
     person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")),
     person("Lavinia", "Baumstark", role = "aut"),

R/convGDX2MIF_LCOE.R

@@ -29,7 +29,7 @@ convGDX2MIF_LCOE <- function(gdx, gdx_ref, file = NULL, scenario = "default",
   output <- NULL
   output <- mbind(output, reportLCOE(gdx)[, t, ])
 
-  # write the LCOE.mif or give back the magpie opject output
+  # write the LCOE.mif or give back the magpie object output
   if (!is.null(file)) {
     write.report(output, model = "REMIND", scenario = scenario, file = file, ndigit = 7)
   } else {

R/reportLCOE.R

@@ -56,7 +56,7 @@ reportLCOE <- function(gdx, output.type = "both") {
   v32_storloss <- readGDX(gdx, "v32_storloss", field = "l")
 
   if (is.null(vm_capFac) || is.null(qm_balcapture) || is.null(vm_co2CCS) ||
-        is.null(pm_emifac) || is.null(v32_storloss)) {
+      is.null(pm_emifac) || is.null(v32_storloss)) {
     print("The gdx file is too old for generating a LCOE reporting...returning NULL")
     return(new.magpie(cells_and_regions = "GLO",
                       years = c(seq(2005, 2060, 5), seq(2070, 2110, 10), 2130, 2150)))
@@ -354,7 +354,9 @@ reportLCOE <- function(gdx, output.type = "both") {
 
     grid_factor_tech <- new.magpie(names = te2grid$all_te, fill = 1)
     getSets(grid_factor_tech)[3] <- "all_te"
-    grid_factor_tech[, , "wind"] <- 1.5
+    if ("wind" %in% getNames(grid_factor_tech)) {
+      grid_factor_tech[, , "wind"] <- 1.5
+    }
     grid_factor_tech[, , "windon"] <- 1.5
     grid_factor_tech[, , "windoff"] <- 3.0
 
@@ -363,7 +365,7 @@ reportLCOE <- function(gdx, output.type = "both") {
     te_annual_grid_cost_wadj <- new.magpie(getRegions(te_inv_annuity), ttot_from2005, magclass::getNames(te_inv_annuity), fill = 0)
 
 
-    gridwindonStr <- ifelse("windon" %in% all_te, "gridwindon", "gridwind")
+    gridwindonStr <- ifelse("windon" %in% te2grid$all_te, "gridwindon", "gridwind")
 
     te_annual_grid_cost[, , te2grid$all_te] <-
       collapseNames(te_annual_inv_cost[, ttot_from2005, gridwindonStr] + te_annual_OMF_cost[, , gridwindonStr]) *

README.md

@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.157.4**
+R package **remind2**, version **1.158.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2)  [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds)
 
@@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.157.4, <https://github.com/pik-piam/remind2>.
+Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.158.1, <https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is
   title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann and Tonn Rüter},
   year = {2024},
-  note = {R package version 1.157.4},
+  note = {R package version 1.158.1},
   url = {https://github.com/pik-piam/remind2},
 }
 ```

inst/compareScenarios/cs_01_summary.Rmd

@@ -36,7 +36,8 @@ items <- c(
   "Emi|CO2|CDR|Industry CCS|Synthetic Fuels",
   "Emi|CO2|CDR|DACCS",
   "Emi|CO2|CDR|OAE",
-  "Emi|CO2|CDR|EW")
+  "Emi|CO2|CDR|EW",
+  "Emi|CO2|Accounted in Other Sectors via CCU|Energy|Industry")
 showAreaAndBarPlots(data, items, tot, scales = "fixed")
 ```
 
@@ -63,7 +64,8 @@ items <- c(
   "Emi|CO2|CDR|Industry CCS|Synthetic Fuels",
   "Emi|CO2|CDR|DACCS",
   "Emi|CO2|CDR|OAE",
-  "Emi|CO2|CDR|EW")
+  "Emi|CO2|CDR|EW",
+  "Emi|CO2|Accounted in Other Sectors via CCU|Energy|Industry")
 showAreaAndBarPlots(data, items, tot, scales = "fixed")
 ```
 

inst/extdata/additional_summation_checks.csv

@@ -23,10 +23,11 @@ Emi|GHG;Emi|GHG|+++|Agriculture;1
 Emi|GHG;Emi|GHG|+++|Land-Use Change;1
 Emi|GHG;Emi|CO2|CDR|BECCS;1
 Emi|GHG;Emi|CO2|CDR|DACCS;1
-Emi|GHG;Emi|CO2|CDR|Industry CCS|Synthetic Fuels;1
 Emi|GHG;Emi|CO2|CDR|EW;1
-Emi|GHG;Emi|CO2|CDR|Materials|+|Plastics;1
 Emi|GHG;Emi|CO2|CDR|OAE;1
+Emi|GHG;Emi|CO2|CDR|Materials|+|Plastics;1
+Emi|GHG;Emi|CO2|CDR|Industry CCS|Synthetic Fuels;1
+Emi|GHG;Emi|CO2|Accounted in Other Sectors via CCU|Energy|Industry;1
 ;;
 # total CO2 emissions by sectors with separation into gross and negative emissions;;
 Emi|CO2;Emi|CO2|Gross|Energy|Supply|+|Electricity;1
@@ -38,11 +39,12 @@ Emi|CO2;Emi|CO2|Energy|Demand|+|CDR;1
 Emi|CO2;Emi|CO2|+|Land-Use Change;1
 Emi|CO2;Emi|CO2|+|Industrial Processes;1
 Emi|CO2;Emi|CO2|CDR|BECCS;1
-Emi|CO2;Emi|CO2|CDR|Industry CCS|Synthetic Fuels;1
 Emi|CO2;Emi|CO2|CDR|DACCS;1
 Emi|CO2;Emi|CO2|CDR|EW;1
-Emi|CO2;Emi|CO2|CDR|Materials|+|Plastics;1
 Emi|CO2;Emi|CO2|CDR|OAE;1
+Emi|CO2;Emi|CO2|CDR|Materials|+|Plastics;1
+Emi|CO2;Emi|CO2|CDR|Industry CCS|Synthetic Fuels;1
+Emi|CO2;Emi|CO2|Accounted in Other Sectors via CCU|Energy|Industry;1
 ;;
 # total GHG emissions by CO2 sectors and non-CO2 gases;;
 Emi|GHG 1;Emi|CO2|+|Energy;1
@@ -68,6 +70,7 @@ Emi|CO2|Cumulated;Emi|CO2|Cumulated|CDR|DACCS;1
 Emi|CO2|Cumulated;Emi|CO2|Cumulated|CDR|EW;1
 Emi|CO2|Cumulated;Emi|CO2|Cumulated|CDR|Materials|Plastics;1
 Emi|CO2|Cumulated;Emi|CO2|Cumulated|CDR|OAE;1
+Emi|CO2|Cumulated;Emi|CO2|Cumulated|Accounted in Other Sectors via CCU|Energy|Industry;1
 ;;
 # total CDR;;
 Emi|CO2|CDR;Emi|CO2|CDR|Land-Use Change;1