Skip to content

Commit 08549af

Browse files
authored
Merge pull request #15030 from cxp484/FireX
FireX: Merge with firemodels/master
2 parents a98050d + df7530c commit 08549af

File tree

7 files changed

+71
-15
lines changed

7 files changed

+71
-15
lines changed

Manuals/FDS_User_Guide/FDS_User_Guide.tex

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10562,7 +10562,15 @@ \subsection{Thermocouples}
1056210562
\label{fig:thermocouple_time_constant}
1056310563
\end{figure}
1056410564

10565+
\subsection{Bi-Directional Probe}
10566+
\label{info:bidir_probe}
1056510567

10568+
The output quantity \ct{BI-DIRECTIONAL PROBE} is the velocity of a modeled bi-directional probe. A bi-directional probe uses the following equation:
10569+
\be
10570+
C \sqrt{\frac{2 \Delta P}{\rho}}
10571+
\label{BDP}
10572+
\ee
10573+
where $C$ is a calibration constant (default value is 0.93), $\Delta P$ is the pressure difference across the probe, and $\rho$ is the gas density at the probe. In a typical experiment, the gas density is computed assuming standard pressure (101325 Pa), the molecular weight of air (28.8 g/mol), and the temperature as measured by a thermocouple near the probe. Bi-directional probes have biases due to both the Reynolds number (based on the probe diameter) of the flow and the angle of the flow with respect to the probe axis. This model accounts for those sensitivities and the impact of density differences from varied molecular weight at the probe. The orientation of the probe can be specified with either \ct{IOR} or \ct{ORIENTATION} on \ct{DEVC}. A probe with \ct{IOR}=-1 would have a positive velocity output when the flow is in the negative x direction. Parameters for the probe can be specified with a \ct{PROP_ID} on the \ct {DEVC}. The calibration constant and the probe diameter (default of 0.0254 m) can be set respectively with \ct{CALIBRATION_CONSTANT} and \ct{PROBE_DIAMETER} on \ct{PROP}. If the probe temperature is an aspirated thermocouple or other measurement not sensitive to the radiative environment, then set \ct{TC=F} on \ct{PROP}.
1056610574

