Skip to content

Commit 91f1fbf

Browse files
cxp484cxp484
authored
Merge pull request #15346 from cxp484/FireX
FireX: Merge with firemodels/master
2 parents 9cc23fe + f8dd327 commit 91f1fbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2677
-3588
lines changed

‎Manuals/FDS_User_Guide/FDS_User_Guide.tex‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11252,6 +11252,7 @@ \subsection{Dry Volume and Mass Fractions}
1125211252
DRY=T /
1125311253
\end{lstlisting}
1125411254

11255+
\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}.
1125511256

1125611257
\subsection{Aerosol and Soot Concentration}
1125711258
\label{info:soot}
@@ -12552,6 +12553,7 @@ \section{\texorpdfstring{{\tt HVAC}}{HVAC} (HVAC System Definition)}
1255212553
\ct{DEVC_ID} & Character & Sections ~\ref{info:HVACduct}, \ref{info:HVACfan}, \ref{info:HVACfilter} & & \\ \hline
1255312554
\ct{DIAMETER} & Real & Section~\ref{info:HVACduct} & m & \\ \hline
1255412555
\ct{DISCHARGE_COEFFICIENT} & Real & Section~\ref{info:Leaks} & & 1. \\ \hline
12556+
\ct{DRY} & Log. Array & Section~\ref{info:dry} & & \\ \hline
1255512557
\ct{DUCT_ID} & Char.~Array & Section~\ref{info:HVACnode} & & \\ \hline
1255612558
\ct{EFFICIENCY} & Real Array & Sections~\ref{info:HVACfilter}, \ref{info:HVACaircoil} & & 1.0 \\ \hline
1255712559
\ct{FAN_ID} & Character & Section~\ref{info:HVACduct} & & \\ \hline
@@ -13485,6 +13487,7 @@ \section{\texorpdfstring{{\tt SLCF}}{SLCF} (Slice File Parameters)}
1348513487
\ct{AGL_SLICE} & Real & Section~\ref{info:complex_terrain} & m & \\ \hline
1348613488
\ct{CELL_CENTERED} & Logical & Section~\ref{info:SLCF} & & \ct{F} \\ \hline
1348713489
\ct{DB} & Character & Section~\ref{info:SLCF} & & \\ \hline
13490+
\ct{DRY} & Logical & Section~\ref{info:dry} & & \\ \hline
1348813491
\ct{ID} & Character & Section~\ref{info:SLCF} & & \\ \hline
1348913492
\ct{MAXIMUM_VALUE} & Real & Reference~\cite{Smokeview_Users_Guide} & & \\ \hline
1349013493
\ct{MESH_NUMBER} & Integer & Section~\ref{info:SLCF} & & \\ \hline

‎Source/dump.f90‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6662,8 +6662,6 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
66626662

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

6665-
DRY=.FALSE.
6666-
66676665
SELECT CASE(IFRMT)
66686666
CASE(0) ; PLOT3D=.FALSE. ; SLCF3D=.FALSE.
66696667
CASE(1) ; PLOT3D=.TRUE. ; SLCF3D=.FALSE.
@@ -6779,6 +6777,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
67796777
AGL_TERRAIN_SLICE = .FALSE.
67806778
CC_CELL_CENTERED = .FALSE.
67816779
CC_INTERP2FACES = .FALSE.
6780+
DRY = .FALSE.
67826781
ELSE
67836782
SL => SLICE(IQ)
67846783
IND = SL%INDEX
@@ -6796,6 +6795,7 @@ SUBROUTINE DUMP_SLCF(T,DT,NM,IFRMT)
67966795
J2 = SL%J2
67976796
K1 = SL%K1
67986797
K2 = SL%K2
6798+
DRY = SL%DRY
67996799
DEBUG = 0
68006800
IF(SL%DEBUG)DEBUG = 1
68016801
AGL_TERRAIN_SLICE = SL%TERRAIN_SLICE
@@ -7972,7 +7972,7 @@ SUBROUTINE UPDATE_DEVICES_1(T,DT,NM)
79727972

