Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions Biomass_borealDataPrep.R
Original file line number Diff line number Diff line change
Expand Up @@ -1676,11 +1676,9 @@ Save <- function(sim) {
}
}

if (is.na(P(sim)$.studyAreaName)) {
params(sim)[[currentModule(sim)]][[".studyAreaName"]] <- reproducible::studyAreaName(sim$studyArea_biomassParam)
message("The .studyAreaName is not supplied; derived name from sim$studyArea_biomassParam: ",
params(sim)[[currentModule(sim)]][[".studyAreaName"]])
}
if (is.null(P(sim)$.studyAreaName) || is.na(P(sim)$.studyAreaName))
P(sim)$.studyAreaName <- reproducible::studyAreaName(sim$studyArea_biomassParam,
notSupplied = ".studyAreaName")

studyArea <- sf::st_as_sf(sim$studyArea)
studyArea_biomassParam <- sf::st_as_sf(sim$studyArea_biomassParam)
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ Known issues: <https://github.com/PredictiveEcology/Biomass_borealDataPrep/issue

version 1.7.1.9001

* The message for an unset `.studyAreaName` comes from `reproducible::studyAreaName(notSupplied = ".studyAreaName")` (PredictiveEcology/reproducible#638), so it reads the same in every module that uses it: "`.studyAreaName` not supplied; using a hash of `<object>`: <hash>". With an older reproducible the name is the same and there is no message.

* **`imputeBadAgeModel` now defaults to `LandR::imputeBadAgeModelDefault()`** instead of
duplicating the formula here. The old default fit age directly, so `predict()` could return a
negative value for a young, high-cover, low-biomass stand; that got clamped to age 0 while
Expand Down
Loading