1056710575
\subsection{Volume Flow}
1056810576
\label{info:volume_flow}
@@ -11730,6 +11738,7 @@ \section{Device, Control, and Other Miscellaneous Output Quantities}
1173011738
\endhead
1173111739
\ct{ACTUATED SPRINKLERS} & Section~\ref{info:TIMING} & & D \\ \hline
1173211740
\ct{ASPIRATION} & Section~\ref{info:aspiration_detector} & \%/m & D \\ \hline
11741+
\ct{BI-DIRECTIONAL PROBE} & Section~\ref{info:bidir_probe} & m/s & D \\ \hline
1173311742
\ct{CHAMBER OBSCURATION} & Section~\ref{info:smoke_detector} & \%/m & D \\ \hline
1173411743
\ct{CELL INDEX I} & Mesh cell index in x & & D,S \\ \hline
1173511744
\ct{CELL INDEX J} & Mesh cell index in y & & D,S \\ \hline
@@ -13176,6 +13185,7 @@ \section{\texorpdfstring{{\tt PROP}}{PROP} (Device Properties)}
1317613185
\ct{ALPHA_E} & Real & Section~\ref{info:smoke_detector} & & 0. \\ \hline
1317713186
\ct{BETA_C} & Real & Section~\ref{info:smoke_detector} & & 1. \\ \hline
1317813187
\ct{BETA_E} & Real & Section~\ref{info:smoke_detector} & & 1. \\ \hline
13188+
\ct{CALIBRATION_CONSTANT} & Real & Section~\ref{info:bidir_probe} & & 0.93 \\ \hline
1317913189
\ct{CHARACTERISTIC_VELOCITY} & Real & Section~\ref{info:pressure_coefficient} & m/s & 1. \\ \hline
1318013190
\ct{C_FACTOR} & Real & Section~\ref{info:sprinklers} & (m/s)$^{1/2}$ & 0. \\ \hline
1318113191
\ct{DENSITY} & Real & Section~\ref{info:THERMOCOUPLE} & kg/m$^3$ & 8908. \\ \hline
@@ -13212,6 +13222,7 @@ \section{\texorpdfstring{{\tt PROP}}{PROP} (Device Properties)}
1321213222
\ct{PDPA_RADIUS} & Real & Section~\ref{PDPA} & m & 0. \\ \hline
1321313223
\ct{PDPA_START} & Real & Section~\ref{PDPA} & s & 0. \\ \hline
1321413224
\ct{PRESSURE_RAMP} & Character & Section~\ref{info:sprinklers} & & \\ \hline
13225+
\ct{PROBE_DIAMETER} & Real & Section~\ref{info:bidir_probe} & m & 0.0254 \\ \hline
1321513226
\ct{P0} & Real & Section~\ref{info:velocity_patch} & m/s & 0. \\ \hline
1321613227
\ct{PX(3)} & Real & Section~\ref{info:velocity_patch} & m/s & 0. \\ \hline
1321713228
\ct{PXX(3,3)} & Real & Section~\ref{info:velocity_patch} & m/s & 0. \\ \hline
@@ -13227,6 +13238,7 @@ \section{\texorpdfstring{{\tt PROP}}{PROP} (Device Properties)}
1322713238
\ct{SPRAY_PATTERN_MU} & Real & Section~\ref{info:sprinklers} & degrees & 0. \\ \hline
1322813239
\ct{SPRAY_PATTERN_SHAPE} & Character & Section~\ref{info:sprinklers} & & \ct{'GAUSSIAN'} \\ \hline
1322913240
\ct{SPRAY_PATTERN_TABLE} & Character & Section~\ref{info:sprinklers} & & \\ \hline
13241+
\ct{TC} & Logical & Section~\ref{info:bidir_probe} & & \ct{T} \\ \hline
1323013242
\ct{TIME_CONSTANT} & Real & Section~\ref{info:THERMOCOUPLE} & s & \\ \hline
1323113243
\ct{VELOCITY_COMPONENT} & Integer & Section~\ref{info:velocity_patch} & & \\ \hline
1323213244
\ct{VIEW_ANGLE} & Real & Section~\ref{info:heat_flux} & degrees & 180. \\ \hline
@@ -14449,6 +14461,7 @@ \chapter{Error Codes}
1444914461
885 \> \ct{DEVC ... must have coordinates, even if not a point quantity.} \> Section~\ref{info:DEVC} \\
1445014462
886 \> \ct{DEVC ... must have either an output QUANTITY or PROP_ID.} \> Section~\ref{info:DEVC} \\
1445114463
887 \> \ct{DEVC ... must have an ORIENTATION.} \> Section~\ref{info:heat_flux} \\
14464+
\> \> or Section~\ref{info:bidir_probe} \\
1445214465
888 \> \ct{DEVC ... TEMPORAL_STATISTIC is not recognized.} \> Section~\ref{info:statistics} \\
1445314466
889 \> \ct{DEVC ... SPATIAL_STATISTIC is not recognized.} \> Section~\ref{info:statistics} \\
1445414467
890 \> \ct{DEVC ... STATISTICS is not recognized.} \> Section~\ref{info:statistics} \\

Source/data.f90

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,12 @@ SUBROUTINE DEFINE_OUTPUT_QUANTITIES
608608
OUTPUT_QUANTITY(113)%UNITS = 'kW/m2'
609609
OUTPUT_QUANTITY(113)%SHORT_NAME = 'hflux'
610610

611+
! Model of a Bi-Directional Probe
612+
613+
OUTPUT_QUANTITY(114)%NAME = 'BI-DIRECTIONAL PROBE'
614+
OUTPUT_QUANTITY(114)%UNITS = 'm/s'
615+
OUTPUT_QUANTITY(114)%SHORT_NAME = 'bdp'
616+
611617
! Special Outputs for Partially Stirred Batch Reactor Model
612618

613619
OUTPUT_QUANTITY(130)%NAME = 'EXTINCTION'

Source/devc.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ MODULE DEVICE_VARIABLES
1111

