Skip to content

FireX: Merge with firemodels/master #16242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcosvanella merged 15 commits into from
May 8, 2026
Merged

FireX: Merge with firemodels/master #16242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a1cd601
FDS Validation: Fix O_2, L_f, etc
mcgratta May 5, 2026
dcd8f61
Merge pull request #16232 from mcgratta/master
mcgratta May 5, 2026
ba32b79
FDS Source: Eliminate unused argument in gas phase dump
mcgratta May 5, 2026
48ed7d1
Merge pull request #16233 from mcgratta/master
mcgratta May 5, 2026
82f7abd
FDS Source: Remove unused variable
mcgratta May 5, 2026
d572708
Merge pull request #16234 from mcgratta/master
mcgratta May 5, 2026
5a8e09a
FDS Verification: Adjust DEVC window in geom_channel.fds
marcosvanella May 6, 2026
a1e29fb
Merge pull request #16236 from marcosvanella/master
marcosvanella May 6, 2026
b85e42e
FDS Source: remove McArthur fire spread model for level set
ericvmueller May 6, 2026
7e24371
FDS User Guide: remove inputs related to McArthur level set model
ericvmueller May 6, 2026
6898da0
Merge pull request #16237 from ericvmueller/master
ericvmueller May 6, 2026
3831e63
FDS Source : Block special cut-cells in mesh corner edges.
May 6, 2026
1f4e380
Merge pull request #16238 from marcosvanella/master
marcosvanella May 6, 2026
2688157
Merge remote-tracking branch 'firemodels/master' into FireX
marcosvanella May 8, 2026
df23b68
FDS Source: Make args in GET_GEOMVALS, PACK_VTK consistent with chang…
marcosvanella May 8, 2026
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
6 changes: 0 additions & 6 deletions Manuals/FDS_User_Guide/FDS_User_Guide.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13618,14 +13618,9 @@ \section{\texorpdfstring{{\tt SURF}}{SURF} (Surface Properties)}
\ct{VEG_LSET_MLH} & Real & Section~\ref{info:level_set} & & 0.70 \\ \hline
\ct{VEG_LSET_QCON} & Real & Section~\ref{info:level_set} & \unit{kW/m^2} & 0. \rule{0pt}{2.3ex} \\ \hline
\ct{VEG_LSET_ROS_00} & Real & Section~\ref{info:level_set} & m/s & 0. \\ \hline
\ct{VEG_LSET_ROS_BACK} & Real & Section~\ref{info:level_set} & m/s & 0. \\ \hline
\ct{VEG_LSET_ROS_FLANK} & Real & Section~\ref{info:level_set} & m/s & 0. \\ \hline
\ct{VEG_LSET_ROS_HEAD} & Real & Section~\ref{info:level_set} & m/s & 0. \\ \hline
\ct{VEG_LSET_ROS_FIXED} & Logical & Section~\ref{info:level_set} & & \ct{F} \\ \hline
\ct{VEG_LSET_SIGMA} & Real & Section~\ref{info:level_set} & 1/m & 5000. \\ \hline
\ct{VEG_LSET_SURF_LOAD} & Real & Section~\ref{info:level_set} & \unit{kg/m^2)} & 1.0 \rule{0pt}{2.3ex} \\ \hline
\ct{VEG_LSET_TAN2} & Real & Section~\ref{info:level_set} & & \\ \hline
\ct{VEG_LSET_WIND_EXP} & Real & Section~\ref{info:level_set} & & 1. \\ \hline
\ct{VEG_LSET_WIND_HEIGHT} & Real & Section~\ref{info:custom_wind} & m & 6.1 \\ \hline
\ct{VEG_LSET_WIND_RAMP} & Character & Section~\ref{info:custom_wind} & & \\ \hline
\ct{VEL} & Real & Section~\ref{info:Velocity_BC} & m/s & \\ \hline
Expand Down Expand Up @@ -14428,7 +14423,6 @@ \chapter{Error Codes}
1012 \> \ct{REAC_ID ... not found for HRRPUV REAC.} \> Section~\ref{info:gasoutputquantities} \\
1013 \> \ct{Output QUANTITY2 ... requires a SPEC_ID.} \> Section~\ref{info:gasoutputquantities} \\
1014 \> \ct{Output QUANTITY2 ... needs to be a SLCF appropriate quantity.} \> Section~\ref{info:gasoutputquantities} \\
1015 \> \ct{Output QUANTITY ... requires a QUANTITY2.} \> Section~\ref{info:gasoutputquantities} \\
1016 \> \ct{Output QUANTITY ... requires a SPEC_ID.} \> Section~\ref{info:gasoutputquantities} \\
1017 \> \ct{Output QUANTITY ... SPEC_ID ... not found.} \> Section~\ref{info:gasoutputquantities} \\
1018 \> \ct{Output QUANTITY ... requires a MATL_ID.} \> Section~\ref{info:solidoutputquantities} \\
Expand Down
3 changes: 1 addition & 2 deletions Source/cons.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,7 @@ MODULE GLOBAL_CONSTANTS
INTEGER :: LEVEL_SET_MODE=0 !< Indicator of the type of level set calculation to be done
LOGICAL :: LEVEL_SET_COUPLED_FIRE=.TRUE. !< Indicator for fire and wind level set coupling
LOGICAL :: LEVEL_SET_COUPLED_WIND=.TRUE. !< Indicator for fire and wind level set coupling
LOGICAL :: LEVEL_SET_ELLIPSE=.TRUE. !< Indicator of Richards elliptical level set formulation
LOGICAL :: LSET_TAN2
LOGICAL :: LEVEL_SET_ELLIPSE=.TRUE. !< Placeholder for future level set spread formulations

! Parameters for Terrain and Wind simulation needs

Expand Down
2 changes: 1 addition & 1 deletion Source/data.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ MODULE OUTPUT_DATA
INTEGRATED=.FALSE.,SOLID_PHASE=.FALSE.,GAS_PHASE=.TRUE.,INTEGRATED_PARTICLES=.FALSE.,&
MASS_FRACTION=.FALSE.,SPEC_ID_REQUIRED=.FALSE.,PART_ID_REQUIRED=.FALSE.,INSIDE_SOLID=.FALSE.,&
MATL_ID_REQUIRED=.FALSE.,TIME_AVERAGED=.TRUE.,DEVC_APPROPRIATE=.TRUE.,&
DUCT_ID_REQUIRED=.FALSE.,NODE_ID_REQUIRED=.FALSE.,HVAC=.FALSE.,QUANTITY2_REQUIRED=.FALSE.,&
DUCT_ID_REQUIRED=.FALSE.,NODE_ID_REQUIRED=.FALSE.,HVAC=.FALSE.,&
CELL_L_REQUIRED=.FALSE.,HVAC_SMV=.FALSE.,PROF_APPROPRIATE=.FALSE., ELEM_ID_REQUIRED=.FALSE.
END TYPE OUTPUT_QUANTITY_TYPE

Expand Down
Loading
Loading