Merge pull request firemodels#12078 from ericvmueller/master

FDS Source: fix output of FVX_D/FVY_D/FVZ_D (DRAG FORCE X/Y/Z)
mcgratta · Aug 21, 2023 · f131f16 · f131f16
2 parents 020647c + ce7ff23
commit f131f16
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/Source/data.f90 b/Source/data.f90
@@ -354,6 +354,23 @@ SUBROUTINE DEFINE_OUTPUT_QUANTITIES
 OUTPUT_QUANTITY(60)%SHORT_NAME = 'act'
 OUTPUT_QUANTITY(60)%TIME_AVERAGED = .FALSE.
 
+! Drag from particles
+
+OUTPUT_QUANTITY(61)%NAME = 'DRAG FORCE X'
+OUTPUT_QUANTITY(61)%UNITS = 'N/m3'
+OUTPUT_QUANTITY(61)%SHORT_NAME = 'drag_x'
+OUTPUT_QUANTITY(61)%IOR = 1
+
+OUTPUT_QUANTITY(62)%NAME = 'DRAG FORCE Y'
+OUTPUT_QUANTITY(62)%UNITS = 'N/m3'
+OUTPUT_QUANTITY(62)%SHORT_NAME = 'drag_y'
+OUTPUT_QUANTITY(62)%IOR = 2
+
+OUTPUT_QUANTITY(63)%NAME = 'DRAG FORCE Z'
+OUTPUT_QUANTITY(63)%UNITS = 'N/m3'
+OUTPUT_QUANTITY(63)%SHORT_NAME = 'drag_z'
+OUTPUT_QUANTITY(63)%IOR = 3
+
 OUTPUT_QUANTITY(68)%NAME = 'SPECIFIC INTERNAL ENERGY'
 OUTPUT_QUANTITY(68)%UNITS = 'kJ/kg'
 OUTPUT_QUANTITY(68)%SHORT_NAME = 'u'

diff --git a/Source/dump.f90 b/Source/dump.f90
@@ -7185,11 +7185,11 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
    CASE(60)  ! ACTUATED SPRINKLERS
       GAS_PHASE_OUTPUT_RES = N_ACTUATED_SPRINKLERS
 
-   CASE(61)  ! PARTICLE DRAG FORCE X
+   CASE(61)  ! DRAG FORCE X
       GAS_PHASE_OUTPUT_RES = -0.5_EB*(RHO(II,JJ,KK)+RHO(II+1,JJ,KK))*FVX_D(II,JJ,KK)
-   CASE(62)  ! PARTICLE DRAG FORCE Y
+   CASE(62)  ! DRAG FORCE Y
       GAS_PHASE_OUTPUT_RES = -0.5_EB*(RHO(II,JJ,KK)+RHO(II,JJ+1,KK))*FVY_D(II,JJ,KK)
-   CASE(63)  ! PARTICLE DRAG FORCE Z
+   CASE(63)  ! DRAG FORCE Z
       GAS_PHASE_OUTPUT_RES = -0.5_EB*(RHO(II,JJ,KK)+RHO(II,JJ,KK+1))*FVZ_D(II,JJ,KK)
 
    CASE(68:69)  ! SPECIFIC INTERNAL ENERGY and INTERNAL ENERGY (per unit volume)