Integrate matt changes #3460
Open
Integrate matt changes #3460
Conversation
This file contains 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
…biomass. Note that the problem with negative cmass_heart is not yet resolved.
Merge remote-tracking branch 'matt_repo/LPJGUESS_SDA' into integrate_matt_changes # Conflicts: # models/lpjguess/R/update.state.LPJGUESS.R # models/lpjguess/man/update_state_LPJGUESS.Rd # models/lpjguess/man/write.config.LPJGUESS.Rd
mdietze
requested changes
Feb 25, 2025
| ##' | ||
| ##' | ||
| ##' @keywords internal | ||
| ##' @return the scaled 'individual' (the initial nested list with update values) | ||
| ##' @author Matthew Forrest | ||
| adjust.biomass.LPJGUESS <- function(individual, rel.change, sla, wooddens, lifeform, k_latosa, k_allom2, k_allom3){ | ||
| adjust.biomass.LPJGUESS <- function(individual, biomass.inc, sla, wooddens, lifeform, k_latosa, k_allom2, k_allom3, trace = TRUE){ |
There was a problem hiding this comment.
Changes in function arguments should be accompanied by changes in @param definitions
models/lpjguess/R/read_state.R
Outdated
|
|
||
| #paramsins <- readLines(file.path(rundir, "params.ins"), n = -1) | ||
| #npatches <- as.numeric(gsub(".*([0-9]+).*$", "\\1", paramsins[grepl("npatch", paramsins, fixed = TRUE)])) | ||
| npatches <- 5 |
There was a problem hiding this comment.
I suspect this particular change was for debugging purposes and wasn't meant to be hard coded as 5
There was a problem hiding this comment.
There are some similar cases such as calculateGridcellVariablePerPFT function, where the input min.diam=5. But I think it's reasonable to exclude trees with a DBH below 5 cm.
There was a problem hiding this comment.
I'll revert this to the original and see if it throws an error.
| ##' Calculate Above Ground Woody Biomass | ||
|
|
||
| ##' @keywords internal | ||
| AbvGrndWood <- function(individual, include.debt = TRUE){ |
There was a problem hiding this comment.
would be good to document internal functions too
| ##' Calculate Above Ground Woody Biomass | ||
|
|
||
| ##' @keywords internal | ||
| TotalCarbon <- function(individual, include.debt = TRUE){ |
…ndWood`, `TotalCarbon`; 2. Fix the hard code `npatches <- 5` in `read_state.R`
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
Merge Matt's modification on LPJGUESS into the develop branch.
Make sure there's no conflict with the current version.
Motivation and Context
Review Time Estimate
Types of changes
Checklist: