Skip to content

Commit 26b3478

Browse files
authored
Merge pull request #15026 from drjfloyd/master
FDS Source: Edits to BI-DIRECTIONAL PROBE output.
2 parents 7471836 + 61a0442 commit 26b3478

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Source/dump.f90

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7897,16 +7897,15 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
78977897
COSTHETA = (UU*ORIENTATION_VECTOR(1,DV%ORIENTATION_INDEX)+VV*ORIENTATION_VECTOR(2,DV%ORIENTATION_INDEX)+&
78987898
WW*ORIENTATION_VECTOR(3,DV%ORIENTATION_INDEX))/SQRT(VEL2)
78997899
FAC = -2.308_EB*ABS(COSTHETA)**3 + 2.533_EB*ABS(COSTHETA)**2 + 0.7847_EB*ABS(COSTHETA)
7900-
DP = DP * FAC
7901-
VEL = SQRT(2._EB*DP/RHO(II,JJ,KK))
7900+
VEL = FAC*SQRT(VEL2)
79027901
ZZ_GET(1:N_TRACKED_SPECIES) = ZZ(II,JJ,KK,1:N_TRACKED_SPECIES)
79037902
CALL GET_VISCOSITY(ZZ_GET,MU_G,TMP(II,JJ,KK))
79047903
RE_D = MIN(3800._EB,MAX(40._EB,RHO(II,JJ,KK)*VEL*PY%PROBE_DIAMETER/MU_G))
79057904
FAC = 1.533_EB-0.001366_EB*RE_D+0.000001688_EB*RE_D**2-0.0000000009706_EB*RE_D**3+&
79067905
0.0000000000002555_EB*RE_D**4-2.484E-17_EB*RE_D**5
79077906
RHO_AIR = 350.9736_EB/PROBE_TMP !350 is 0.0288 101325/ 8.314472
7908-
GAS_PHASE_OUTPUT_RES = SIGN(1._EB,COSTHETA)*PY%CALIBRATION_CONSTANT*0.5_EB*RHO_AIR*(VEL*FAC)**2
7909-
7907+
GAS_PHASE_OUTPUT_RES = SIGN(1._EB,COSTHETA)*VEL*PY%CALIBRATION_CONSTANT*FAC
7908+
79107909
CASE(130) ! EXTINCTION
79117910
ZZ_GET(1:N_TRACKED_SPECIES) = ZZ(II,JJ,KK,1:N_TRACKED_SPECIES)
79127911
ZZ_FUEL = 0._EB

0 commit comments

Comments
 (0)