Croparea update - #206
Draft
FelicitasBeier wants to merge 34 commits into
Draft
Conversation
…ropareaUpdate # Conflicts: # .buildlibrary # CITATION.cff # DESCRIPTION # README.md
…ropareaUpdate # Conflicts: # .buildlibrary # CITATION.cff # DESCRIPTION # README.md
…ropareaUpdate # Conflicts: # .buildlibrary # CITATION.cff # DESCRIPTION # README.md
Merge branch 'master' into cropareaUpdate # Conflicts: # .buildlibrary # CITATION.cff # DESCRIPTION # README.md
Merge branch 'master' into cropareaUpdate # Conflicts: # .gitignore
Merge branch 'master' into cropareaUpdate # Conflicts: # .gitignore
Merge branch 'master' into cropareaUpdate # Conflicts: # DESCRIPTION
This comment was marked as resolved.
This comment was marked as resolved.
This was referenced Aug 6, 2026
The roxygen line read "LandIng Toolbox of FAOLUH", naming a value
("Toolbox") that calcCroparea does not accept and misspelling LandInG.
areaSource is passed straight to calcCroparea(datasource = ), which takes
only "LandInG" and "FAOLUH".
Document both accepted values and note that the former default "FAO" is no
longer accepted. Documentation only; no code change.
man/calcFAOYield.Rd is generated and stays stale until the next
lucode2::buildLibrary() run.
Addresses review finding m6.
Lines 25 and 26 were blank lines containing four spaces each, which lintr flags (trailing_whitespace_linter). Whitespace removed on those two lines only; the file is otherwise untouched and no other file was reformatted. Addresses review finding m10.
… (m2)
The aggregated branch built its kcr -> all mapping with a hardcoded
rep("all", 19). The croparea weight now passes fallow = TRUE, and the
IPCC source SCF_sub2019_2 (ch5_F_LU_2019_2.csv) carries 20 crop columns
including fallow, so the literal was stale: data.frame() would have
errored on 20 names against 19 rows.
Use length(getNames(socLossShare)) so the mapping follows the actual crop
set rather than a number that has to be maintained by hand.
Latent, not a live failure: no current caller passes
subsystems = "aggregated" (calcSOM uses TRUE, the mrmagpie callers use
the default FALSE), so the branch is unreachable today.
Addresses review finding m2.
…commons into cropareaUpdate
Merge branch 'master' into cropareaUpdate # Conflicts: # .buildlibrary # CITATION.cff # DESCRIPTION # R/readWCDE.R # README.md
Contributor
Author
|
All issues raised by AI reviewer have been addressed. I will mark the comment as "resolved" to not confuse human reviewers. |
… More general re-write of calcProduction and calcFAOYield is necessary that will introduce a balanceflow approach for cellular production
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
4 participants
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.
replace croparea with LandInG croparea and LUH3 with LanduseInitialisation