Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b7ffe49
FDS Source: rework TAU_U to be consistent with Tech Guide
rmcdermo Oct 10, 2025
1a69ecb
Merge pull request #15308 from rmcdermo/master
rmcdermo Oct 10, 2025
a682864
FDS Verification: Convert fds_moody_chart and related scripts
mcgratta Oct 10, 2025
47b1063
Merge pull request #15309 from mcgratta/master
mcgratta Oct 10, 2025
1d5f7a4
FDS Verification: Convert tunnel scripts
mcgratta Oct 11, 2025
2c9fcc8
Merge pull request #15312 from mcgratta/master
mcgratta Oct 11, 2025
4177229
FDS Verification: Convert yplus and heated_channel
mcgratta Oct 11, 2025
2a5983b
Merge pull request #15313 from mcgratta/master
mcgratta Oct 11, 2025
db33c27
FDS Verification: Convert blasius scripts
mcgratta Oct 12, 2025
4f5b4a5
Merge pull request #15316 from mcgratta/master
mcgratta Oct 12, 2025
48399d9
FDS Source: Fix realizability error with misplaced logical initializa…
drjfloyd Oct 13, 2025
f82b485
Merge pull request #15318 from drjfloyd/master
drjfloyd Oct 13, 2025
53bb623
FDS Verification: Convert ribbed_channel.m
mcgratta Oct 13, 2025
f373580
Merge pull request #15319 from mcgratta/master
mcgratta Oct 13, 2025
0424c90
FDS Source: Add DRY to HVAC outputs and SLCF
drjfloyd Oct 13, 2025
7249aef
Merge pull request #15320 from drjfloyd/master
drjfloyd Oct 13, 2025
29e0f4e
FDS Source: Fix line length
drjfloyd Oct 13, 2025
01cbea1
Merge pull request #15321 from drjfloyd/master
drjfloyd Oct 13, 2025
dedd194
FDS Verification: Convert pulsating.m
mcgratta Oct 13, 2025
cd86db9
Merge pull request #15322 from mcgratta/master
mcgratta Oct 13, 2025
0f0d809
FDS User Guide: Remove DRY added to REAC input table by mistake.
drjfloyd Oct 14, 2025
5a61110
Merge pull request #15324 from drjfloyd/master
drjfloyd Oct 14, 2025
e7fef8a
FDS Verification: Fix latex formatting
mcgratta Oct 14, 2025
9c61215
Merge pull request #15330 from mcgratta/master
mcgratta Oct 14, 2025
c541208
FDS verification: add py version of wall_internal_radiation
shostikk Oct 14, 2025
a89e0d0
Merge pull request #15332 from shostikk/master
shostikk Oct 14, 2025
62d4b3d
FDS Verification: Add shunn_mms.py
drjfloyd Oct 14, 2025
65ea78d
Merge pull request #15333 from drjfloyd/master
drjfloyd Oct 14, 2025
53787a5
FDS Verification: convert tree_shapes.m
ericvmueller Oct 14, 2025
235ea1d
Merge remote-tracking branch 'firemodels/master'
ericvmueller Oct 14, 2025
cec2a8d
FDS Verification: convert compression_wave.py
mcgratta Oct 14, 2025
d276d50
Merge pull request #15334 from ericvmueller/master
ericvmueller Oct 14, 2025
de48bf2
Merge pull request #15335 from mcgratta/master
mcgratta Oct 14, 2025
da8f8b6
Python: improve handling of outside legends
rmcdermo Oct 14, 2025
ca830cd
Merge pull request #15336 from rmcdermo/master
rmcdermo Oct 14, 2025
2ab882e
FDS Verification: Remove shunn_mms_favreZ and temporal_error.m
drjfloyd Oct 14, 2025
9ab7129
Merge pull request #15337 from drjfloyd/master
drjfloyd Oct 14, 2025
e749141
FDS Verification: Convert soborot_mass_transport.m
mcgratta Oct 14, 2025
9c33819
Merge pull request #15338 from mcgratta/master
mcgratta Oct 14, 2025
729bcef
FDS Verification: Remove wall_internal_radiation.m
mcgratta Oct 14, 2025
32ab4f9
Merge pull request #15339 from mcgratta/master
mcgratta Oct 14, 2025
da5e978
FDS Verification: Add saad_mms_temporal_error.py script.
drjfloyd Oct 14, 2025
c0fb599
FDS Verification: update master verification py file.
drjfloyd Oct 14, 2025
6300b7b
FDS Verification: Convert plate_view_factor.m
mcgratta Oct 14, 2025
220b464
Merge pull request #15340 from drjfloyd/master
drjfloyd Oct 14, 2025
88cfc97
Merge pull request #15341 from mcgratta/master
mcgratta Oct 14, 2025
def51a6
FDS Verification: fix exit call in tree_shapes.py
ericvmueller Oct 14, 2025
377627a
Merge pull request #15342 from ericvmueller/master
ericvmueller Oct 14, 2025
2a3f24e
FDS Verification: Convert terminal_velocity_convergence.m
mcgratta Oct 14, 2025
8d670b5
Merge pull request #15343 from mcgratta/master
mcgratta Oct 14, 2025
8bd673e
Python: Clean up labels
mcgratta Oct 14, 2025
7855c52
Merge pull request #15344 from mcgratta/master
mcgratta Oct 14, 2025
e3bffa2
Python: set text.usetex=False to reduce files size
rmcdermo Oct 14, 2025
611d42d
Python: remove comments
rmcdermo Oct 14, 2025
3ccff73
Merge pull request #15345 from rmcdermo/master
rmcdermo Oct 14, 2025
f8dd327
FireX: Merge with firemodels/master
cxp484 Oct 15, 2025
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
3 changes: 3 additions & 0 deletions Manuals/FDS_User_Guide/FDS_User_Guide.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11252,6 +11252,7 @@ \subsection{Dry Volume and Mass Fractions}
DRY=T /
\end{lstlisting}