79737973
CASE(300:350) OUTPUT_INDEX_SELECT ! HVAC output
79747974

7975-
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)
7975+
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)
79767976

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

@@ -10709,14 +10709,15 @@ REAL(EB) FUNCTION SOLID_PHASE_OUTPUT(INDX,Y_INDEX,Z_INDEX,PART_INDEX,OPT_WALL_IN
1070910709
END FUNCTION SOLID_PHASE_OUTPUT
1071010710

1071110711

10712-
REAL(EB) FUNCTION HVAC_OUTPUT(IND,Y_INDEX,Z_INDEX,DUCT_INDEX,NODE_INDEX,DUCT_CELL_INDEX)
10712+
REAL(EB) FUNCTION HVAC_OUTPUT(IND,Y_INDEX,Z_INDEX,DUCT_INDEX,NODE_INDEX,DUCT_CELL_INDEX,DRY)
1071310713

1071410714
! Compute HVAC Output Quantities
1071510715

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

1072110722
Y_H2O = 0._EB
1072210723
Y_SPECIES=1.0_EB
@@ -11335,7 +11336,7 @@ SUBROUTINE DUMP_HVAC(T)
1133511336
NODE_INDEX(1)=N
1133611337
DO NN = 1, N_NODE_QUANTITY
1133711338
HQT=>NODE_QUANTITY_ARRAY(NN)
11338-
OUTVAL_N(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,-1,NODE_INDEX,-1),FB)
11339+
OUTVAL_N(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,-1,NODE_INDEX,-1,HQT%DRY),FB)
1133911340
ENDDO
1134011341
WRITE(LU_HVAC) OUTVAL_N
1134111342
ENDDO
@@ -11347,14 +11348,15 @@ SUBROUTINE DUMP_HVAC(T)
1134711348
DO NNN=1,DUCT(N)%N_CELLS
1134811349
DO NN = 1, N_DUCT_QUANTITY
1134911350
HQT=>DUCT_QUANTITY_ARRAY(NN)
11350-
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HVAC_SMV_EQUIVALENCE(HQT%OUTPUT_INDEX),HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,NNN),FB)
11351+
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HVAC_SMV_EQUIVALENCE(HQT%OUTPUT_INDEX),HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,NNN,&
11352+
HQT%DRY),FB)
1135111353
ENDDO
1135211354
WRITE(LU_HVAC) OUTVAL_D
1135311355
ENDDO
1135411356
ELSE
1135511357
DO NN = 1, N_DUCT_QUANTITY
1135611358
HQT=>DUCT_QUANTITY_ARRAY(NN)
11357-
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,-1),FB)
11359+
OUTVAL_D(NN) = REAL(HVAC_OUTPUT(HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,N,NODE_INDEX,-1,HQT%DRY),FB)
1135811360
ENDDO
1135911361
WRITE(LU_HVAC) OUTVAL_D
1136011362
ENDIF

