resolved merge conflict with calcBphEffect

pik-piam · Dec 11, 2020 · 42a2842 · 42a2842
2 parents 2af297f + 62dd75c
commit 42a2842
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 1,916 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '5075889'
+ValidationKey: '5115825'
 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": "mrmagpie: madrat based MAgPIE Input Data Library",
-  "version": "0.27.3",
+  "version": "0.27.5",
   "description": "<p>Provides functions for MAgPIE country and cellular input data generation.<\/p>",
   "creators": [
     {

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: mrmagpie
 Type: Package
 Title: madrat based MAgPIE Input Data Library
-Version: 0.27.3
-Date: 2020-11-27
+Version: 0.27.5
+Date: 2020-12-07
 Authors@R: c(person("Kristine", "Karstens", email = "[email protected]", role = c("aut","cre")),
              person("Jan Philipp", "Dietrich", email = "[email protected]", role = "aut"),
              person("David", "Chen", role = "aut"),

diff --git a/R/calcActualIrrigWatRequirements.R b/R/calcActualIrrigWatRequirements.R
diff --git a/R/calcBphEffect.R b/R/calcBphEffect.R
@@ -45,7 +45,7 @@ calcBphEffect <-function(){
     cells_NA <- cells[is.na(x[cells,,"ann_bph"])]
     #If all cells are NA, use m_glo, otherwise calc mean based on the non NA cells.
     if(identical(cells,cells_NA)) {
-      x[cells_NA,,"ann_bph"] <- m_glo      
+      x[cells_NA,,"ann_bph"] <- m_glo
     } else {
       m <- mean(x[cells,,"ann_bph"],na.rm=TRUE)
       x[cells_NA,,"ann_bph"] <- m

diff --git a/R/calcEnvmtlFlowRequirements.R b/R/calcEnvmtlFlowRequirements.R
diff --git a/R/calcFullIrrigationRequirement.R b/R/calcFullIrrigationRequirement.R
diff --git a/R/calcIrrigCellranking.R b/R/calcIrrigCellranking.R