-
Notifications
You must be signed in to change notification settings - Fork 155
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.
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
revision forestry implementation #673
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good to me, just some minor things. In addition to the separate comments I saw that you changed/removed quite a lot of interfaces (nice!), but I did not see any changes in the corresponding goxygen documentation in the affected module.gms files. Can you please check verify that the module descriptions are still valid even with these changes in interfaces?
CHANGELOG.md
Outdated
- **default.cfg** update additional data to rev4.50 | ||
- **default.cfg** changed default realization for 44_biodiversity to new realization `bii_target_apr24` | ||
- **80_optimization** Simplifed cycling through CONOPT4, CONOPT4 with OPTFILE, CONOPT4 without preprocessing and CONOPT3. | ||
- **scripts** start/test_runs.R added 2 more test runs from FSEC | ||
- **32_forestry** revision and simplification of forestry implementation, renamed realization from `dynamic_feb21` to `dynamic_may24`. Renamed `pm_demand_ext` to `pm_demand_forestry` | ||
- **32_forestry** renamed interface `pm_demand_ext` to `pm_demand_forestry` | ||
- **default.cfg** ForestryEndo as default setting |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you mean forestry dynamic_may24 as default?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. Here I mean making forestry a default in MAgPIE. I revised with more details:
default.cfg Forestry sector included by default by using the ForestryEndo
settings from scenario_config.csv
: s32_initial_distribution = 1
, s32_demand_establishment = 1
, s32_hvarea = 2
, s35_secdf_distribution = 2
, s35_hvarea = 2
, s73_timber_demand_switch = 1
Co-authored-by: Jan Dietrich <dietrich@pik-potsdam.de>
I checked all corresponding module descriptions. The removed interfaces did not appear there. But I spotted some other outdated information and spelling mistakes, which are no fixed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left only two minor comments
Thanks for your review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good to go now 🚀
…ryMay24 # Conflicts: # CHANGELOG.md
🐦 Description of this PR 🐦
This PR includes a revision and simplification of the forestry implementation AND makes "ForestryEndo" (MAgPIE with forestry sector) a default setting.
Details:
With this setup the model is feasible. Production from heaven is zero. No missing land for establishment. There is some additional trade for feasibility for MEA, and for EUR after 2050.
All test runs including FSEC and HR are feasible in all time steps.
changed
dynamic_feb21
todynamic_may24
. Renamedpm_demand_ext
topm_demand_forestry
pm_demand_ext
topm_demand_forestry
removed
pm_timber_yield_initial
pm_selfsuff_ext
, removedv21_manna_from_heaven
pm_representative_rotation
pm_demand_forestry_future
andsm_wood_density
fixed
pm_demand_foresty
is now used in62_material
added
s21_min_trade_margin_forestry
im_timber_prod_cost
🔧 Checklist for PR creator 🔧
Label pull request from the label list.
Self-review own code
magpie4
R library has been updated accordingly and backwards compatible where necessary.scenario_config.csv
has been updated accordingly (important ifdefault.cfg
has been updated)Document changes
CHANGELOG.md
goxygen::goxygen()
and verify the modified code is properly documentedPerform test runs
Rscript start.R --> "compilation check"
Rscript start.R --> "test runs"
Rscript start.R --> "test runs"
📉 Performance changes 📈
More run times, all in mins:
GAMS,PR673_dev_SSP2-NDC,29.7
GAMS,PR673_dev_SSP2-NDC-ForestryEndo,23.6
GAMS,PR673_dev_SSP2-PkBudg650,22.1
GAMS,PR673_dev_SSP2-PkBudg650-ForestryEndo,25.3
GAMS,PR673_dev_SSP2-Ref,22.8
GAMS,PR673_dev_SSP2-Ref-ForestryEndo,24
GAMS,PR673_thisPR5_SSP2-NDC,25.6
GAMS,PR673_thisPR5_SSP2-PkBudg650,28.7
GAMS,PR673_thisPR5_SSP2-Ref,27
🚨 Checklist for reviewer 🚨
CHANGELOG
is updated correctly