FireX: Merge with firemodels/master

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -2594,7 +2594,6 @@ \subsubsection{Example: Steel Assembly}
       SPATIAL_STATISTIC='SURFACE INTEGRAL', RELATIVE=T, CONVERSION_FACTOR=10000,  /
 \end{lstlisting}
 The quantity \ct{'WALL ENTHALPY'} is the total energy within the volume carved out by a wall cell from front to back. This is why the \ct{IOR} is included because the integration need only be carried out for upward facing wall cells. Also, because the unit associated with this quantity is kJ rather than kJ/m$^2$, the \ct{CONVERSION_FACTOR} is needed to cancel out the area of each wall cell (0.01~m by 0.01~m) after the summation. The parameter \ct{RELATIVE=T} means that only the change in enthalpy is desired.
-.
 
 \subsubsection{Example: Unprotected Structural Steel}
 
@@ -4017,7 +4016,7 @@ \subsection{HVAC and Unstructured Geometry}
 	&HVAC ID='MY NODE',TYPE_ID='NODE',GEOM=T,..../
 \end{lstlisting}
 
-The \ct{SURF} input \ct{NODE_ID} can only be applied to complex geometry. It cannot be used for \ct{OBST} or \ct{VENT}. While more than one \ct{GEOM} and more than one face of a \ct{GEOM} can use the same node, the same node cannot be shared by both a \ct{VENT} and a \ct{GEOM}. 
+The \ct{SURF} input \ct{NODE_ID} can only be applied to complex geometry. It cannot be used for \ct{OBST} or \ct{VENT}. While more than one \ct{GEOM} and more than one face of a \ct{GEOM} can use the same node, the same node cannot be shared by both a \ct{VENT} and a \ct{GEOM}.
 
 To apply localized leakage to \ct{GEOM}, the process is similar. \ct{NODE_ID} on \ct{SURF} is still used to link faces of \ct{GEOM} to the localized leakage. The input for the localized leakage changes slightly. The inputs \ct{VENT_ID} and \ct{VENT2_ID} use \ct{GEOM} and \ct{GEOM2} to determine if the respective \ct{ID} is attached to a \ct{VENT} or a \ct{GEOM}.  For example, to attach the second vent for a localized leakage path:
 

Source/data.f90

@@ -838,6 +838,44 @@ SUBROUTINE DEFINE_OUTPUT_QUANTITIES
 OUTPUT_QUANTITY(190)%SLCF_APPROPRIATE = .TRUE.
 OUTPUT_QUANTITY(190)%SPEC_ID_REQUIRED = .FALSE.
 
+OUTPUT_QUANTITY(191)%NAME = 'SCALAR UNKNOWN NUMBER'
+OUTPUT_QUANTITY(191)%UNITS = ''
+OUTPUT_QUANTITY(191)%SHORT_NAME = 'UNKZ'
+OUTPUT_QUANTITY(191)%ISOF_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(191)%PART_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(191)%SLCF_APPROPRIATE = .TRUE.
+OUTPUT_QUANTITY(191)%SPEC_ID_REQUIRED = .FALSE.
+
+OUTPUT_QUANTITY(192)%NAME = 'F_X UNKNOWN NUMBER'
+OUTPUT_QUANTITY(192)%UNITS = ''
+OUTPUT_QUANTITY(192)%SHORT_NAME = 'UNKFU'
+OUTPUT_QUANTITY(192)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(192)%IOR = 1
+OUTPUT_QUANTITY(192)%ISOF_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(192)%PART_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(192)%SLCF_APPROPRIATE = .TRUE.
+OUTPUT_QUANTITY(192)%SPEC_ID_REQUIRED = .FALSE.
+
+OUTPUT_QUANTITY(193)%NAME = 'F_Y UNKNOWN NUMBER'
+OUTPUT_QUANTITY(193)%UNITS = ''
+OUTPUT_QUANTITY(193)%SHORT_NAME = 'UNKFV'
+OUTPUT_QUANTITY(193)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(193)%IOR = 2
+OUTPUT_QUANTITY(193)%ISOF_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(193)%PART_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(193)%SLCF_APPROPRIATE = .TRUE.
+OUTPUT_QUANTITY(193)%SPEC_ID_REQUIRED = .FALSE.
+
+OUTPUT_QUANTITY(194)%NAME = 'F_Z UNKNOWN NUMBER'
+OUTPUT_QUANTITY(194)%UNITS = ''
+OUTPUT_QUANTITY(194)%SHORT_NAME = 'UNKFW'
+OUTPUT_QUANTITY(194)%CELL_POSITION = CELL_FACE
+OUTPUT_QUANTITY(194)%IOR = 3
+OUTPUT_QUANTITY(194)%ISOF_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(194)%PART_APPROPRIATE = .FALSE.
+OUTPUT_QUANTITY(194)%SLCF_APPROPRIATE = .TRUE.
+OUTPUT_QUANTITY(194)%SPEC_ID_REQUIRED = .FALSE.
+
 ! PDPA
 
 OUTPUT_QUANTITY(230)%NAME = 'RANDOM NUMBER'

