Merge pull request #580 from pvjeetze/develop

fixed disaggregation inaccuracies in luscale
magpiemodel · Jul 27, 2023 · 3fb4e98 · 3fb4e98
2 parents 31bcc2a + 9118252
commit 3fb4e98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### changed
--  
+-
 
 ### added
 -
@@ -18,13 +18,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### fixed
 - **70_livestock** consideration of milk demand in the calculation of the pasture management factor
+- **scripts** Fixed inaccuracies and inconsistent application of SNV policies during disaggregation in luscale::interpolateAvlCroplandWeighted(), which is called in extra/disaggregation.R
 
 
 ## [4.6.8] - 2023-07-17
 
 ### changed
 - **41_area_equipped_for_irrigation** new AEI data (Mehta2022) replacing old Siebert data
-- **80_optimization** printing of solprint when solver status is 7 re-activated 
+- **80_optimization** printing of solprint when solver status is 7 re-activated
 - **scripts** start_functions.R can now handle clusters per region flexibly
 - **scripts** the REMIND-MAgPIE coupling now uses renv
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -17,7 +17,7 @@ Imports:
     iamc,
     lucode2 (>= 0.36.0),
     luplot,
-    luscale,
+    luscale (>= 2.27.4),
     lusweave,
     m4fsdp,
     madrat,