Skip to content

FireX: Merge with firemodels/master#16358

Merged
marcosvanella merged 36 commits into
firemodels:FireXfrom
marcosvanella:FireX
Jun 24, 2026
Merged

FireX: Merge with firemodels/master#16358
marcosvanella merged 36 commits into
firemodels:FireXfrom
marcosvanella:FireX

Conversation

@marcosvanella

Copy link
Copy Markdown
Contributor

No description provided.

= and others added 30 commits March 24, 2026 14:13
Resolved conflicts:
- pres.f90: keep refactor's GLOBMAT_SOLVER imports + add CC_IDCC (needed by
  master's REG_INTERP_WALL_DISTANCES); IPARM stays locally declared,
  NNZ_ROW_H dropped (unused).
- geom.f90: kept refactored version and re-applied master's self-contained
  source fixes into the new module structure:
    * 2424a14 IN_SPHERE/CYLINDER/CONE/OBB_PT + PUBLIC exports
    * aef8a7b + b0a56bd MIN_VOL_FACTOR -> 2.5E-3
    * b521ec2 UGLMAT coupling (CUT_CELL_FACE_ARRAYS_CLEANUP CCVAR
      invalidation + CELL_DEALLOC guard)
NOT YET PORTED (follow-up): blocking-in-refinement cluster
3831e63, c10badc, 1a9648b, 9ddda15. These are woven into
master's monolithic SET_CUTCELLS_3D via host association and must be
re-threaded into the refactored CC_GRID_* pipeline.
Builds clean: ompi_gnu_osx_db (full debug flags).
…-blocking

FDS Source : Refactor complex geometry module.
FDS Source: fix PATH OBSCURATION XB order bug Issue firemodels#16338
FDS Validation: Remove . from RGB
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…_actions/actions/checkout-7

Bump actions/checkout from 6 to 7
FDS Source: subtract SOLID from AREA calc with SPATIAL_STATISTIC=AREA
@marcosvanella marcosvanella merged commit 310c319 into firemodels:FireX Jun 24, 2026
34 checks passed
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.

4 participants