Skip to content

Commit

Permalink
Merge pull request #732 from flohump/f_ABCDR
Browse files Browse the repository at this point in the history
bugfix tree cover on cropland
  • Loading branch information
flohump authored Oct 17, 2024
2 parents 8a85fd1 + b7fda06 commit 29b3595
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions modules/29_cropland/detail_apr24/presolve.gms
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/start/projects/project_ABCDR.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 29b3595

Please sign in to comment.