Lpjml2magpie - #916
Draft
k4rst3ns wants to merge 51 commits into
Draft
Conversation
…n tau for each time step
…both old and new version in parallel
- Fix nl_fix.gms: add missing division by p14_yields_gsadapt_ratio_cumulative to match the equation in equations.gms (crop yields were inconsistent between NLP and LP solve phases when s14_gsadapt2tau=1) - Fix start script typo: gsadpat -> gsadapt (all gsadapt test runs were dead code) - Fix spelling: cummulative -> cumulative (variable name, 6 occurrences) - Fix placeholder description in declarations.gms - Remove misplaced EOF comment at top of presolve.gms - Add division-by-zero protection (+1e-8) in presolve gsadapt ratio calculations - Document max(1,...) ratchet design choice in presolve.gms - Fix comment typos in croparea modules (Are -> Area, pcm_land -> pcm_area) - Add missing trailing newlines Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The fallback branch of i14_modeled_yields_hist2 (for regions with near-zero crop area) was incorrectly using raw f14_yields instead of i14_yields_calib_combined, and was missing the yldtype dimension. This made it inconsistent with the managementcalib_aug19 realization and with the non-fallback branch in the same calculation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Remove the +1e-8 guards from p14_yields_gsadapt_ratio and p14_yields_gsadapt_ratio_previous denominators in presolve.gms. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: gsadapt audit — critical bug fixes and cleanup
… managementcalib realization
…nformation of BE croparea weights
…over into a new joint realization
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🐦 Description of this PR 🐦
🔧 Checklist for PR creator 🔧
If a point is not applicable, check the checkbox anyway and write "non-applicable" next to the checkbox.
Label pull request from the label list.
Self-review own code
magpie4R library has been updated accordingly and backwards compatible where necessary.scenario_config.csvhas been updated accordingly (important ifdefault.cfghas been updated)Document changes
CHANGELOG.mdgoxygen::goxygen()and verify the modified code is properly documentedPerform test runs
Rscript start.R --> "compilation check"Rscript start.R --> "default"Rscript start.R --> "test runs"Reporting produces no errors and no new warnings
Get two approving reviews (at least one from RSE)
📉 Performance 📈
🚨 Checklist for reviewer 🚨
CHANGELOGis updated correctly