‎Source/fire.f90‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,9 +781,10 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
781781
Q_REAC_SUB(1:N_REACTIONS),Q_REAC_1(1:N_REACTIONS),Q_REAC_2(1:N_REACTIONS),Q_REAC_4(1:N_REACTIONS),&
782782
Q_REAC_SUM(1:N_REACTIONS),Q_SUM_CHI_R,CHI_R_SUM,TIME_RAMP_FACTOR,&
783783
TOTAL_MIXED_MASS_1,TOTAL_MIXED_MASS_2,TOTAL_MIXED_MASS_4,TOTAL_MIXED_MASS,&
784-
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,&
784+
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,&
785785
ZZ_TEMP(1:N_TRACKED_SPECIES),ATOL(1:N_TRACKED_SPECIES)
786786
INTEGER :: NR,NS,ITER,TVI,RICH_ITER,TIME_ITER,RICH_ITER_MAX
787+
REAL(EB), PARAMETER :: C_U=0.4_EB,TAU_EPS=1.E-10_EB
787788
INTEGER, PARAMETER :: TV_ITER_MIN=5
788789
LOGICAL :: TV_FLUCT(1:N_TRACKED_SPECIES),EXTINCT,NO_REACTIONS,NO_REAC_2,NO_REAC_4
789790
TYPE(REACTION_TYPE), POINTER :: RN !,R1
@@ -804,9 +805,9 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
804805
TAU_D = DELTA**2/MAX(D_F,TWO_EPSILON_EB) ! FDS Tech Guide (5.14)
805806
SELECT CASE(SIM_MODE)
806807
CASE DEFAULT
807-
C_U = 0.4_EB*C_DEARDORFF*SQRT(1.5_EB)
808-
TAU_U = C_U*RHO_IN*DELTA**2/MAX(MU_IN,TWO_EPSILON_EB) ! FDS Tech Guide (5.15)
809-
TAU_G = SQRT(2._EB*DELTA/(GRAV+1.E-10_EB)) ! FDS Tech Guide (5.16)
808+
K_SGS = (MU_IN/(RHO_IN*C_DEARDORFF*DELTA))**2 ! FDS Tech Guide (4.17)
809+
TAU_U = C_U*DELTA/SQRT(TWTH*(K_SGS+TAU_EPS)) ! FDS Tech Guide (5.15)
810+
TAU_G = SQRT(2._EB*DELTA/(GRAV+TAU_EPS)) ! FDS Tech Guide (5.16)
810811
MIX_TIME_OUT= MAX(TAU_CHEM,MIN(TAU_D,TAU_U,TAU_G,TAU_FLAME)) ! FDS Tech Guide (5.13)
811812
CASE (DNS_MODE)
812813
MIX_TIME_OUT= MAX(TAU_CHEM,TAU_D)

