From 064cd4761967dcbf1727979e6d9f5b303c503888 Mon Sep 17 00:00:00 2001 From: florianh Date: Mon, 14 Oct 2024 12:41:00 +0200 Subject: [PATCH 1/2] bugfix tree cover on cropland --- modules/29_cropland/detail_apr24/presolve.gms | 5 ++--- scripts/start/projects/project_ABCDR.R | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/29_cropland/detail_apr24/presolve.gms b/modules/29_cropland/detail_apr24/presolve.gms index e1a7d63bc..1b521039f 100644 --- a/modules/29_cropland/detail_apr24/presolve.gms +++ b/modules/29_cropland/detail_apr24/presolve.gms @@ -64,11 +64,10 @@ if (s29_treecover_keep = 1, i29_treecover_target(t,j)$(i29_treecover_target(t,j) < pc29_treecover_share(j)) = pc29_treecover_share(j); ); -* Bounds for treecover. Only ac_est can increase in optimization. ac_sub can only decrease. +* Bounds for treecover. Only ac_est can increase in optimization. ac_sub is fixed. v29_treecover.lo(j,ac_est) = 0; v29_treecover.up(j,ac_est) = Inf; -v29_treecover.lo(j,ac_sub) = 0; -v29_treecover.up(j,ac_sub) = pc29_treecover(j,ac_sub); +v29_treecover.fx(j,ac_sub) = pc29_treecover(j,ac_sub); m_boundfix(v29_treecover,(j,ac_sub),l,1e-6); * set treecover penalty diff --git a/scripts/start/projects/project_ABCDR.R b/scripts/start/projects/project_ABCDR.R index cf8092828..90ff7ff30 100644 --- a/scripts/start/projects/project_ABCDR.R +++ b/scripts/start/projects/project_ABCDR.R @@ -19,7 +19,7 @@ source("config/default.cfg") #download_and_update(cfg) # create additional information to describe the runs -cfg$info$flag <- "ABCDR12" +cfg$info$flag <- "ABCDR13" cfg$results_folder <- "output/:title:" cfg$force_replace <- TRUE From b7fda06eb927b04c3162360bbbfbcd33eeab27c9 Mon Sep 17 00:00:00 2001 From: florianh Date: Tue, 15 Oct 2024 13:40:03 +0200 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba9eedf89..089ee490a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### fixed - **11_costs** changed equation to fix bug in total water cost calculation +- **29_cropland** treecover age-class growth was not working properly because ac_sub was erroneously not fixed ## [4.8.2] - 2024-09-24