Source/dump.f90

@@ -17,7 +17,7 @@ MODULE DUMP
 USE PROPERTY_DATA
 USE CHEMCONS, ONLY : WRITE_CVODE_SUBSTEPS, CVODE_SUBSTEP_DATA, TOTAL_SUBSTEPS_TAKEN
 USE COMPLEX_GEOMETRY, ONLY : WRITE_GEOM,WRITE_GEOM_ALL,CC_FGSC,CC_IDCF,CC_IDCC,CC_UNKZ,CC_UNKF,CC_FTYPE_RCGAS,&
-                             CC_FTYPE_CFGAS,CC_FTYPE_CFINB,CC_SOLID,CC_CGSC,CC_CUTCFE,TRIANGULATE,&
+                             CC_FTYPE_CFGAS,CC_FTYPE_CFINB,CC_SOLID,CC_CGSC,CC_IDRC,CC_CUTCFE,TRIANGULATE,&
                              CC_VGSC,CC_GASPHASE,MAKE_UNIQUE_VERT_ARRAY,AVERAGE_FACE_VALUES
 
 USE CC_SCALARS, ONLY : ADD_Q_DOT_CUTCELLS,GET_PRES_CFACE,GET_PRES_CFACE_TEST,GET_UVWGAS_CFACE,GET_MUDNS_CFACE
@@ -9422,8 +9422,33 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
       GAS_PHASE_OUTPUT_RES = MIN(1._EB,AVG_DROP_DEN(II,JJ,KK,LPC%ARRAY_INDEX)/LPC%DENSITY)
 
    CASE(190) ! CELL PHASE
-      GAS_PHASE_OUTPUT_RES = 0
-      IF (CELL(CELL_INDEX(II,JJ,KK))%SOLID) GAS_PHASE_OUTPUT_RES=1
+      GAS_PHASE_OUTPUT_RES = 0._EB
+      IF (CELL(CELL_INDEX(II,JJ,KK))%SOLID) GAS_PHASE_OUTPUT_RES=1._EB
+
+   CASE(191) ! SCALAR UNKNOWN NUMBER
+      GAS_PHASE_OUTPUT_RES = 0._EB
+      IF (CC_IBM) GAS_PHASE_OUTPUT_RES = REAL(CCVAR(II,JJ,KK,CC_UNKZ),EB)
+
+   CASE(192) ! F_X UNKNOWN NUMBER
+      GAS_PHASE_OUTPUT_RES = 0._EB
+      IF (CC_IBM) THEN
+         GAS_PHASE_OUTPUT_RES = REAL(FCVAR(II,JJ,KK,CC_UNKF,IAXIS),EB)
+         IF(FCVAR(II,JJ,KK,CC_IDRC,IAXIS)>0) GAS_PHASE_OUTPUT_RES = REAL(RC_FACE(FCVAR(II,JJ,KK,CC_IDRC,IAXIS))%UNKF,EB)
+      ENDIF
+
+   CASE(193) ! F_Y UNKNOWN NUMBER
+      GAS_PHASE_OUTPUT_RES = 0._EB
+      IF (CC_IBM) THEN
+         GAS_PHASE_OUTPUT_RES = REAL(FCVAR(II,JJ,KK,CC_UNKF,JAXIS),EB)
+         IF(FCVAR(II,JJ,KK,CC_IDRC,JAXIS)>0) GAS_PHASE_OUTPUT_RES = REAL(RC_FACE(FCVAR(II,JJ,KK,CC_IDRC,JAXIS))%UNKF,EB)
+      ENDIF
+
+   CASE(194) ! F_Z UNKNOWN NUMBER    
+      GAS_PHASE_OUTPUT_RES = 0._EB
+      IF (CC_IBM) THEN
+         GAS_PHASE_OUTPUT_RES = REAL(FCVAR(II,JJ,KK,CC_UNKF,KAXIS),EB)
+         IF(FCVAR(II,JJ,KK,CC_IDRC,KAXIS)>0) GAS_PHASE_OUTPUT_RES = REAL(RC_FACE(FCVAR(II,JJ,KK,CC_IDRC,KAXIS))%UNKF,EB)
+      ENDIF
 
    CASE(230) ! RANDOM NUMBER
       CALL RANDOM_NUMBER(RN)
