Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix negative values in p35_forest_recovery_area #682

Merged
merged 21 commits into from
Jun 10, 2024
Merged

bugfix negative values in p35_forest_recovery_area #682

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
315b9a0
bugfix negative values in p35_forest_recovery_area
flohump Jun 3, 2024
b7b5323
bugfix negative values in p35_land_restoration
flohump Jun 4, 2024
ce151bc
bugfix test_runs.R
flohump Jun 4, 2024
c5a0c57
update
flohump Jun 4, 2024
11a5680
bugfix max forest recovery
flohump Jun 4, 2024
48c1208
bugfix
flohump Jun 4, 2024
2ed583e
reverting back pcm_max_forest_est
flohump Jun 5, 2024
efb7085
Merge branch 'f_pForest' of github.com:pvjeetze/magpie into f_pForest
flohump Jun 5, 2024
50923e7
Revert "bugfix"
flohump Jun 5, 2024
7c99ab6
Revert "bugfix max forest recovery"
flohump Jun 5, 2024
05e3dc3
added time dimension to potential forest area
pvjeetze Jun 5, 2024
a3cda4f
Merge branch 'f_pForest' of https://github.com/pvjeetze/magpie into f…
pvjeetze Jun 5, 2024
79737dd
update defaults from 2020 to 2025
flohump Jun 6, 2024
d10387b
bugfix
flohump Jun 7, 2024
772f321
bugfix
flohump Jun 7, 2024
b369996
update input data
flohump Jun 7, 2024
67598ad
bugfix 2025
flohump Jun 8, 2024
61464e8
update FSEC
flohump Jun 8, 2024
00040a9
bugfix
flohump Jun 8, 2024
119137e
bugfix
flohump Jun 9, 2024
d8d4ff2
Merge branch 'develop' of github.com:magpiemodel/magpie into f_pForest
flohump Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/35_natveg/pot_forest_may24/presolve.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ p35_forest_recovery_area(t,j,ac_est)$(sum(ac_est2, p35_forest_recovery_area(t,j,
* The proportion of secondary forest recovery in total natveg
* recovery is derived from the remaining forest recovery area
pc35_forest_recovery_shr(j) = 0;
pc35_forest_recovery_shr(j)$((sum(land_ag, pcm_land(j,land_ag))+pcm_land(j,"urban")) > +1e-10) =
pc35_forest_recovery_shr(j)$((sum(land_ag, pcm_land(j,land_ag))+pcm_land(j,"urban")) > 0) =
(pc35_max_forest_recovery(j) - sum(ac_est, p35_forest_recovery_area(t,j,ac_est)))
/ (sum(land_ag, pcm_land(j,land_ag))+pcm_land(j,"urban"));
pc35_forest_recovery_shr(j)$(pc35_forest_recovery_shr(j) < 0) = 0;
Expand All @@ -67,6 +67,8 @@ p35_forest_recovery_area(t,j,ac_est) = p35_forest_recovery_area(t,j,ac_est)
+ (pc35_land_other(j,"othernat",ac_est) - p35_forest_recovery_area(t,j,ac_est))
* pc35_forest_recovery_shr(j);
p35_forest_recovery_area(t,j,ac_est)$(sum(ac_est2, p35_forest_recovery_area(t,j,ac_est2)) > pc35_max_forest_recovery(j)) = pc35_max_forest_recovery(j)/card(ac_est2);
p35_forest_recovery_area(t,j,ac_est)$(p35_forest_recovery_area(t,j,ac_est) > pc35_land_other(j,"othernat",ac_est)) = pc35_land_other(j,"othernat",ac_est);
p35_forest_recovery_area(t,j,ac_est)$(p35_forest_recovery_area(t,j,ac_est) < 0) = 0;
pc35_land_other(j,"othernat",ac_est) = pc35_land_other(j,"othernat",ac_est) - p35_forest_recovery_area(t,j,ac_est);
pc35_land_other(j,"youngsecdf",ac_est) = pc35_land_other(j,"youngsecdf",ac_est) + p35_forest_recovery_area(t,j,ac_est);

Expand Down
Loading