\ct{DRY} can also be specified on an \ct{SLCF} line that reports the \ct{'MASS FRACTION'} or \ct{'VOLUME FRACTION'} of a species as well as an \ct{HVAC} \ct{DUCT QUANTITY LIST} or \ct{NODE QUANTITY LIST}. For \ct{HVAC} line outputs, \ct{DRY} is an array corresponding to each entry on the \ct{QUANTITY LIST}.

\subsection{Aerosol and Soot Concentration}
\label{info:soot}
Expand Down Expand Up @@ -12552,6 +12553,7 @@ \section{\texorpdfstring{{\tt HVAC}}{HVAC} (HVAC System Definition)}
\ct{DEVC_ID} & Character & Sections ~\ref{info:HVACduct}, \ref{info:HVACfan}, \ref{info:HVACfilter} & & \\ \hline
\ct{DIAMETER} & Real & Section~\ref{info:HVACduct} & m & \\ \hline
\ct{DISCHARGE_COEFFICIENT} & Real & Section~\ref{info:Leaks} & & 1. \\ \hline
\ct{DRY} & Log. Array & Section~\ref{info:dry} & & \\ \hline
\ct{DUCT_ID} & Char.~Array & Section~\ref{info:HVACnode} & & \\ \hline
\ct{EFFICIENCY} & Real Array & Sections~\ref{info:HVACfilter}, \ref{info:HVACaircoil} & & 1.0 \\ \hline
\ct{FAN_ID} & Character & Section~\ref{info:HVACduct} & & \\ \hline
Expand Down Expand Up @@ -13485,6 +13487,7 @@ \section{\texorpdfstring{{\tt SLCF}}{SLCF} (Slice File Parameters)}
\ct{AGL_SLICE} & Real & Section~\ref{info:complex_terrain} & m & \\ \hline
\ct{CELL_CENTERED} & Logical & Section~\ref{info:SLCF} & & \ct{F} \\ \hline
\ct{DB} & Character & Section~\ref{info:SLCF} & & \\ \hline
\ct{DRY} & Logical & Section~\ref{info:dry} & & \\ \hline
\ct{ID} & Character & Section~\ref{info:SLCF} & & \\ \hline
\ct{MAXIMUM_VALUE} & Real & Reference~\cite{Smokeview_Users_Guide} & & \\ \hline
\ct{MESH_NUMBER} & Integer & Section~\ref{info:SLCF} & & \\ \hline
Expand Down
16 changes: 9 additions & 7 deletions Source/dump.f90
Original file line number Diff line number Diff line change
Expand Up @@ -6662,8 +6662,6 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)

! Return if there are no slices to process and this is not a Plot3D dump

DRY=.FALSE.

