From 5afe4f8b2bd9d490541b946971ce06a59564fa2b Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Thu, 27 Jul 2023 13:39:13 +0200 Subject: [PATCH 1/2] fixed disaggregation inaccuracies in luscale --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index ffe0b1d813..e23f4d8f05 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,7 +17,7 @@ Imports: iamc, lucode2 (>= 0.36.0), luplot, - luscale, + luscale (>= 2.27.4), lusweave, m4fsdp, madrat, From 91182529406c18324d955f1883e61df8cdd2e34a Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Thu, 27 Jul 2023 13:55:18 +0200 Subject: [PATCH 2/2] updated changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b301ae8a8..6069243ba3 100644 --- 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