1212
TYPE PROPERTY_TYPE
1313
REAL(EB) :: DENSITY,DIAMETER,EMISSIVITY,HEAT_TRANSFER_COEFFICIENT,SPECIFIC_HEAT,RTI,TIME_CONSTANT, &
14-
ACTIVATION_TEMPERATURE,ACTIVATION_OBSCURATION, &
14+
ACTIVATION_TEMPERATURE,ACTIVATION_OBSCURATION, CALIBRATION_CONSTANT,&
1515
ALPHA_E,ALPHA_C,BETA_E,BETA_C,CHARACTERISTIC_VELOCITY,PARTICLE_VELOCITY,MASS_FLOW_RATE,FLOW_RATE,FLOW_TAU, &
1616
GAUGE_EMISSIVITY,GAUGE_TEMPERATURE,INITIAL_TEMPERATURE,K_FACTOR,C_FACTOR,OPERATING_PRESSURE,OFFSET,&
17-
SPRAY_ANGLE(2,2),P0=0._EB,PX(3)=0._EB,PXX(3,3)=0._EB,VIEW_ANGLE
17+
SPRAY_ANGLE(2,2),P0=0._EB,PX(3)=0._EB,PXX(3,3)=0._EB,VIEW_ANGLE,PROBE_DIAMETER
1818
INTEGER :: PDPA_M=0,PDPA_N=0,N_SMOKEVIEW_PARAMETERS=0,N_SMOKEVIEW_IDS=0,N_INSERT,I_VEL=0,PARTICLES_PER_SECOND
1919
LOGICAL :: PDPA_INTEGRATE=.TRUE.,PDPA_NORMALIZE=.TRUE.,HISTOGRAM_NORMALIZE=.TRUE.,HISTOGRAM=.FALSE., &
20-
HISTOGRAM_CUMULATIVE=.FALSE.,SPARK=.FALSE.
20+
HISTOGRAM_CUMULATIVE=.FALSE.,SPARK=.FALSE.,TC=.TRUE.
2121
REAL(EB) :: PDPA_START=0._EB,PDPA_END=1.E6_EB,PDPA_RADIUS=0.1_EB
2222
REAL(EB), ALLOCATABLE, DIMENSION(:) :: TABLE_ROW, V_FACTOR
2323
INTEGER :: PART_INDEX=-1,FLOW_RAMP_INDEX,SPRAY_PATTERN_INDEX,Z_INDEX=-999,Y_INDEX=-999,PRESSURE_RAMP_INDEX

Source/dump.f90

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8494,13 +8494,13 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
84948494
INTEGER, INTENT(IN) :: II,JJ,KK,IND,IND2,NM,Y_INDEX,Z_INDEX,ELEM_INDX,PART_INDEX,VELO_INDEX,PIPE_INDEX,PROP_INDEX,REAC_INDEX, &
84958495
MATL_INDEX
84968496
INTEGER, INTENT(IN), OPTIONAL :: ICC_IN,JCC_IN
8497-
REAL(EB) :: H_TC,TMP_TC,RE_D,NUSSELT,VEL,K_G,MU_G,&
8497+
REAL(EB) :: H_TC,TMP_TC,RE_D,NUSSELT,VEL,K_G,MU_G,COSTHETA,FAC,DP,&
84988498
Q_SUM,TMP_G,UU,VV,WW,VEL2,Y_MF_INT,PATHLENGTH,EXT_COEF,MASS_EXT_COEF,ZZ_FUEL,ZZ_OX,&
84998499
VELSR,WATER_VOL_FRAC,RHS,DT_C,DT_E,T_RATIO,Y_E_LAG, H_G,H_G_SUM,CPBAR,CP,ZZ_GET(1:N_TRACKED_SPECIES),RCON,&
85008500
EXPON,Y_SPECIES,MEC,Y_SPECIES2,Y_H2O,R_Y_H2O,R_DN,SGN,Y_ALL(N_SPECIES),H_S,D_Z_N(0:I_MAX_TEMP),&
85018501
DISSIPATION_RATE,S11,S22,S33,S12,S13,S23,DUDX,DUDY,DUDZ,DVDX,DVDY,DVDZ,DWDX,DWDY,DWDZ,ONTHDIV,SS,ETA,DELTA,R_DX2,&
85028502
UVW,UODX,VODY,WODZ,XHAT,ZHAT,BBF,GAMMA_LOC,VC,VOL,PHI,GAS_PHASE_OUTPUT_CC,&
8503-
GAS_PHASE_OUTPUT_CFA,CFACE_AREA,VELOCITY_COMPONENT(1:3),ATOTV(1:3),TMP_F,R_D,MW
8503+
GAS_PHASE_OUTPUT_CFA,CFACE_AREA,VELOCITY_COMPONENT(1:3),ATOTV(1:3),TMP_F,R_D,MW,RHO_AIR,PROBE_TMP
85048504
INTEGER :: N,I,J,K,NN,IL,III,JJJ,KKK,IP,JP,KP,FED_ACTIVITY,IP1,JP1,KP1,IM1,JM1,KM1,IIM1,JJM1,KKM1,NR,NS,RAM,&
85058505
ICC,JCC,NCELL,AXIS,ICF,NFACE,JCF,JCC_LO,JCC_HI,PDPA_FORMULA,IC
85068506
REAL(FB) :: RN
@@ -9048,6 +9048,30 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
90489048
ENDIF
90499049
GAS_PHASE_OUTPUT_RES = (GAS_PHASE_OUTPUT_RES - K_G*(TMP(IP,JP,KP)-TMP(II,JJ,KK))*R_DN)*0.001
90509050