@@ -9784,6 +9809,9 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
             CASE(138) ! HRRPUV REAC
                GAS_PHASE_OUTPUT_CC = GAS_PHASE_OUTPUT_CC + CUT_CELL(ICC)%Q_REAC(JCC,REAC_INDEX)*0.001_EB &
                                                                                             * CUT_CELL(ICC)%VOLUME(JCC)
+            CASE(191) ! SCALAR UNKNOWN NUMBER
+               GAS_PHASE_OUTPUT_RES = REAL(CUT_CELL(ICC)%UNKZ(JCC),EB); RETURN
+
             CASE(523) ! ABSOLUTE PRESSURE
                GAS_PHASE_OUTPUT_CC = GAS_PHASE_OUTPUT_CC + &
                   ( PBAR(KK,PRESSURE_ZONE(II,JJ,KK)) + CUT_CELL(ICC)%RHO(JCC)*(CUT_CELL(ICC)%H(JCC)-KRES(II,JJ,KK)) ) &
@@ -9817,6 +9845,8 @@ REAL(EB) RECURSIVE FUNCTION GAS_PHASE_OUTPUT(T,DT,NM,II,JJ,KK,IND,IND2,Y_INDEX,Z
                   GAS_PHASE_OUTPUT_CFA = GAS_PHASE_OUTPUT_CFA + CUT_FACE(ICF)%VEL(JCF) * CUT_FACE(ICF)%AREA(JCF)
                CASE(8)   ! W-VELOCITY
                   GAS_PHASE_OUTPUT_CFA = GAS_PHASE_OUTPUT_CFA + CUT_FACE(ICF)%VEL(JCF) * CUT_FACE(ICF)%AREA(JCF)
+               CASE(192:194) ! F_X,F_Y,F_Z UNKNOWN NUMBER
+                  GAS_PHASE_OUTPUT_RES = REAL(CUT_FACE(ICF)%UNKF(JCF),EB); RETURN
             END SELECT IND_SELECT_3
 
          ENDDO CFA_LOOP

Verification/Pressure_Solver/dancing_eddies_embed.ini

@@ -1,4 +1,4 @@
-# NIST Smokeview configuration file, Release Sep  5 2024
+# NIST Smokeview configuration file, Release Jun 18 2025
 
 
  ------------ global ini settings ------------
@@ -150,7 +150,7 @@ USENEWDRAWFACE
 VECCONTOURS
  0 1
 VECLENGTH
- 4 0.131687 1.000000 0 0 0
+ 4 1.000000 1.000000 0 0 0
 VECTORLINEWIDTH
  1.000000 1.000000
 VECTORPOINTSIZE
@@ -652,22 +652,22 @@ VIEWPOINT5
 # FDS/Smokeview Environment
 # -------------------------
 
-# Smokeview Build: SMV-6.9.3-878-g4cf77b3-nightly
-# Smokeview Build Date: Sep  5 2024
-# FDS Version: FDS-6.9.1-1285-g9625908-dirty-master
-# FDS Build: FDS-6.9.1-1285-g9625908-dirty-master
+# Smokeview Build: SMV-6.10.1-208-gea1e2e6-dirty-master
+# Smokeview Build Date: Jun 18 2025
+# FDS Version: FDS-6.10.1-341-gf778101-master
+# FDS Build: FDS-6.10.1-341-gf778101-master
 # Platform: WIN64
 
 
 # Graphics Environment
 # --------------------
 
-# OpenGL Version: 4.6.14761 Compatibility Profile Context FireGL 18.50.02 30.0.13018.2
-#   GLSL Version: 4.60
+# OpenGL Version: 4.6.0 - Build 27.20.100.9126
+#   GLSL Version: 4.60 - Build 27.20.100.9126
 #         Red bits:8
 #       Green bits:8
 #        Blue bits:8
 #       Alpha bits:8
-#       Depth bits:32
+#       Depth bits:24
 # max texture size:16384