SELECT CASE(IFRMT)
CASE(0) ; PLOT3D=.FALSE. ; SLCF3D=.FALSE.
CASE(1) ; PLOT3D=.TRUE. ; SLCF3D=.FALSE.
Expand Down Expand Up @@ -6779,6 +6777,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
AGL_TERRAIN_SLICE = .FALSE.
CC_CELL_CENTERED = .FALSE.
CC_INTERP2FACES = .FALSE.
DRY = .FALSE.
ELSE
SL => SLICE(IQ)
IND = SL%INDEX
Expand All @@ -6796,6 +6795,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
J2 = SL%J2
K1 = SL%K1
K2 = SL%K2
DRY = SL%DRY
DEBUG = 0
IF(SL%DEBUG)DEBUG = 1
AGL_TERRAIN_SLICE = SL%TERRAIN_SLICE
Expand Down Expand Up @@ -7972,7 +7972,7 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)

CASE(300:350) OUTPUT_INDEX_SELECT ! HVAC output

SDV%VALUE_1 = HVAC_OUTPUT(DV%QUANTITY_INDEX(1),DV%Y_INDEX,DV%Z_INDEX,DV%DUCT_INDEX,DV%NODE_INDEX,DV%DUCT_CELL_INDEX)
SDV%VALUE_1 = HVAC_OUTPUT(DV%QUANTITY_INDEX(1),DV%Y_INDEX,DV%Z_INDEX,DV%DUCT_INDEX,DV%NODE_INDEX,DV%DUCT_CELL_INDEX,DV%DRY)

CASE(400:454) OUTPUT_INDEX_SELECT ! Particle-specific output