9051+
CASE(114) ! BI-DIRECTIONAL PROBE
9052+
IF (PY%TC) THEN
9053+
PROBE_TMP = GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,110,IND2,Y_INDEX,Z_INDEX,ELEM_INDX,PART_INDEX,VELO_INDEX,PIPE_INDEX,&
9054+
PROP_INDEX,REAC_INDEX,MATL_INDEX,ICC_IN,JCC_IN) + TMPM
9055+
ELSE
9056+
PROBE_TMP = TMP(II,JJ,KK)
9057+
ENDIF
9058+
UU = U(II,JJ,KK)
9059+
VV = V(II,JJ,KK)
9060+
WW = W(II,JJ,KK)
9061+
VEL2 = UU**2+VV**2+WW**2
9062+
DP = 0.5_EB*VEL2*RHO(II,JJ,KK)
9063+
COSTHETA = (UU*ORIENTATION_VECTOR(1,DV%ORIENTATION_INDEX)+VV*ORIENTATION_VECTOR(2,DV%ORIENTATION_INDEX)+&
9064+
WW*ORIENTATION_VECTOR(3,DV%ORIENTATION_INDEX))/SQRT(VEL2)
9065+
FAC = -2.308_EB*ABS(COSTHETA)**3 + 2.533_EB*ABS(COSTHETA)**2 + 0.7847_EB*ABS(COSTHETA)
9066+
VEL = FAC*SQRT(VEL2)
9067+
ZZ_GET(1:N_TRACKED_SPECIES) = ZZ(II,JJ,KK,1:N_TRACKED_SPECIES)
9068+
CALL GET_VISCOSITY(ZZ_GET,MU_G,TMP(II,JJ,KK))
9069+
RE_D = MIN(3800._EB,MAX(40._EB,RHO(II,JJ,KK)*VEL*PY%PROBE_DIAMETER/MU_G))
9070+
FAC = 1.533_EB-0.001366_EB*RE_D+0.000001688_EB*RE_D**2-0.0000000009706_EB*RE_D**3+&
9071+
0.0000000000002555_EB*RE_D**4-2.484E-17_EB*RE_D**5
9072+
RHO_AIR = 350.9736_EB/PROBE_TMP !350 is 0.0288 101325/ 8.314472
9073+
GAS_PHASE_OUTPUT_RES = SIGN(1._EB,COSTHETA)*VEL*PY%CALIBRATION_CONSTANT*FAC
9074+
90519075
CASE(130) ! EXTINCTION
90529076
ZZ_GET(1:N_TRACKED_SPECIES) = ZZ(II,JJ,KK,1:N_TRACKED_SPECIES)
90539077
ZZ_FUEL = 0._EB
@@ -9724,11 +9748,11 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
97249748
CASE(562) ! BFZ
97259749
GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,KK)
97269750
CASE(563) ! BFX MINUS
9727-
GAS_PHASE_OUTPUT_RES = BFX(II-1,JJ,KK)
9751+
GAS_PHASE_OUTPUT_RES = BFX(MAX(0,II-1),JJ,KK)
97289752
CASE(564) ! BFY MINUS
9729-
GAS_PHASE_OUTPUT_RES = BFY(II,JJ-1,KK)
9753+
GAS_PHASE_OUTPUT_RES = BFY(II,MAX(0,JJ-1),KK)
97309754
CASE(565) ! BFZ MINUS
9731-
GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,KK-1)
9755+
GAS_PHASE_OUTPUT_RES = BFZ(II,JJ,MAX(0,KK-1))
97329756

