remove bidirectional dependency

pik-piam · Jan 17, 2023 · ec6ef6b · ec6ef6b
1 parent 423ffd2
commit ec6ef6b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '27968836'
+ValidationKey: '27995430'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
  "title": "mrwater: madrat based MAgPIE water Input Data Library",
- "version": "1.4.44",
+ "version": "1.4.45",
  "description": "<p>Provides functions for MAgPIE cellular input data generation \n and stand-alone water calculations.<\/p>",
  "creators": [
  {

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,11 +1,11 @@
 Type: Package
 Package: mrwater
 Title: madrat based MAgPIE water Input Data Library
-Version: 1.4.44
+Version: 1.4.45
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE
-Date: 2023-01-12
+Date: 2023-01-17
 Authors@R: c(person("Felicitas", "Beier", email = "[email protected]", role = c("aut","cre")),
  person("Jens", "Heinke", email = "[email protected]", role = "aut"),
  person("Kristine", "Karstens", email = "[email protected]", role = "aut"),

diff --git a/Makefile b/Makefile
@@ -26,3 +26,9 @@ lint: ## Check if code etiquette is followed using lucode2::lint()
 
 format: ## Apply auto-formatting to changed files and lint afterwards
  Rscript -e 'lucode2::autoFormat()'
+
+install: ## Install the package locally via devtools::install()
+ Rscript -e 'devtools::install(upgrade = "never")'
+
+docs: ## Generate the package documentation via roxygen2::roxygenize()
+ Rscript -e 'roxygen2::roxygenize()'
diff --git a/R/fullDETERMINANTS.R b/R/fullDETERMINANTS.R
@@ -92,8 +92,9 @@ fullDETERMINANTS <- function() {
  ###################################
 
  ### Grid-level data ###
- calcOutput("GridPop", cells = "lpjcell", aggregate = FALSE,
- file = "griddedPop.mz")
+ #calcOutput("GridPop", cells = "lpjcell", aggregate = FALSE,
+ # file = "griddedPop.mz")
+ ### -> move into mrwater (otherwise bi-directional dependency)
 
  ### Country-level data ###
  # Governance (indicator raning from 0 to 1)

diff --git a/R/fullMULTICROPPING.R b/R/fullMULTICROPPING.R
@@ -43,13 +43,14 @@ fullMULTICROPPING <- function(cropmix = c("maiz", "rapeseed", "puls_pro"),
 
  # Standard settings
  iniyear <- "y2010"
- selectyears <- "y2010"
- plotyear <- "y2010"
+ selectyears <- c("y2010", "y2050")
+ plotyear <- selectyears
  ssp <- "ssp2"
 
+ # Newest LPJmL runs
  lpjml <- c(natveg = "LPJmL4_for_MAgPIE_44ac93de",
  crop = "ggcmi_phase3_nchecks_bft_e511ac58")
- climatetype <- "GSWP3-W5E5:historical"
+ climatetype <- "MRI-ESM2-0:ssp370"
 
  irrigationsystem <- "initialization"
  gtrange <- c(0, 10, 50, 100, 250, 300, 500, 600,

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # madrat based MAgPIE water Input Data Library
 
-R package **mrwater**, version **1.4.44**
+R package **mrwater**, version **1.4.45**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrwater)](https://cran.r-project.org/package=mrwater) [![R build status](https://github.com/pik-piam/mrwater/workflows/check/badge.svg)](https://github.com/pik-piam/mrwater/actions) [![codecov](https://codecov.io/gh/pik-piam/mrwater/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrwater) [![r-universe](https://pik-piam.r-universe.dev/badges/mrwater)](https://pik-piam.r-universe.dev/ui#builds)
 
@@ -48,7 +48,7 @@ In case of questions / problems please contact Felicitas Beier <beier@pik-potsda
 
 To cite package **mrwater** in publications use:
 
-Beier F, Heinke J, Karstens K, Bodirsky B, Dietrich J (2023). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.4.44, <https://github.com/pik-piam/mrwater>.
+Beier F, Heinke J, Karstens K, Bodirsky B, Dietrich J (2023). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.4.45, <https://github.com/pik-piam/mrwater>.
 
 A BibTeX entry for LaTeX users is
 
@@ -57,7 +57,7 @@ A BibTeX entry for LaTeX users is
  title = {mrwater: madrat based MAgPIE water Input Data Library},
  author = {Felicitas Beier and Jens Heinke and Kristine Karstens and Benjamin Leon Bodirsky and Jan Philipp Dietrich},
  year = {2023},
- note = {R package version 1.4.44},
+ note = {R package version 1.4.45},
  url = {https://github.com/pik-piam/mrwater},
 }
 ```