‎Source/hvac.f90‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ SUBROUTINE READ_HVAC
124124
LOGICAL :: INITIALIZED_HVAC_MASS_TRANSPORT !< Flag indicating DUCTs with N_CELLS>1 have been initiazed.
125125
LOGICAL :: DUCT_QUANTITY_DEFINED=.FALSE. !< Flag indicating a DUCT_QUANTITY list has alreayd been defined
126126
LOGICAL :: NODE_QUANTITY_DEFINED=.FALSE. !< Flag indicating a NODE_QUANTITY list has alreayd been defined
127+
LOGICAL :: DRY(20) !< Flag indicating species output is DRY
127128
CHARACTER(LABEL_LENGTH) :: AIRCOIL_ID !< ID of an AIRCOIL located in a DUCT.
128129
CHARACTER(LABEL_LENGTH) :: CTRL_ID !< Name of a control function controlling a FAN, damper, or AIRCOIL.
129130
CHARACTER(LABEL_LENGTH) :: DEVC_ID !< Name of a device controlling a FAN, damper, or AIRCOIL.
@@ -145,7 +146,7 @@ SUBROUTINE READ_HVAC
145146
TYPE(DUCT_TYPE), POINTER :: DU !< Pointer to a DUCT
146147
TYPE(HVAC_QUANTITY_TYPE), POINTER :: HQT !< Pointer to a DUCT_ or NODE_QUANTITY_ARRAY
147148
NAMELIST /HVAC/ AIRCOIL_ID,AMBIENT,AREA,CLEAN_LOSS,COOLANT_SPECIFIC_HEAT,COOLANT_MASS_FLOW,COOLANT_TEMPERATURE,CTRL_ID,&
148-
DAMPER,DEBUG,DEVC_ID,DIAMETER,DISCHARGE_COEFFICIENT,DUCT_ID,&
149+
DAMPER,DEBUG,DEVC_ID,DIAMETER,DISCHARGE_COEFFICIENT,DRY,DUCT_ID,&
149150
EFFICIENCY,FAN_ID,FILTER_ID,FIXED_Q,GEOM,GEOM2,ID,LEAK_ENTHALPY,LEAK_PRESSURE_EXPONENT,LEAK_REFERENCE_PRESSURE,&
150151
LENGTH,LOADING,LOADING_MULTIPLIER,LOSS,&
151152
MASS_FLOW,MAX_FLOW,MAX_PRESSURE,N_CELLS,NETWORK_ID,NODE_ID,PERIMETER,QUANTITY,QUANTITY_SPEC_ID,&
@@ -719,6 +720,7 @@ SUBROUTINE READ_HVAC
719720
N_DUCT_QUANTITY = N_DUCT_QUANTITY + 1
720721
ENDDO
721722
ALLOCATE (DUCT_QUANTITY_ARRAY(N_DUCT_QUANTITY))
723+
DUCT_QUANTITY_ARRAY(1:N_DUCT_QUANTITY)%DRY = DRY(1:N_DUCT_QUANTITY)
722724
DO N=1, N_DUCT_QUANTITY
723725
HQT => DUCT_QUANTITY_ARRAY(N)
724726
CALL GET_QUANTITY_INDEX(HQT%SMOKEVIEW_LABEL,HQT%SMOKEVIEW_BAR_LABEL,HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,&
@@ -736,6 +738,7 @@ SUBROUTINE READ_HVAC
736738
N_NODE_QUANTITY = N_NODE_QUANTITY + 1
737739
ENDDO
738740
ALLOCATE (NODE_QUANTITY_ARRAY(N_NODE_QUANTITY))
741+
NODE_QUANTITY_ARRAY(1:N_NODE_QUANTITY)%DRY = DRY(1:N_NODE_QUANTITY)
739742
DO N=1, N_NODE_QUANTITY
740743
HQT => NODE_QUANTITY_ARRAY(N)
741744
CALL GET_QUANTITY_INDEX(HQT%SMOKEVIEW_LABEL,HQT%SMOKEVIEW_BAR_LABEL,HQT%OUTPUT_INDEX,HQT%Y_INDEX,HQT%Z_INDEX,&
@@ -774,6 +777,7 @@ SUBROUTINE SET_HVAC_DEFAULTS
774777
DAMPER = .FALSE.
775778
DEVC_ID = 'null'
776779
DIAMETER = -1._EB
780+
DRY = .FALSE.
777781
DUCT_ID = 'null'
778782
FAN_ID = 'null'
779783
FIXED_Q = -1.E10_EB

‎Source/mass.f90‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ SUBROUTINE CHECK_MASS_DENSITY
630630
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),&
631631
RHO_ZZ_MIN,RHO_ZZ_MAX,SUM_RHO_ZZ,RHO_ZZ_TEST
632632
INTEGER :: IC
633-
LOGICAL :: CLIP_RHO_ZZ
633+
LOGICAL :: CLIP_RHO_ZZ(N_TRACKED_SPECIES)
634634
REAL(EB), POINTER, DIMENSION(:,:,:) :: DELTA_RHO,DELTA_RHO_ZZ,RHOP
635635
REAL(EB), POINTER, DIMENSION(:,:,:,:) :: RHO_ZZ
636636

@@ -716,12 +716,12 @@ SUBROUTINE CHECK_MASS_DENSITY
716716
! Correct species mass density
717717

718718
RHO_ZZ_MIN = 0._EB
719+
CLIP_RHO_ZZ = .FALSE.
719720

720721
SPECIES_LOOP: DO N=1,N_TRACKED_SPECIES
721722

722723
DELTA_RHO_ZZ => WORK5
723724
DELTA_RHO_ZZ = 0._EB
724-
CLIP_RHO_ZZ = .FALSE.
725725

726726
DO K=1,KBAR
727727
DO J=1,JBAR
@@ -739,7 +739,7 @@ SUBROUTINE CHECK_MASS_DENSITY
739739

740740
RHO_ZZ_MAX = RHOP(I,J,K)
741741
IF (RHO_ZZ(I,J,K,N)>=RHO_ZZ_MIN .AND. RHO_ZZ(I,J,K,N)<=RHO_ZZ_MAX) CYCLE
742-
CLIP_RHO_ZZ = .TRUE.
742+
CLIP_RHO_ZZ(N) = .TRUE.
743743
IF (RHO_ZZ(I,J,K,N)<RHO_ZZ_MIN) THEN
744744
RHO_ZZ_CUT = RHO_ZZ_MIN
745745
SIGN_FACTOR = 1._EB
@@ -777,7 +777,7 @@ SUBROUTINE CHECK_MASS_DENSITY
777777
ENDDO
778778
ENDDO
779779

780-
IF (.NOT.CLIP_RHO_ZZ) CYCLE
780+
IF (.NOT.CLIP_RHO_ZZ(N)) CYCLE
781781

782782
! Assign excess/deficit RHO_ZZ neighboring cells
783783

@@ -793,7 +793,7 @@ SUBROUTINE CHECK_MASS_DENSITY
793793

794794
! If nothing has been clipped, return
795795

796-
IF (.NOT.CLIP_RHOMIN .AND. .NOT.CLIP_RHOMAX .AND. .NOT.CLIP_RHO_ZZ) RETURN
796+
IF (.NOT.CLIP_RHOMIN .AND. .NOT.CLIP_RHOMAX .AND. .NOT. ANY(CLIP_RHO_ZZ)) RETURN
797797

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

‎Source/read.f90‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15829,7 +15829,7 @@ SUBROUTINE READ_SLCF
1582915829
REAL(EB) :: MAXIMUM_VALUE,MINIMUM_VALUE
1583015830
REAL(EB) :: AGL_SLICE
1583115831
INTEGER :: N,N1,NN,NM,MESH_NUMBER,N_SLCF_O,NITER,ITER,VELO_INDEX,GEOM_INDEX,N_UNIQUE_SLCF,IOR
15832-
LOGICAL :: VECTOR,CELL_CENTERED,DEBUG,CULL_SLICE
15832+
LOGICAL :: VECTOR,CELL_CENTERED,DEBUG,CULL_SLICE,DRY
1583315833
CHARACTER(LABEL_LENGTH) :: QUANTITY,QUANTITY_TMP,SPEC_ID,PART_ID,QUANTITY2,PROP_ID,REAC_ID,SLICETYPE
1583415834
CHARACTER(200) :: SLCF_NAME
1583515835
CHARACTER(200), ALLOCATABLE, DIMENSION(:) :: UNIQUE_SLICE_NAMES
@@ -15839,7 +15839,7 @@ SUBROUTINE READ_SLCF
1583915839
TYPE (SLICE_TYPE), POINTER :: SL
1584015840
INTEGER :: INDEX,INDEX2,Y_INDEX,Z_INDEX,PART_INDEX,REAC_INDEX,MATL_INDEX
1584115841
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_LABEL,SMOKEVIEW_BAR_LABEL
15842-
NAMELIST /SLCF/ AGL_SLICE,CELL_CENTERED,DB,FYI,DEBUG,ID,MAXIMUM_VALUE,MESH_NUMBER,&
15842+
NAMELIST /SLCF/ AGL_SLICE,CELL_CENTERED,DB,DRY,FYI,DEBUG,ID,MAXIMUM_VALUE,MESH_NUMBER,&
1584315843
MINIMUM_VALUE,PART_ID,PBX,PBY,PBZ,PROP_ID,QUANTITY,QUANTITY2,REAC_ID,RLE_MIN,RLE_MAX,SLICETYPE,&
1584415844
SPEC_ID,VECTOR,VELO_INDEX,XB
1584515845

@@ -15943,6 +15943,8 @@ SUBROUTINE READ_SLCF
1594315943
VELO_INDEX = 0
1594415944
RLE_MIN = 1.0_FB
1594515945
RLE_MAX = 0.0_FB
15946+
DRY = .FALSE.
15947+
1594615948
CALL CHECKREAD('SLCF',LU_INPUT,IOS) ; IF (STOP_STATUS==SETUP_STOP) RETURN
1594715949
IF (IOS==1) EXIT SLCF_LOOP
1594815950
READ(LU_INPUT,SLCF)
@@ -16095,6 +16097,7 @@ SUBROUTINE READ_SLCF
1609516097
SL=>SLICE(N)
1609616098
SL%SLCF_INDEX=NN
1609716099
SL%ID = ID
16100+
SL%DRY = DRY
1609816101
SL%IOR = IOR
1609916102
SL%SLICETYPE = TRIM(SLICETYPE)
1610016103
SL%GEOM_INDEX = GEOM_INDEX

‎Source/type.f90‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@ MODULE TYPES
15641564
REAL(FB), DIMENSION(2) :: MINMAX
15651565
REAL(FB) :: RLE_MIN, RLE_MAX
15661566
REAL(EB):: AGL_SLICE
1567-
LOGICAL :: TERRAIN_SLICE=.FALSE.,CELL_CENTERED=.FALSE.,RLE=.FALSE.,DEBUG=.FALSE.,THREE_D=.FALSE.
1567+
LOGICAL :: TERRAIN_SLICE=.FALSE.,CELL_CENTERED=.FALSE.,RLE=.FALSE.,DEBUG=.FALSE.,THREE_D=.FALSE.,DRY=.FALSE.
15681568
CHARACTER(LABEL_LENGTH) :: SLICETYPE='STRUCTURED',SMOKEVIEW_LABEL
15691569
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_BAR_LABEL,ID='null',MATL_ID='null'
15701570
CHARACTER(200) :: SLCF_NAME='null'
@@ -2134,6 +2134,7 @@ MODULE TYPES
21342134
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_LABEL !< Smokeview label for QUANTITY
21352135
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_BAR_LABEL !< Smokeview colorbar label for QUANTITY
21362136
CHARACTER(LABEL_LENGTH) :: UNITS !< Units for QUANTITY
2137+
LOGICAL :: DRY !< Remove water vapor before computing a mass or volume fraction
21372138
END TYPE HVAC_QUANTITY_TYPE
21382139

21392140

‎Utilities/Matlab/FDS_verification_script.m‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
disp('radiation_plane_layer...'); radiation_plane_layer
3030
disp('ns2d...'); ns2d
3131
disp('vort2d...'); vort2d
32-
disp('wall_internal_radiation...'); wall_internal_radiation
3332
disp('ashrae_7...'); ashrae_7
3433
disp('flame_species...'); flame_species
3534
disp('cat_propane_depo...'); cat_propane_depo
@@ -62,12 +61,7 @@
6261

6362
% Special cases
6463

65-
disp('wall_model...'); wall_model
66-
disp('pulsating...'); pulsating
6764
disp('compression_wave...'); compression_wave
68-
disp('soborot_mass_transport...'); soborot_mass_transport
69-
disp('plate_view_factor...'); plate_view_factor
70-
disp('terminal_velocity_convergence...'); terminal_velocity_convergence
7165
disp('fluid_part...'); fluid_part
7266
disp('extinction...'); extinction
7367
disp('fan_curve...'); fan_curve
@@ -80,10 +74,6 @@
8074
disp('rms_cov_corr...'); rms_cov_corr
8175
disp('hot_layer_collapse...'); hot_layer_collapse
8276
disp('radiating_polygon...'); radiating_polygon
83-
disp('saad_mms_temporal_error...'); saad_mms_temporal_error
84-
disp('saad_cc_mms_temporal_error...'); saad_cc_mms_temporal_error
85-
disp('shunn_mms_temporal_error...'); shunn_mms_temporal_error
86-
disp('shunn_mms_favreZ...'); shunn_mms_favreZ
8777
disp('favre_test...'); favre_test
8878
disp('scaling_tests...'); scaling_tests
8979
disp('hvac_mass_transport...'); hvac_mass_transport
@@ -101,7 +91,6 @@
10191
disp('natconv...'); natconv
10292
disp('freecon_sphere...'); freecon_sphere
10393
disp('nat_conv_hot_plate...'); nat_conv_hot_plate
104-
disp('tree_shapes...'); tree_shapes
10594
disp('impinging_jet...'); impinging_jet
10695
disp('part_drag_profile...'); part_drag_profile
10796

0 commit comments

Comments
 (0)