Skip to content

FDS Source : Refactor complex geometry module.#16339

Merged
marcosvanella merged 21 commits into
firemodels:masterfrom
marcosvanella:cc-fv-refactor-blocking
Jun 16, 2026
Merged

FDS Source : Refactor complex geometry module.#16339
marcosvanella merged 21 commits into
firemodels:masterfrom
marcosvanella:cc-fv-refactor-blocking

Conversation

@marcosvanella

Copy link
Copy Markdown
Contributor
  • New COMPLEX_GEOMETRY_GRID module holding all cut-cell grid-building code and data.
  • COMPLEX_GEOMETRY module now handles shapes generation and low-level computational-geometry primitives.
  • Split the monolithic SET_CUTCELLS_3D into stages. Promoted contained internal routines to module level.
  • Ported master's refinement-interface cut-cell blocking into the new code sequence.
  • Refactor is behavior-preserving (organization/scope only, not numerics).
  • WIP: Added GCELL type and low-level primitives for cell linking/rebuild.

= and others added 21 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).
@marcosvanella marcosvanella merged commit 1c63504 into firemodels:master Jun 16, 2026
34 checks passed
@marcosvanella marcosvanella deleted the cc-fv-refactor-blocking branch June 17, 2026 14:50
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