97339757
END SELECT IND_SELECT
97349758

Source/read.f90

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6595,30 +6595,30 @@ SUBROUTINE READ_PROP
65956595
USE DEVICE_VARIABLES
65966596
USE PHYSICAL_FUNCTIONS, ONLY : SPRAY_ANGLE_DISTRIBUTION
65976597
USE MATH_FUNCTIONS, ONLY: GET_TABLE_INDEX
6598-
REAL(EB) :: ACTIVATION_OBSCURATION,ACTIVATION_TEMPERATURE,ALPHA_C,ALPHA_E,BETA_C,BETA_E, &
6598+
REAL(EB) :: ACTIVATION_OBSCURATION,ACTIVATION_TEMPERATURE,ALPHA_C,ALPHA_E,BETA_C,BETA_E,CALIBRATION_CONSTANT, &
65996599
HEAT_TRANSFER_COEFFICIENT,DIAMETER,DENSITY,SPECIFIC_HEAT, &
66006600
C_FACTOR,CHARACTERISTIC_VELOCITY,ORIFICE_DIAMETER,EMISSIVITY, &
66016601
PARTICLE_VELOCITY,FLOW_RATE,FLOW_TAU,GAUGE_EMISSIVITY,GAUGE_TEMPERATURE,INITIAL_TEMPERATURE,K_FACTOR,&
66026602
LENGTH,SPRAY_ANGLE(2,2),OFFSET,OPERATING_PRESSURE,RTI,PDPA_START,PDPA_END,PDPA_RADIUS,MASS_FLOW_RATE,&
6603-
SPRAY_PATTERN_MU,SPRAY_PATTERN_BETA,HISTOGRAM_LIMITS(2),P0,PX(3),PXX(3,3),TIME_CONSTANT,VIEW_ANGLE
6603+
SPRAY_PATTERN_MU,SPRAY_PATTERN_BETA,HISTOGRAM_LIMITS(2),P0,PX(3),PXX(3,3),TIME_CONSTANT,VIEW_ANGLE,PROBE_DIAMETER
66046604
INTEGER ::I,N,NN,PDPA_M,PDPA_N,PARTICLES_PER_SECOND,VELOCITY_COMPONENT,HISTOGRAM_NBINS,FED_ACTIVITY
6605-
LOGICAL :: PDPA_INTEGRATE,PDPA_NORMALIZE,HISTOGRAM_NORMALIZE,HISTOGRAM,HISTOGRAM_CUMULATIVE,SPARK
6605+
LOGICAL :: PDPA_INTEGRATE,PDPA_NORMALIZE,HISTOGRAM_NORMALIZE,HISTOGRAM,HISTOGRAM_CUMULATIVE,SPARK,TC
66066606
CHARACTER(LABEL_LENGTH) :: SMOKEVIEW_ID(SMOKEVIEW_OBJECTS_DIMENSION),QUANTITY='null',PART_ID='null',FLOW_RAMP='null', &
66076607
SPRAY_PATTERN_TABLE='null',SPEC_ID='null',&
66086608
PRESSURE_RAMP='null',SMOKEVIEW_PARAMETERS(SMOKEVIEW_OBJECTS_DIMENSION), &
66096609
SPRAY_PATTERN_SHAPE='GAUSSIAN'
66106610
TYPE (PROPERTY_TYPE), POINTER :: PY
66116611

