Skip to content

Name the renamed sibling modules; use per-ELF groups with one ELF - #20

Merged
eliotmcintire merged 4 commits into
developmentfrom
rename/module-names
Sep 29, 2026
Merged

eliotmcintire merged 4 commits into
developmentfrom
rename/module-names

Conversation

@eliotmcintire

@eliotmcintire eliotmcintire commented Sep 29, 2026 •

Copy link
Copy Markdown
Collaborator

loadOrder (fireSense_dataPrepPredict.R:18-19), the whichModulesToPrepare default (:63) and its comparisons (:181-188) now name the renamed fireSense_ignitionFit, _spreadFit, _ignitionPredict and _spreadPredict. A second commit fixes ELFfuelSets() (:589): the per-ELF lists nonForestedLCCGroupsList/missingLCCgroupList were used only when length(sppEquivs) > 1, so a predict-only run with one ELF built covariates from the default nf group while the fit had nfLCC_* terms, and fireSense_spreadPredict failed. It now uses the lists whenever present. The new one-ELF test in test-multiELF.R fails before the fix (7 failures) and passes after; the metadata loadOrder test fails on development. Full suite on development: 176 passed, 0 failed, 5 errors; on this branch: 187 passed, 0 failed, 5 errors (same 5 errors, from the library here). Version 1.0.4.9008.

🤖 Generated with Claude Code

https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv

eliotmcintire and others added 4 commits September 29, 2026 11:05
fireSense is now fireSense_burn; fireSense_IgnitionFit, _SpreadFit, _IgnitionPredict and _SpreadPredict are now lower camelCase (fireSense_ignitionFit etc.). Update loadOrder, whichModulesToPrepare and docs that name them.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
ELFfuelSets() used nonForestedLCCGroupsList and missingLCCgroupList only when length(sppEquivs) > 1, so a predict-only run with one ELF built covariates from the module default group (nf) while the fit had nfLCC_* terms. Use the lists whenever present; landcoverDT is built from their union.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
Only makeTSD() reads the shared sim$landcoverDT (rowSums > 0 and pixelID, timeSinceDisturbance.R:88-97), so its grouping does not matter; each ELF's own landcoverDT comes from ELFfuelSets(). Revert the Init/.inputObjects use of the union of per-ELF groups.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
fireSense_ignitionPredict predicts ignition and escape. Naming fireSense_EscapePredict stops with a message.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CwcjqqK59FmTJscyi7xUqv
@eliotmcintire
eliotmcintire merged commit 10f3cbd into development Sep 29, 2026
6 checks passed
@eliotmcintire
eliotmcintire deleted the rename/module-names branch September 29, 2026 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant