Croparea update

.Rbuildignore

@@ -14,3 +14,4 @@
 ^.*CITATION.cff$
 ^\.claude$
 ^_pkgdown\.yml$
+^\.positai$

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '34377536'
+ValidationKey: '34532260'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package .* was built under R version'

.gitignore

@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 .Ruserdata
+.positai

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: 'mrmagpie: madrat based MAgPIE Input Data Library'
-version: 1.66.3
-date-released: '2026-08-07'
+version: 1.67.0
+date-released: '2026-08-13'
 abstract: Provides functions for MAgPIE country and cellular input data generation.
 authors:
 - family-names: Karstens

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrmagpie
 Title: madrat based MAgPIE Input Data Library
-Version: 1.66.3
-Date: 2026-08-07
+Version: 1.67.0
+Date: 2026-08-13
 Authors@R: c(
     person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")),
     person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"),

R/calcAreaActuallyIrrigated.R

@@ -15,7 +15,8 @@
 
 calcAreaActuallyIrrigated <- function(aggregationlevel = "iso", selectyears = "y1995") {
   # Read in data: crop- and water supply type specific crop area (in Mha):
-  x <- calcOutput("Croparea", physical = TRUE, cellular = TRUE, irrigation = TRUE, round = 6, aggregate = FALSE, years = selectyears)
+  x <- calcOutput("Croparea", physical = TRUE, cellular = TRUE, irrigation = TRUE,
+                  aggregate = FALSE, years = selectyears, fallow = FALSE)
 
   # extract irrigated area:
   x <- dimSums(x[, , "irrigated"], dim = 3.1)
@@ -24,17 +25,16 @@ calcAreaActuallyIrrigated <- function(aggregationlevel = "iso", selectyears = "y
 
   if (aggregationlevel == "iso") {
     # country to cell mapping
-    CountryToCell <- toolGetMapping(type = "cell", name = "CountryToCellMapping.csv", where = "mappingfolder")
+    countryToCell <- toolGetMapping(type = "cell", name = "CountryToCellMapping.csv", where = "mappingfolder")
     # aggregate data
-    toolAggregate(x, dim = 1, rel = CountryToCell)
+    out <- toolAggregate(x, dim = 1, rel = countryToCell)
 
   } else {
     out <- x
   }
 
-  return(list(
-    x = out,
-    weight = NULL,
-    unit = "Million ha",
-    description = "Irrigated cropland area"))
+  return(list(x = out,
+              weight = NULL,
+              unit = "Million ha",
+              description = "Irrigated cropland area"))
 }

R/calcAvlLandSi.R

@@ -22,11 +22,10 @@ calcAvlLandSi <- function(cells = "lpjcell") {
   x        <- readSource("Ramankutty", convert = "onlycorrect")
 
   # land area according to LUH in initialization year (1995) [note: landarea is constant, so the year does not matter]
-  landarea <- calcOutput("LUH3",
-                         landuseTypes = "magpie",
+  landarea <- calcOutput("LanduseInitialisation",
+                         nclasses = "five",
                          aggregate = FALSE,
                          cellular = TRUE,
-                         irrigation = FALSE,
                          years = "y1995")
   croparea <- landarea[, , "crop"]
   landarea <- dimSums(landarea, dim = 3)

R/fullCELLULARMAGPIE.R

@@ -86,6 +86,7 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "",
   magYearsPastLong <- c("y1995", "y2000", "y2005", "y2010", "y2015")
   magYears         <- findset("time")
   shortYears       <- findset("t_all")
+  pastTil2015      <- c(findset("past"), "y2015")
   lpjYears         <- seq(1995, 2100, by = 5)
   roundArea        <- 5
   stats            <- c("summary", "sum")
@@ -223,12 +224,24 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "",
   # 30 crop
   calcOutput("Croparea", sectoral = "kcr", physical = TRUE,
              cellular = TRUE, irrigation = FALSE, round = roundArea,
+             years = pastTil2015,
              aggregate = "cluster", outputStatistics = stats,
              file = paste0("f30_croparea_initialisation_", ctype, ".mz"))
   calcOutput("Croparea", sectoral = "kcr", physical = TRUE,
              cellular = TRUE, irrigation = TRUE, round = roundArea,
+             years = pastTil2015,
              aggregate = "cluster", outputStatistics = stats,
              file = paste0("f30_croparea_w_initialisation_", ctype, ".mz"))
+
+  ### As part of mrwater/multiple cropping integration: Change to this function.
+  #calcOutput("MulticroppingIntensity", selectyears = magYears, round = 4,
+  #           scenario = "crop", sectoral = "kcr",
+  #           outputStatistics = stats, file = "fm_multicropping_j.cs3",
+  #           aggregate = "cluster")
+  calcOutput("Multicropping", years = magYears, round = 4,
+             outputStatistics = stats, file = "fm_multicropping_j.cs3",
+             aggregate = "cluster")
+
   ## For cellular comparison
   calcOutput("MAPSPAM", subtype = "physical",  aggregate = FALSE, round = NULL,
              outputStatistics = stats, file = paste0("MAPSPAM_croparea_0.5.mz"))
@@ -247,13 +260,13 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "",
              round = roundArea, outputStatistics = stats, file = "avl_cropland_iso.cs3")
 
   calcOutput("CroplandTreecover",
-             aggregate = FALSE, cells = cells,
+             aggregate = FALSE,
              round = NULL, outputStatistics = stats, file = "CroplandTreecover_0.5.mz")
   calcOutput("CroplandTreecover",
-             aggregate = "cluster", cells = cells,
+             aggregate = "cluster",
              round = roundArea, outputStatistics = stats, file = paste0("CroplandTreecover_", ctype, ".mz"))
   calcOutput("CroplandTreecover",
-             aggregate = FALSE, cells = cells, countryLevel = TRUE,
+             aggregate = FALSE, countryLevel = TRUE,
              round = roundArea, outputStatistics = stats, file = "CroplandTreecover_iso.cs2")
 
   calcOutput("SNVTargetCropland",

README.md

@@ -1,6 +1,6 @@
 # madrat based MAgPIE Input Data Library
 
-R package **mrmagpie**, version **1.66.3**
+R package **mrmagpie**, version **1.67.0**
 
   [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4319612.svg)](https://doi.org/10.5281/zenodo.4319612) [![R build status](https://github.com/pik-piam/mrmagpie/workflows/check/badge.svg)](https://github.com/pik-piam/mrmagpie/actions) [![codecov](https://codecov.io/gh/pik-piam/mrmagpie/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrmagpie) [![r-universe](https://pik-piam.r-universe.dev/badges/mrmagpie)](https://pik-piam.r-universe.dev/builds)
 
@@ -39,7 +39,7 @@ In case of questions / problems please contact Kristine Karstens <karstens@pik-p
 
 To cite package **mrmagpie** in publications use:
 
-Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P, Rein P (2026). "mrmagpie: madrat based MAgPIE Input Data Library." doi:10.5281/zenodo.4319612 <https://doi.org/10.5281/zenodo.4319612>, Version: 1.66.3, <https://github.com/pik-piam/mrmagpie>.
+Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P, Rein P (2026). "mrmagpie: madrat based MAgPIE Input Data Library." doi:10.5281/zenodo.4319612 <https://doi.org/10.5281/zenodo.4319612>, Version: 1.67.0, <https://github.com/pik-piam/mrmagpie>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,9 +48,9 @@ A BibTeX entry for LaTeX users is
   title = {mrmagpie: madrat based MAgPIE Input Data Library},
   author = {Kristine Karstens and Jan Philipp Dietrich and David Chen and Michael Windisch and Marcos Alves and Felicitas Beier and Alexandre Köberle and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer and Patrick Rein},
   doi = {10.5281/zenodo.4319612},
-  date = {2026-08-07},
+  date = {2026-08-13},
   year = {2026},
   url = {https://github.com/pik-piam/mrmagpie},
-  note = {Version: 1.66.3},
+  note = {Version: 1.67.0},
 }
 ```

mrmagpie.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: c5effd79-0000-4588-804c-cc44eff34666
 
 RestoreWorkspace: Default
 SaveWorkspace: Default