6612-
NAMELIST /PROP/ ACTIVATION_OBSCURATION,ACTIVATION_TEMPERATURE,ALPHA_C,ALPHA_E,BETA_C,BETA_E, &
6612+
NAMELIST /PROP/ ACTIVATION_OBSCURATION,ACTIVATION_TEMPERATURE,ALPHA_C,ALPHA_E,BETA_C,BETA_E,CALIBRATION_CONSTANT,&
66136613
CHARACTERISTIC_VELOCITY,C_FACTOR,DENSITY,DIAMETER,EMISSIVITY,FED_ACTIVITY,FLOW_RAMP,FLOW_RATE,FLOW_TAU, &
66146614
GAUGE_EMISSIVITY,GAUGE_TEMPERATURE,HEAT_TRANSFER_COEFFICIENT,HISTOGRAM,HISTOGRAM_CUMULATIVE, &
66156615
HISTOGRAM_LIMITS,HISTOGRAM_NBINS,HISTOGRAM_NORMALIZE,ID, &
66166616
INITIAL_TEMPERATURE,K_FACTOR,LENGTH,MASS_FLOW_RATE,OFFSET,OPERATING_PRESSURE,ORIFICE_DIAMETER,P0,&
66176617
PARTICLES_PER_SECOND,PARTICLE_VELOCITY,PART_ID,PDPA_END,&
66186618
PDPA_INTEGRATE,PDPA_M,PDPA_N,PDPA_NORMALIZE,PDPA_RADIUS,&
6619-
PDPA_START,PRESSURE_RAMP,PX,PXX,QUANTITY,RTI,SMOKEVIEW_ID,SMOKEVIEW_PARAMETERS,SPARK,&
6619+
PDPA_START,PRESSURE_RAMP,PROBE_DIAMETER,PX,PXX,QUANTITY,RTI,SMOKEVIEW_ID,SMOKEVIEW_PARAMETERS,SPARK,&
66206620
SPEC_ID,SPECIFIC_HEAT,SPRAY_ANGLE,&
6621-
SPRAY_PATTERN_BETA,SPRAY_PATTERN_MU,SPRAY_PATTERN_SHAPE,SPRAY_PATTERN_TABLE,TIME_CONSTANT,VELOCITY_COMPONENT,&
6621+
SPRAY_PATTERN_BETA,SPRAY_PATTERN_MU,SPRAY_PATTERN_SHAPE,SPRAY_PATTERN_TABLE,TC,TIME_CONSTANT,VELOCITY_COMPONENT,&
66226622
VIEW_ANGLE
66236623

66246624
! Count the PROP lines in the input file. Note how many of these are cables.
@@ -6661,6 +6661,7 @@ SUBROUTINE READ_PROP
66616661
PY%ALPHA_E = ALPHA_E
66626662
PY%BETA_C = BETA_C
66636663
PY%BETA_E = BETA_E
6664+
PY%CALIBRATION_CONSTANT = CALIBRATION_CONSTANT
66646665
PY%DENSITY = DENSITY
66656666
PY%DIAMETER = DIAMETER
66666667
PY%EMISSIVITY = EMISSIVITY
@@ -6676,6 +6677,7 @@ SUBROUTINE READ_PROP
66766677
PY%OFFSET = OFFSET
66776678
PY%OPERATING_PRESSURE = OPERATING_PRESSURE
66786679
PY%PART_ID = PART_ID
6680+
PY%PROBE_DIAMETER = PROBE_DIAMETER
66796681
PY%QUANTITY = QUANTITY
66806682
IF (PY%PART_ID/='null' .AND. PY%QUANTITY == 'null' ) PY%QUANTITY = 'NOZZLE FLOW RATE'
66816683
PY%RTI = RTI
@@ -6734,6 +6736,7 @@ SUBROUTINE READ_PROP
67346736
CALL SPRAY_ANGLE_DISTRIBUTION(PY%SPRAY_LON,PY%SPRAY_LAT,PY%SPRAY_LON_CDF,PY%SPRAY_LAT_CDF, &
67356737
SPRAY_PATTERN_BETA,SPRAY_PATTERN_MU,PY%SPRAY_ANGLE,SPRAY_PATTERN_SHAPE,NDC2)
67366738
ENDIF
6739+
PY%TC = TC
67376740
PY%TIME_CONSTANT = TIME_CONSTANT
67386741