Expand Down Expand Up @@ -10709,14 +10709,15 @@ REAL(EB) FUNCTION SOLID_PHASE_OUTPUT(INDX,Y_INDEX,Z_INDEX,PART_INDEX,OPT_WALL_IN
END FUNCTION SOLID_PHASE_OUTPUT


REAL(EB) FUNCTION HVAC_OUTPUT(IND,Y_INDEX,Z_INDEX,DUCT_INDEX,NODE_INDEX,DUCT_CELL_INDEX)
REAL(EB) FUNCTION HVAC_OUTPUT(IND,Y_INDEX,Z_INDEX,DUCT_INDEX,NODE_INDEX,DUCT_CELL_INDEX,DRY)

! Compute HVAC Output Quantities

USE MATH_FUNCTIONS, ONLY: INTERPOLATE1D
USE PHYSICAL_FUNCTIONS, ONLY: GET_MASS_FRACTION,GET_MOLECULAR_WEIGHT,GET_ENTHALPY,GET_SENSIBLE_ENTHALPY
INTEGER, INTENT(IN) :: Y_INDEX,Z_INDEX,IND,DUCT_INDEX,NODE_INDEX(2),DUCT_CELL_INDEX
REAL(EB) :: Y_H2O,ZZ_GET(1:N_TRACKED_SPECIES),MW,Y_SPECIES,RCON,H_DUCT,H_TMPA
LOGICAL :: DRY

Y_H2O = 0._EB
Y_SPECIES=1.0_EB
Expand Down Expand Up @@ -11335,7 +11336,7 @@ SUBROUTINE DUMP_HVAC(T)
NODE_INDEX(1)=N
DO NN = 1, N_NODE_QUANTITY
HQT=>NODE_QUANTITY_ARRAY(NN)
OUTVAL_N(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,-1,NODE_INDEX,-1),FB)
OUTVAL_N(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,-1,NODE_INDEX,-1,HQT%DRY),FB)
ENDDO
WRITE(LU_HVAC) OUTVAL_N
ENDDO
Expand All @@ -11347,14 +11348,15 @@ SUBROUTINE DUMP_HVAC(T)
DO NNN=1,DUCT(N)%N_CELLS
DO NN = 1, N_DUCT_QUANTITY
HQT=>DUCT_QUANTITY_ARRAY(NN)
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HVAC_SMV_EQUIVALENCE(HQT%OUTPUT_INDEX),HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,NNN),FB)
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HVAC_SMV_EQUIVALENCE(HQT%OUTPUT_INDEX),HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,NNN,&
HQT%DRY),FB)
ENDDO
WRITE(LU_HVAC) OUTVAL_D
ENDDO
ELSE
DO NN = 1, N_DUCT_QUANTITY
HQT=>DUCT_QUANTITY_ARRAY(NN)
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,-1),FB)
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,-1,HQT%DRY),FB)
ENDDO
WRITE(LU_HVAC) OUTVAL_D
ENDIF
Expand Down
9 changes: 5 additions & 4 deletions Source/fire.f90
Original file line number Diff line number Diff line change
Expand Up @@ -781,9 +781,10 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
Q_REAC_SUB(1:N_REACTIONS),Q_REAC_1(1:N_REACTIONS),Q_REAC_2(1:N_REACTIONS),Q_REAC_4(1:N_REACTIONS),&
Q_REAC_SUM(1:N_REACTIONS),Q_SUM_CHI_R,CHI_R_SUM,TIME_RAMP_FACTOR,&
TOTAL_MIXED_MASS_1,TOTAL_MIXED_MASS_2,TOTAL_MIXED_MASS_4,TOTAL_MIXED_MASS,&
ZETA_1,ZETA_2,ZETA_4,D_F,TMP_IN,C_U,DT_SUB_OLD,ERR_EST(N_TRACKED_SPECIES),ERR_TOL(N_TRACKED_SPECIES),ERR_TINY,&
ZETA_1,ZETA_2,ZETA_4,D_F,TMP_IN,K_SGS,DT_SUB_OLD,ERR_EST(N_TRACKED_SPECIES),ERR_TOL(N_TRACKED_SPECIES),ERR_TINY,&
ZZ_TEMP(1:N_TRACKED_SPECIES),ATOL(1:N_TRACKED_SPECIES)
INTEGER :: NR,NS,ITER,TVI,RICH_ITER,TIME_ITER,RICH_ITER_MAX
REAL(EB), PARAMETER :: C_U=0.4_EB,TAU_EPS=1.E-10_EB
INTEGER, PARAMETER :: TV_ITER_MIN=5
LOGICAL :: TV_FLUCT(1:N_TRACKED_SPECIES),EXTINCT,NO_REACTIONS,NO_REAC_2,NO_REAC_4
TYPE(REACTION_TYPE), POINTER :: RN !,R1
Expand All @@ -804,9 +805,9 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
TAU_D = DELTA**2/MAX(D_F,TWO_EPSILON_EB) ! FDS Tech Guide (5.14)
SELECT CASE(SIM_MODE)
CASE DEFAULT
C_U = 0.4_EB*C_DEARDORFF*SQRT(1.5_EB)
TAU_U = C_U*RHO_IN*DELTA**2/MAX(MU_IN,TWO_EPSILON_EB) ! FDS Tech Guide (5.15)
TAU_G = SQRT(2._EB*DELTA/(GRAV+1.E-10_EB)) ! FDS Tech Guide (5.16)
K_SGS = (MU_IN/(RHO_IN*C_DEARDORFF*DELTA))**2 ! FDS Tech Guide (4.17)
TAU_U = C_U*DELTA/SQRT(TWTH*(K_SGS+TAU_EPS)) ! FDS Tech Guide (5.15)
TAU_G = SQRT(2._EB*DELTA/(GRAV+TAU_EPS)) ! FDS Tech Guide (5.16)
MIX_TIME_OUT= MAX(TAU_CHEM,MIN(TAU_D,TAU_U,TAU_G,TAU_FLAME)) ! FDS Tech Guide (5.13)
CASE (DNS_MODE)
MIX_TIME_OUT= MAX(TAU_CHEM,TAU_D)
Expand Down
6 changes: 5 additions & 1 deletion Source/hvac.f90
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ SUBROUTINE READ_HVAC
LOGICAL :: INITIALIZED_HVAC_MASS_TRANSPORT !< Flag indicating DUCTs with N_CELLS>1 have been initiazed.
LOGICAL :: DUCT_QUANTITY_DEFINED=.FALSE. !< Flag indicating a DUCT_QUANTITY list has alreayd been defined
LOGICAL :: NODE_QUANTITY_DEFINED=.FALSE. !< Flag indicating a NODE_QUANTITY list has alreayd been defined
LOGICAL :: DRY(20) !< Flag indicating species output is DRY
CHARACTER(LABEL_LENGTH) :: AIRCOIL_ID !< ID of an AIRCOIL located in a DUCT.
CHARACTER(LABEL_LENGTH) :: CTRL_ID !< Name of a control function controlling a FAN, damper, or AIRCOIL.
CHARACTER(LABEL_LENGTH) :: DEVC_ID !< Name of a device controlling a FAN, damper, or AIRCOIL.
Expand All @@ -145,7 +146,7 @@ SUBROUTINE READ_HVAC
TYPE(DUCT_TYPE), POINTER :: DU !< Pointer to a DUCT
TYPE(HVAC_QUANTITY_TYPE), POINTER :: HQT !< Pointer to a DUCT_ or NODE_QUANTITY_ARRAY
NAMELIST /HVAC/ AIRCOIL_ID,AMBIENT,AREA,CLEAN_LOSS,COOLANT_SPECIFIC_HEAT,COOLANT_MASS_FLOW,COOLANT_TEMPERATURE,CTRL_ID,&
DAMPER,DEBUG,DEVC_ID,DIAMETER,DISCHARGE_COEFFICIENT,DUCT_ID,&
DAMPER,DEBUG,DEVC_ID,DIAMETER,DISCHARGE_COEFFICIENT,DRY,DUCT_ID,&
EFFICIENCY,FAN_ID,FILTER_ID,FIXED_Q,GEOM,GEOM2,ID,LEAK_ENTHALPY,LEAK_PRESSURE_EXPONENT,LEAK_REFERENCE_PRESSURE,&
LENGTH,LOADING,LOADING_MULTIPLIER,LOSS,&
MASS_FLOW,MAX_FLOW,MAX_PRESSURE,N_CELLS,NETWORK_ID,NODE_ID,PERIMETER,QUANTITY,QUANTITY_SPEC_ID,&
Expand Down Expand Up @@ -719,6 +720,7 @@ SUBROUTINE READ_HVAC
N_DUCT_QUANTITY = N_DUCT_QUANTITY + 1
ENDDO
ALLOCATE (DUCT_QUANTITY_ARRAY(N_DUCT_QUANTITY))
DUCT_QUANTITY_ARRAY(1:N_DUCT_QUANTITY)%DRY = DRY(1:N_DUCT_QUANTITY)
DO N=1, N_DUCT_QUANTITY
HQT => DUCT_QUANTITY_ARRAY(N)
CALL GET_QUANTITY_INDEX(HQT%SMOKEVIEW_LABEL,HQT%SMOKEVIEW_BAR_LABEL,HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,&
Expand All @@ -736,6 +738,7 @@ SUBROUTINE READ_HVAC
N_NODE_QUANTITY = N_NODE_QUANTITY + 1
ENDDO
ALLOCATE (NODE_QUANTITY_ARRAY(N_NODE_QUANTITY))
NODE_QUANTITY_ARRAY(1:N_NODE_QUANTITY)%DRY = DRY(1:N_NODE_QUANTITY)
DO N=1, N_NODE_QUANTITY
HQT => NODE_QUANTITY_ARRAY(N)
CALL GET_QUANTITY_INDEX(HQT%SMOKEVIEW_LABEL,HQT%SMOKEVIEW_BAR_LABEL,HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,&
Expand Down Expand Up @@ -774,6 +777,7 @@ SUBROUTINE SET_HVAC_DEFAULTS
DAMPER = .FALSE.
DEVC_ID = 'null'
DIAMETER = -1._EB
DRY = .FALSE.
DUCT_ID = 'null'
FAN_ID = 'null'
FIXED_Q = -1.E10_EB
Expand Down
10 changes: 5 additions & 5 deletions Source/mass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ SUBROUTINE CHECK_MASS_DENSITY
REAL(EB) :: MASS_N(-3:3),CONST,MASS_C,RHO_ZZ_CUT,RHO_CUT,VC(-3:3),SIGN_FACTOR,SUM_MASS_N,VC1(-3:3),&
RHO_ZZ_MIN,RHO_ZZ_MAX,SUM_RHO_ZZ,RHO_ZZ_TEST
INTEGER :: IC
LOGICAL :: CLIP_RHO_ZZ
LOGICAL :: CLIP_RHO_ZZ(N_TRACKED_SPECIES)
REAL(EB), POINTER, DIMENSION(:,:,:) :: DELTA_RHO,DELTA_RHO_ZZ,RHOP
REAL(EB), POINTER, DIMENSION(:,:,:,:) :: RHO_ZZ

Expand Down Expand Up @@ -716,12 +716,12 @@ SUBROUTINE CHECK_MASS_DENSITY
! Correct species mass density

RHO_ZZ_MIN = 0._EB
CLIP_RHO_ZZ = .FALSE.

SPECIES_LOOP: DO N=1,N_TRACKED_SPECIES

DELTA_RHO_ZZ => WORK5
DELTA_RHO_ZZ = 0._EB
CLIP_RHO_ZZ = .FALSE.

DO K=1,KBAR
DO J=1,JBAR
Expand All @@ -739,7 +739,7 @@ SUBROUTINE CHECK_MASS_DENSITY

RHO_ZZ_MAX = RHOP(I,J,K)
IF (RHO_ZZ(I,J,K,N)>=RHO_ZZ_MIN .AND. RHO_ZZ(I,J,K,N)<=RHO_ZZ_MAX) CYCLE
CLIP_RHO_ZZ = .TRUE.
CLIP_RHO_ZZ(N) = .TRUE.
IF (RHO_ZZ(I,J,K,N)<RHO_ZZ_MIN) THEN
RHO_ZZ_CUT = RHO_ZZ_MIN
SIGN_FACTOR = 1._EB
Expand Down Expand Up @@ -777,7 +777,7 @@ SUBROUTINE CHECK_MASS_DENSITY
ENDDO
ENDDO

IF (.NOT.CLIP_RHO_ZZ) CYCLE
IF (.NOT.CLIP_RHO_ZZ(N)) CYCLE

! Assign excess/deficit RHO_ZZ neighboring cells

Expand All @@ -793,7 +793,7 @@ SUBROUTINE CHECK_MASS_DENSITY

! If nothing has been clipped, return

IF (.NOT.CLIP_RHOMIN .AND. .NOT.CLIP_RHOMAX .AND. .NOT.CLIP_RHO_ZZ) RETURN
IF (.NOT.CLIP_RHOMIN .AND. .NOT.CLIP_RHOMAX .AND. .NOT. ANY(CLIP_RHO_ZZ)) RETURN

! Final check of RHO_ZZ to ensure that ZZ(:,:,:,1:N_TRACKED_SPECIES) sums to 1

Expand Down
7 changes: 5 additions & 2 deletions Source/read.f90
Original file line number Diff line number Diff line change
Expand Up @@ -15829,7 +15829,7 @@ SUBROUTINE READ_SLCF
REAL(EB) :: MAXIMUM_VALUE,MINIMUM_VALUE
REAL(EB) :: AGL_SLICE
INTEGER :: N,N1,NN,NM,MESH_NUMBER,N_SLCF_O,NITER,ITER,VELO_INDEX,GEOM_INDEX,N_UNIQUE_SLCF,IOR
LOGICAL :: VECTOR,CELL_CENTERED,DEBUG,CULL_SLICE
LOGICAL :: VECTOR,CELL_CENTERED,DEBUG,CULL_SLICE,DRY
CHARACTER(LABEL_LENGTH) :: QUANTITY,QUANTITY_TMP,SPEC_ID,PART_ID,QUANTITY2,PROP_ID,REAC_ID,SLICETYPE
CHARACTER(200) :: SLCF_NAME
CHARACTER(200), ALLOCATABLE, DIMENSION(:) :: UNIQUE_SLICE_NAMES
Expand All @@ -15839,7 +15839,7 @@ SUBROUTINE READ_SLCF
TYPE (SLICE_TYPE), POINTER :: SL
INTEGER :: INDEX,INDEX2,Y_INDEX,Z_INDEX,PART_INDEX,REAC_INDEX,MATL_INDEX
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_LABEL,SMOKEVIEW_BAR_LABEL
NAMELIST /SLCF/ AGL_SLICE,CELL_CENTERED,DB,FYI,DEBUG,ID,MAXIMUM_VALUE,MESH_NUMBER,&
NAMELIST /SLCF/ AGL_SLICE,CELL_CENTERED,DB,DRY,FYI,DEBUG,ID,MAXIMUM_VALUE,MESH_NUMBER,&
MINIMUM_VALUE,PART_ID,PBX,PBY,PBZ,PROP_ID,QUANTITY,QUANTITY2,REAC_ID,RLE_MIN,RLE_MAX,SLICETYPE,&
SPEC_ID,VECTOR,VELO_INDEX,XB

Expand Down Expand Up @@ -15943,6 +15943,8 @@ SUBROUTINE READ_SLCF
VELO_INDEX = 0
RLE_MIN = 1.0_FB
RLE_MAX = 0.0_FB
DRY = .FALSE.

CALL CHECKREAD('SLCF',LU_INPUT,IOS) ; IF (STOP_STATUS==SETUP_STOP) RETURN
IF (IOS==1) EXIT SLCF_LOOP
READ(LU_INPUT,SLCF)
Expand Down Expand Up @@ -16095,6 +16097,7 @@ SUBROUTINE READ_SLCF
SL=>SLICE(N)
SL%SLCF_INDEX=NN
SL%ID = ID
SL%DRY = DRY
SL%IOR = IOR
SL%SLICETYPE = TRIM(SLICETYPE)
SL%GEOM_INDEX = GEOM_INDEX
Expand Down
3 changes: 2 additions & 1 deletion Source/type.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ MODULE TYPES
REAL(FB), DIMENSION(2) :: MINMAX
REAL(FB) :: RLE_MIN, RLE_MAX
REAL(EB):: AGL_SLICE
LOGICAL :: TERRAIN_SLICE=.FALSE.,CELL_CENTERED=.FALSE.,RLE=.FALSE.,DEBUG=.FALSE.,THREE_D=.FALSE.
LOGICAL :: TERRAIN_SLICE=.FALSE.,CELL_CENTERED=.FALSE.,RLE=.FALSE.,DEBUG=.FALSE.,THREE_D=.FALSE.,DRY=.FALSE.
CHARACTER(LABEL_LENGTH) :: SLICETYPE='STRUCTURED',SMOKEVIEW_LABEL
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_BAR_LABEL,ID='null',MATL_ID='null'
CHARACTER(200) :: SLCF_NAME='null'
Expand Down Expand Up @@ -2134,6 +2134,7 @@ MODULE TYPES
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_LABEL !< Smokeview label for QUANTITY
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_BAR_LABEL !< Smokeview colorbar label for QUANTITY
CHARACTER(LABEL_LENGTH) :: UNITS !< Units for QUANTITY
LOGICAL :: DRY !< Remove water vapor before computing a mass or volume fraction
END TYPE HVAC_QUANTITY_TYPE


Expand Down
11 changes: 0 additions & 11 deletions Utilities/Matlab/FDS_verification_script.m
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
disp('radiation_plane_layer...'); radiation_plane_layer
disp('ns2d...'); ns2d
disp('vort2d...'); vort2d
disp('wall_internal_radiation...'); wall_internal_radiation
disp('ashrae_7...'); ashrae_7
disp('flame_species...'); flame_species
disp('cat_propane_depo...'); cat_propane_depo
Expand Down Expand Up @@ -62,12 +61,7 @@

% Special cases

disp('wall_model...'); wall_model
disp('pulsating...'); pulsating
disp('compression_wave...'); compression_wave
disp('soborot_mass_transport...'); soborot_mass_transport
disp('plate_view_factor...'); plate_view_factor
disp('terminal_velocity_convergence...'); terminal_velocity_convergence
disp('fluid_part...'); fluid_part
disp('extinction...'); extinction
disp('fan_curve...'); fan_curve
Expand All @@ -80,10 +74,6 @@
disp('rms_cov_corr...'); rms_cov_corr
disp('hot_layer_collapse...'); hot_layer_collapse
disp('radiating_polygon...'); radiating_polygon
disp('saad_mms_temporal_error...'); saad_mms_temporal_error
disp('saad_cc_mms_temporal_error...'); saad_cc_mms_temporal_error
disp('shunn_mms_temporal_error...'); shunn_mms_temporal_error
disp('shunn_mms_favreZ...'); shunn_mms_favreZ
disp('favre_test...'); favre_test
disp('scaling_tests...'); scaling_tests
disp('hvac_mass_transport...'); hvac_mass_transport
Expand All @@ -101,7 +91,6 @@
disp('natconv...'); natconv
disp('freecon_sphere...'); freecon_sphere
disp('nat_conv_hot_plate...'); nat_conv_hot_plate
disp('tree_shapes...'); tree_shapes
disp('impinging_jet...'); impinging_jet
disp('part_drag_profile...'); part_drag_profile

Expand Down
Loading
Loading