Merge pull request #14775 from marcosvanella/master

FDS Source : Add SCALAR, F_X, F_Y, F_Z UNKNOWN NUMBER slices.

Author: marcosvanella

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
@@ -8256,8 +8256,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)
@@ -8618,6 +8643,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)) ) &
@@ -8651,6 +8679,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