67396742
! PDPA model
@@ -6903,6 +6906,7 @@ SUBROUTINE SET_PROP_DEFAULTS
69036906
ALPHA_E = 0.0_EB
69046907
BETA_C = -1.0_EB
69056908
BETA_E = -1.0_EB
6909+
CALIBRATION_CONSTANT = 0.93_EB
69066910
DENSITY = 8908._EB ! kg/m3 (Nickel)
69076911
DIAMETER = 0.001 ! m
69086912
EMISSIVITY = 0.85_EB
@@ -6942,6 +6946,7 @@ SUBROUTINE SET_PROP_DEFAULTS
69426946
HISTOGRAM_NORMALIZE = .TRUE.
69436947
PRESSURE_RAMP = 'null'
69446948
P0 = -1.E10_EB
6949+
PROBE_DIAMETER = 0.0254_EB
69456950
PX = 0._EB
69466951
PXX = 0._EB
69476952
QUANTITY = 'null'
@@ -6958,6 +6963,7 @@ SUBROUTINE SET_PROP_DEFAULTS
69586963
SPRAY_PATTERN_SHAPE = 'GAUSSIAN'
69596964
SPRAY_PATTERN_MU = -1._EB
69606965
SPRAY_PATTERN_BETA = 5.0_EB
6966+
TC = .TRUE.
69616967
TIME_CONSTANT = -1._EB
69626968
FED_ACTIVITY = 2 ! light work
69636969
VELOCITY_COMPONENT = 0
@@ -14209,7 +14215,8 @@ SUBROUTINE READ_DEVC
1420914215
DV%QUANTITY(1)=='GAUGE HEAT FLUX GAS' .OR. &
1421014216
DV%QUANTITY(1)=='RADIANCE' .OR. &
1421114217
DV%QUANTITY(1)=='ADIABATIC SURFACE TEMPERATURE GAS' .OR. &
14212-
DV%QUANTITY(1)=='RADIOMETER GAS') THEN
14218+
DV%QUANTITY(1)=='RADIOMETER GAS' .OR. &
14219+
DV%QUANTITY(1)=='BI-DIRECTIONAL PROBE') THEN
1421314220
IF (DV%ORIENTATION_INDEX==0) THEN
1421414221
WRITE(MESSAGE,'(3A)') 'ERROR(887): DEVC ',TRIM(ID),' must have an ORIENTATION.'
1421514222
CALL SHUTDOWN(MESSAGE) ; RETURN

Verification/Scalar_Analytical_Solution/soborot_superbee_square_wave_128.fds

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626

2727
&SLCF PBY=0.0, QUANTITY='VELOCITY', VECTOR=.TRUE./
2828
&SLCF PBY=0.0, QUANTITY='MASS FRACTION', SPEC_ID='TRACER', CELL_CENTERED=T/
29+
&SLCF PBY=0.0, QUANTITY='BFX', CELL_CENTERED=T/
30+
&SLCF PBY=0.0, QUANTITY='BFY', CELL_CENTERED=T/
31+
&SLCF PBY=0.0, QUANTITY='BFZ', CELL_CENTERED=T/
2932

3033
&DEVC XB=-0.00390625,-0.99609375,0,0,0.00390625,0.99609375, POINTS=128, TIME_HISTORY=T, TIME_AVERAGED=F,
3134
QUANTITY='MASS FRACTION', SPEC_ID='TRACER', ID='Y_TRACER'/

Verification/Scalar_Analytical_Solution/soborot_superbee_square_wave_128_1mesh.fds

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525

2626
&SLCF PBY=0.0, QUANTITY='VELOCITY', VECTOR=.TRUE./
2727
&SLCF PBY=0.0, QUANTITY='MASS FRACTION', SPEC_ID='TRACER', CELL_CENTERED=T/
28+
&SLCF PBY=0.0, QUANTITY='BFX', CELL_CENTERED=T/
29+
&SLCF PBY=0.0, QUANTITY='BFY', CELL_CENTERED=T/
30+
&SLCF PBY=0.0, QUANTITY='BFZ', CELL_CENTERED=T/
2831

2932
&DEVC XB=-0.00390625,-0.99609375,0,0,0.00390625,0.99609375, POINTS=128, TIME_HISTORY=T, TIME_AVERAGED=F,
3033
QUANTITY='MASS FRACTION', SPEC_ID='TRACER', ID='Y_TRACER'/

0 commit comments

Comments
 (0)