FDS Source: Add DELTA_TMP to update HT3D

Source/cons.f90

@@ -552,9 +552,8 @@ MODULE GLOBAL_CONSTANTS
 INTEGER :: N_SURF,N_SURF_RESERVED,N_MATL,MIRROR_SURF_INDEX,OPEN_SURF_INDEX,INTERPOLATED_SURF_INDEX,DEFAULT_SURF_INDEX=0, &
            INERT_SURF_INDEX=0,PERIODIC_SURF_INDEX,PERIODIC_FLOW_ONLY_SURF_INDEX,HVAC_SURF_INDEX=-1,&
            MASSLESS_TRACER_SURF_INDEX, MASSLESS_TARGET_SURF_INDEX,DROPLET_SURF_INDEX,VEGETATION_SURF_INDEX,NWP_MAX
-REAL(EB), ALLOCATABLE, DIMENSION(:) :: AAS,BBS,DDS,DDT,DX_S,RDX_S,RDXN_S,DX_WGT_S, &
+REAL(EB), ALLOCATABLE, DIMENSION(:) :: AAS,BBS,CCS,DDS,DDT,DX_S,RDX_S,RDXN_S,DX_WGT_S,DELTA_TMP, &
                                        RHO_S,Q_S,TWO_DX_KAPPA_S,X_S_NEW,R_S,MF_FRAC,REGRID_FACTOR,R_S_NEW
-REAL(EB), ALLOCATABLE, TARGET, DIMENSION(:) :: CCS
 INTEGER,  ALLOCATABLE, DIMENSION(:) :: LAYER_INDEX,CELL_COUNT,CELL_COUNT_INTEGERS,CELL_COUNT_LOGICALS
 INTEGER,  ALLOCATABLE, DIMENSION(:) :: EDGE_COUNT
 

Source/dump.f90

@@ -2486,16 +2486,20 @@ SUBROUTINE INITIALIZE_DIAGNOSTIC_FILE(DT)
 
 IF (APPEND) RETURN
 
+CELL_COUNT = 0
+DO NM=1,NMESHES
+   M => MESHES(NM)
+   CELL_COUNT = CELL_COUNT + M%IBAR*M%JBAR*M%KBAR
+ENDDO
+
 IF (.NOT.SUPPRESS_DIAGNOSTICS) THEN
-   CELL_COUNT = 0
    MESH_LOOP: DO NM=1,NMESHES
       M => MESHES(NM)
       WRITE(LU_OUTPUT,'(/A,I5/)') ' Grid Dimensions, Mesh ',NM
       WRITE(LU_OUTPUT,'(A,I8)')     '   Cells in the X Direction      ',M%IBAR
       WRITE(LU_OUTPUT,'(A,I8)')     '   Cells in the Y Direction      ',M%JBAR
       WRITE(LU_OUTPUT,'(A,I8)')     '   Cells in the Z Direction      ',M%KBAR
       WRITE(LU_OUTPUT,'(A,I8)')     '   Number of Grid Cells          ',M%IBAR*M%JBAR*M%KBAR
-      CELL_COUNT = CELL_COUNT + M%IBAR*M%JBAR*M%KBAR
       WRITE(LU_OUTPUT,'(//A,I5/)')' Physical Dimensions, Mesh ',NM
       WRITE(LU_OUTPUT,'(A,F10.3)')  '   Length (m)                  ',M%XF-M%XS
       WRITE(LU_OUTPUT,'(A,F10.3)')  '   Width  (m)                  ',M%YF-M%YS

Source/func.f90

@@ -1831,6 +1831,9 @@ SUBROUTINE PACK_BOUNDARY_ONE_D(NM,IC,RC,OS,OD_INDEX,UNPACK_IT,COUNT_ONLY)
 I1 = I2+1 ; I2 = I1 + ONE_D%N_CELLS_MAX + 1
 IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:I2) , ONE_D%TMP(0:I2-I1) , UNPACK_IT)
 
+I1 = I2+1 ; I2 = I1 + ONE_D%N_CELLS_MAX + 1
+IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:I2) , ONE_D%DELTA_TMP(0:I2-I1) , UNPACK_IT)
+
 I1 = I2+1 ; I2 = I1 + ONE_D%N_LAYERS - 1
 IF (.NOT.COUNT_ONLY) CALL EQUATE(OS%REALS(I1:I2) , ONE_D%LAYER_THICKNESS(1:I2-I1+1) , UNPACK_IT)
 
@@ -1883,6 +1886,7 @@ SUBROUTINE REALLOCATE_BOUNDARY_ONE_D(ONE_D)
 IF (ALLOCATED(ONE_D%M_DOT_S_PP)) DEALLOCATE(ONE_D%M_DOT_S_PP)                 ; ALLOCATE(ONE_D%M_DOT_S_PP(ONE_D%N_MATL))
 IF (ALLOCATED(ONE_D%X)) DEALLOCATE(ONE_D%X)                                   ; ALLOCATE(ONE_D%X(0:ONE_D%N_CELLS_MAX))
 IF (ALLOCATED(ONE_D%TMP)) DEALLOCATE(ONE_D%TMP)                               ; ALLOCATE(ONE_D%TMP(0:ONE_D%N_CELLS_MAX+1))
+IF (ALLOCATED(ONE_D%DELTA_TMP)) DEALLOCATE(ONE_D%DELTA_TMP)                   ; ALLOCATE(ONE_D%DELTA_TMP(0:ONE_D%N_CELLS_MAX+1))
 IF (ALLOCATED(ONE_D%LAYER_THICKNESS)) DEALLOCATE(ONE_D%LAYER_THICKNESS)       ; ALLOCATE(ONE_D%LAYER_THICKNESS(ONE_D%N_LAYERS))
 IF (ALLOCATED(ONE_D%RHO_C_S)) DEALLOCATE(ONE_D%RHO_C_S)                       ; ALLOCATE(ONE_D%RHO_C_S(ONE_D%N_CELLS_MAX))
 IF (ALLOCATED(ONE_D%K_S)) DEALLOCATE(ONE_D%K_S)                               ; ALLOCATE(ONE_D%K_S(0:ONE_D%N_CELLS_MAX+1))
@@ -1943,6 +1947,7 @@ SUBROUTINE INITIALIZE_BOUNDARY_ONE_D(NM,OD_INDEX,SURF_INDEX)
 ELSE
    ONE_D%TMP = SF%TMP_INNER
 ENDIF
+ONE_D%DELTA_TMP = 0._EB
 ONE_D%LAYER_THICKNESS(1:SF%N_LAYERS) = SF%LAYER_THICKNESS(1:SF%N_LAYERS)
 ONE_D%RHO_C_S = 1.E6_EB
 ONE_D%K_S = 0._EB
@@ -2409,6 +2414,7 @@ SUBROUTINE ALLOCATE_HT1D_UTILITY_ARRAYS
 ALLOCATE(Q_S(1:NWP_MAX),STAT=IZERO)            ; CALL ChkMemErr('INIT','Q_S',IZERO)
 ALLOCATE(RHO_S(0:NWP_MAX+1),STAT=IZERO)        ; CALL ChkMemErr('INIT','RHO_S',IZERO)
 ALLOCATE(TWO_DX_KAPPA_S(1:NWP_MAX),STAT=IZERO) ; CALL ChkMemErr('INIT','TWO_DX_KAPPA_S',IZERO)
+ALLOCATE(DELTA_TMP(0:NWP_MAX),STAT=IZERO)      ; CALL ChkMemErr('INIT','DELTA_TMP',IZERO)
 ALLOCATE(X_S_NEW(0:NWP_MAX),STAT=IZERO)        ; CALL ChkMemErr('INIT','X_S_NEW',IZERO)
 ALLOCATE(DX_S(1:NWP_MAX),STAT=IZERO)           ; CALL ChkMemErr('INIT','DX_S',IZERO)
 ALLOCATE(RDX_S(0:NWP_MAX+1),STAT=IZERO)        ; CALL ChkMemErr('INIT','RDX_S',IZERO)

Source/init.f90

@@ -2068,10 +2068,11 @@ SUBROUTINE ADJUST_HT3D_ONE_D
 LAYER_INDEX(0) = 1
 LAYER_INDEX(ONE_D%N_CELLS_INI+1) = ONE_D%N_LAYERS
 
-IF (ALLOCATED(ONE_D%X)) DEALLOCATE(ONE_D%X)             ; ALLOCATE(ONE_D%X(0:ONE_D%N_CELLS_MAX))
-IF (ALLOCATED(ONE_D%TMP)) DEALLOCATE(ONE_D%TMP)         ; ALLOCATE(ONE_D%TMP(0:ONE_D%N_CELLS_MAX+1))
-IF (ALLOCATED(ONE_D%RHO_C_S)) DEALLOCATE(ONE_D%RHO_C_S) ; ALLOCATE(ONE_D%RHO_C_S(ONE_D%N_CELLS_MAX))
-IF (ALLOCATED(ONE_D%K_S)) DEALLOCATE(ONE_D%K_S)         ; ALLOCATE(ONE_D%K_S(0:ONE_D%N_CELLS_MAX+1))
+IF (ALLOCATED(ONE_D%X))         DEALLOCATE(ONE_D%X)         ; ALLOCATE(ONE_D%X(0:ONE_D%N_CELLS_MAX))
+IF (ALLOCATED(ONE_D%TMP))       DEALLOCATE(ONE_D%TMP)       ; ALLOCATE(ONE_D%TMP(0:ONE_D%N_CELLS_MAX+1))
+IF (ALLOCATED(ONE_D%DELTA_TMP)) DEALLOCATE(ONE_D%DELTA_TMP) ; ALLOCATE(ONE_D%DELTA_TMP(0:ONE_D%N_CELLS_MAX+1))
+IF (ALLOCATED(ONE_D%RHO_C_S))   DEALLOCATE(ONE_D%RHO_C_S)   ; ALLOCATE(ONE_D%RHO_C_S(ONE_D%N_CELLS_MAX))
+IF (ALLOCATED(ONE_D%K_S))       DEALLOCATE(ONE_D%K_S)       ; ALLOCATE(ONE_D%K_S(0:ONE_D%N_CELLS_MAX+1))
 DO NN=1,ONE_D%N_MATL
    IF (ALLOCATED(ONE_D%MATL_COMP(NN)%RHO_DOT)) DEALLOCATE(ONE_D%MATL_COMP(NN)%RHO_DOT)
    ALLOCATE(ONE_D%MATL_COMP(NN)%RHO_DOT(0:ONE_D%N_CELLS_MAX+1))
@@ -2094,6 +2095,7 @@ SUBROUTINE ADJUST_HT3D_ONE_D
 ! Reset initial values for some reallocated arrays
 
 ONE_D%TMP = SF%TMP_INNER
+ONE_D%DELTA_TMP = 0._EB
 ONE_D%RHO_C_S = 1.E6_EB
 ONE_D%K_S = 0._EB
 

Source/type.f90

@@ -202,6 +202,7 @@ MODULE TYPES
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: M_DOT_S_PP          !< (1:SF\%N_MATL) Mass production rate of solid species
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: X                   !< (0:NWP) Depth (m), \f$ x_{{\rm s},i} \f$
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: TMP                 !< Temperature in center of each solid cell, \f$ T_{{\rm s},i} \f$
+   REAL(EB), ALLOCATABLE, DIMENSION(:) :: DELTA_TMP           !< Temperature change (K)
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: LAYER_THICKNESS     !< (1:SF\%N_LAYERS) Thickness of layer (m)
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: RHO_C_S             !< Solid density times specific heat (J/m3/K)
    REAL(EB), ALLOCATABLE, DIMENSION(:) :: K_S                 !< Solid conductivity (W/m/K)

Source/wall.f90

@@ -779,7 +779,6 @@ SUBROUTINE HT3D_TEMPERATURE_EXCHANGE(NM)
    NODE_LOOP: DO I=1,NWP  ! Nodes of the chosen wall cell.
       IF (THR_D%NODE(I)%ALTERNATE_WALL_COUNT==0) CYCLE NODE_LOOP
       IF (.NOT.ANY(ABS(THR_D%NODE(I)%ALTERNATE_WALL_IOR(:))==M%HT_3D_SWEEP_DIRECTION)) CYCLE NODE_LOOP
-      ONE_D%TMP(I) = 0._EB
       WEIGHT_LOOP: DO II=1,THR_D%NODE(I)%ALTERNATE_WALL_COUNT
          IWA = THR_D%NODE(I)%ALTERNATE_WALL_INDEX(II)
          NM2 = THR_D%NODE(I)%ALTERNATE_WALL_MESH(II)
@@ -794,7 +793,7 @@ SUBROUTINE HT3D_TEMPERATURE_EXCHANGE(NM)
             ONE_D2 => MESHES(NM2)%BOUNDARY_ONE_D(TW2%OD_INDEX)
          ENDIF
          IF (ABS(BC2%IOR)/=M%HT_3D_SWEEP_DIRECTION) CYCLE WEIGHT_LOOP
-         ONE_D%TMP(I) = ONE_D%TMP(I) + THR_D%NODE(I)%ALTERNATE_WALL_WEIGHT(II)*ONE_D2%TMP(I_NODE)
+         ONE_D%TMP(I) = ONE_D%TMP(I) + THR_D%NODE(I)%ALTERNATE_WALL_WEIGHT(II)*ONE_D2%DELTA_TMP(I_NODE)
       ENDDO WEIGHT_LOOP
       IF (THR_D%NODE(I)%MESH_NUMBER==NM) M%TMP(THR_D%NODE(I)%I,THR_D%NODE(I)%J,THR_D%NODE(I)%K) = ONE_D%TMP(I)
    ENDDO NODE_LOOP
@@ -815,7 +814,6 @@ SUBROUTINE HT3D_TEMPERATURE_EXCHANGE(NM)
    NODE_LOOP_2: DO I=1,NWP  ! Nodes of the chosen wall cell.
       IF (THR_D%NODE(I)%ALTERNATE_WALL_COUNT==0) CYCLE NODE_LOOP_2
       IF (.NOT.ANY(ABS(THR_D%NODE(I)%ALTERNATE_WALL_IOR(:))==M%HT_3D_SWEEP_DIRECTION)) CYCLE NODE_LOOP_2
-      ONE_D%TMP(I) = 0._EB
       WEIGHT_LOOP_2: DO II=1,THR_D%NODE(I)%ALTERNATE_WALL_COUNT
          IWA = THR_D%NODE(I)%ALTERNATE_WALL_INDEX(II)
          NM2 = THR_D%NODE(I)%ALTERNATE_WALL_MESH(II)
@@ -830,7 +828,7 @@ SUBROUTINE HT3D_TEMPERATURE_EXCHANGE(NM)
             ONE_D2 => MESHES(NM2)%BOUNDARY_ONE_D(TW2%OD_INDEX)
          ENDIF
          IF (ABS(BC2%IOR)/=M%HT_3D_SWEEP_DIRECTION) CYCLE WEIGHT_LOOP_2
-         ONE_D%TMP(I) = ONE_D%TMP(I) + THR_D%NODE(I)%ALTERNATE_WALL_WEIGHT(II)*ONE_D2%TMP(I_NODE)
+         ONE_D%TMP(I) = ONE_D%TMP(I) + THR_D%NODE(I)%ALTERNATE_WALL_WEIGHT(II)*ONE_D2%DELTA_TMP(I_NODE)
       ENDDO WEIGHT_LOOP_2
    ENDDO NODE_LOOP_2
 
@@ -1631,7 +1629,6 @@ SUBROUTINE SOLID_HEAT_TRANSFER_1D(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_IND
             Q_DOT_PART(MAX_LPC),M_DOT_PART(MAX_LPC),Q_DOT_PART_S(MAX_LPC),M_DOT_PART_S(MAX_LPC),RADIUS,HTC_LIMIT,&
             ZZ_G(1:N_TRACKED_SPECIES),CP1,CP2,DENOM
 REAL(EB) :: DDSUM, SMALLEST_CELL_SIZE(1:MAX_LAYERS)
-REAL(EB), POINTER, DIMENSION(:) :: DELTA_TMP
 INTEGER :: IIB,JJB,KKB,IWB,NWP,I,NL,N,I_OBST,N_LAYER_CELLS_NEW(MAX_LAYERS),N_CELLS,EXPON,ITMP,ITER
 REAL(EB) :: DX_MIN(MAX_LAYERS),THICKNESS
 REAL(EB), ALLOCATABLE,DIMENSION(:,:) :: INT_WGT
@@ -1652,8 +1649,6 @@ SUBROUTINE SOLID_HEAT_TRANSFER_1D(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_IND
 
 CONST_C = .TRUE.
 
-DELTA_TMP => CCS
-
 UNPACK_WALL_PARTICLE: IF (PRESENT(WALL_INDEX)) THEN
 
    WC => WALL(WALL_INDEX)
@@ -1817,6 +1812,7 @@ SUBROUTINE SOLID_HEAT_TRANSFER_1D(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_IND
 T_BC_SUB  = 0._EB
 DT_BC_SUB = DT_BC
 B1%N_SUBSTEPS = 1
+ONE_D%DELTA_TMP = 0._EB
 
 SUB_TIMESTEP_LOOP: DO
 
@@ -2588,9 +2584,14 @@ SUBROUTINE SOLID_HEAT_TRANSFER_1D(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_IND
    CCS(I) = (CCS(I) - AAS(I)*CCS(I+1))/DDT(I)
 ENDDO TRIDIAGONAL_SOLVER_2
 
-ONE_D%TMP(1:NWP) = MIN(TMPMAX,MAX(TMPMIN,CCS(1:NWP)))
-ONE_D%TMP(0)     =            MAX(TMPMIN,ONE_D%TMP(1)  *RFACF2+QDXKF)  ! Ghost value, allow it to be large
-ONE_D%TMP(NWP+1) =            MAX(TMPMIN,ONE_D%TMP(NWP)*RFACB2+QDXKB)  ! Ghost value, allow it to be large
+DELTA_TMP(1:NWP) = MIN(TMPMAX,MAX(TMPMIN,CCS(1:NWP))) - ONE_D%TMP(1:NWP)
+ONE_D%TMP(1:NWP) = ONE_D%TMP(1:NWP) + DELTA_TMP(1:NWP)
+DELTA_TMP(0)     = MAX(TMPMIN,ONE_D%TMP(1)  *RFACF2+QDXKF) - ONE_D%TMP(0) ! Ghost values, allow them to be large
+ONE_D%TMP(0)     = ONE_D%TMP(0)     + DELTA_TMP(0)
+DELTA_TMP(NWP+1) = MAX(TMPMIN,ONE_D%TMP(NWP)*RFACB2+QDXKB) - ONE_D%TMP(NWP+1) 
+ONE_D%TMP(NWP+1) = ONE_D%TMP(NWP+1) + DELTA_TMP(NWP+1)
+
+ONE_D%DELTA_TMP(0:NWP+1) = ONE_D%DELTA_TMP(0:NWP+1) + DELTA_TMP(0:NWP+1)
 
 B1%Q_CON_F = B1%Q_CON_F + HTCF*DT_BC_SUB*(B1%TMP_G-0.5_EB*B1%TMP_F)
 B1%TMP_F_OLD = B1%TMP_F  ! Save this value for output of effective HTC
@@ -2608,6 +2609,7 @@ SUBROUTINE SOLID_HEAT_TRANSFER_1D(NM,T,DT_BC,PARTICLE_INDEX,WALL_INDEX,CFACE_IND
 B1%TMP_B  = MIN(TMPMAX,MAX(TMPMIN,B1%TMP_B))
 
 ! Updated particle production
+
 IF (ONE_D%N_LPC > 0) THEN
    ONE_D%PART_MASS(1:ONE_D%N_LPC) = ONE_D%PART_MASS(1:ONE_D%N_LPC) + DT_BC_SUB * M_DOT_PART_S(1:ONE_D%N_LPC)
    ONE_D%PART_ENTHALPY(1:ONE_D%N_LPC) = ONE_D%PART_ENTHALPY(1:ONE_D%N_LPC) + DT_BC_SUB * Q_DOT_PART_S(1:ONE_D%N_LPC)
@@ -3062,11 +3064,11 @@ END SUBROUTINE PYROLYSIS
 
 !> \brief Compute the convective heat transfer coefficient
 
-REAL(EB) FUNCTION HEAT_TRANSFER_COEFFICIENT(DELTA_TMP,H_FIXED,SURF_INDEX_IN,WALL_INDEX_IN,CFACE_INDEX_IN,PARTICLE_INDEX_IN)
+REAL(EB) FUNCTION HEAT_TRANSFER_COEFFICIENT(DELTA_N_TMP,H_FIXED,SURF_INDEX_IN,WALL_INDEX_IN,CFACE_INDEX_IN,PARTICLE_INDEX_IN)
 
 USE TURBULENCE, ONLY: LOGLAW_HEAT_FLUX_MODEL,NATURAL_CONVECTION_MODEL,FORCED_CONVECTION_MODEL,RAYLEIGH_HEAT_FLUX_MODEL
 USE PHYSICAL_FUNCTIONS, ONLY: GET_CONDUCTIVITY,GET_VISCOSITY,GET_SPECIFIC_HEAT
-REAL(EB), INTENT(IN) :: DELTA_TMP,H_FIXED
+REAL(EB), INTENT(IN) :: DELTA_N_TMP,H_FIXED
 INTEGER, INTENT(IN) :: SURF_INDEX_IN
 INTEGER, INTENT(IN), OPTIONAL :: WALL_INDEX_IN,PARTICLE_INDEX_IN,CFACE_INDEX_IN
 INTEGER  :: IIG,JJG,KKG,IC2,SURF_GEOMETRY,ITMP,I
@@ -3118,7 +3120,7 @@ REAL(EB) FUNCTION HEAT_TRANSFER_COEFFICIENT(DELTA_TMP,H_FIXED,SURF_INDEX_IN,WALL
    IF (H_FIXED >= 0._EB) THEN
       HEAT_TRANSFER_COEFFICIENT = H_FIXED
    ELSE
-      HEAT_TRANSFER_COEFFICIENT = 1.31_EB*ABS(DELTA_TMP)**ONTH  ! Natural convection for vertical plane
+      HEAT_TRANSFER_COEFFICIENT = 1.31_EB*ABS(DELTA_N_TMP)**ONTH  ! Natural convection for vertical plane
    ENDIF
    RETURN
 ENDIF
@@ -3144,9 +3146,9 @@ REAL(EB) FUNCTION HEAT_TRANSFER_COEFFICIENT(DELTA_TMP,H_FIXED,SURF_INDEX_IN,WALL
    ! If this is a DNS calculation at a solid wall, set HTC and return. If SOLID_PHASE do not return until after blowing check.
 
    HTC_TYPE_IF: IF ( (SIM_MODE==DNS_MODE .OR. SOLID_PHASE_ONLY) .AND. (PRESENT(WALL_INDEX_IN) .OR. PRESENT(CFACE_INDEX_IN)) ) THEN
-      DELTA_TMP_IF: IF (ABS(DELTA_TMP)<TWO_EPSILON_EB) THEN
+      DELTA_N_TMP_IF: IF (ABS(DELTA_N_TMP)<TWO_EPSILON_EB) THEN
          HEAT_TRANSFER_COEFFICIENT = 2._EB * P1X%K_G * P1X%RDN
-      ELSE DELTA_TMP_IF
+      ELSE DELTA_N_TMP_IF
          WALL_IF: IF (PRESENT(WALL_INDEX_IN)) THEN
             ! O(dx^2) approximation to wall-normal temperature gradient
             IIG=BCX%IIG
@@ -3192,11 +3194,11 @@ REAL(EB) FUNCTION HEAT_TRANSFER_COEFFICIENT(DELTA_TMP,H_FIXED,SURF_INDEX_IN,WALL
             END SELECT
             GAMMA = (H_1/H_2)**2
             DTDX_W = ( GAMMA*TMP_2 - TMP_G + (1-GAMMA)*P1X%TMP_F ) / ( GAMMA*H_2 - H_1 )
-            HEAT_TRANSFER_COEFFICIENT = P1X%K_G * DTDX_W / DELTA_TMP
+            HEAT_TRANSFER_COEFFICIENT = P1X%K_G * DTDX_W / DELTA_N_TMP
          ELSEIF (PRESENT(CFACE_INDEX_IN)) THEN WALL_IF
             HEAT_TRANSFER_COEFFICIENT = 2._EB * P1X%K_G * P1X%RDN
          ENDIF WALL_IF
-      ENDIF DELTA_TMP_IF
+      ENDIF DELTA_N_TMP_IF
       IF (SIM_MODE==DNS_MODE) RETURN
    ELSE HTC_TYPE_IF
 
@@ -3206,7 +3208,7 @@ REAL(EB) FUNCTION HEAT_TRANSFER_COEFFICIENT(DELTA_TMP,H_FIXED,SURF_INDEX_IN,WALL
       HTC_MODEL_SELECT: SELECT CASE(SFX%HEAT_TRANSFER_MODEL)
          CASE(DEFAULT_HTC_MODEL)
             RE = RHO_G*P1X%U_TANG*CONV_LENGTH/MU_G
-            GR = GRAV*ABS(DELTA_TMP)*CONV_LENGTH**3*(RHO_G/MU_G)**2/TMP_FILM
+            GR = GRAV*ABS(DELTA_N_TMP)*CONV_LENGTH**3*(RHO_G/MU_G)**2/TMP_FILM
             IF (SFX%BOUNDARY_FUEL_MODEL) THEN
                SURF_GEOMETRY = SURF_CYLINDRICAL
             ELSE

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -263,8 +263,8 @@ d,ht3d_energy_conservation,Heat_Transfer/ht3d_energy_conservation_git.txt,Heat_T
 d,ht3d_energy_conservation,Heat_Transfer/ht3d_energy_conservation_2_git.txt,Heat_Transfer/ht3d_energy_conservation_2_devc.csv,2,3,Time,E3D,Enthalpy,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_energy_conservation_2_devc.csv,2,3,Time,Q_net,Integrated Heat Flux,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Energy Balance  (ht3d\_energy\_conservation\_2),Time (s),Enthalpy (kJ),0,10,1,0,100,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_energy_conservation_2,Relative Error,end,1.00E-02,Heat Transfer,r^,r,TeX
 d,ht3d_energy_conservation,Heat_Transfer/ht3d_energy_conservation_3_git.txt,Heat_Transfer/ht3d_energy_conservation_3_devc.csv,2,3,Time,E3D,Enthalpy,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_energy_conservation_3_devc.csv,2,3,Time,Q_net,Integrated Heat Flux,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Energy Balance  (ht3d\_energy\_conservation\_3),Time (s),Enthalpy (kJ),0,10,1,0,100,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_energy_conservation_3,Relative Error,end,3.00E-02,Heat Transfer,r^,r,TeX
 d,ht3d_ibeam,Heat_Transfer/ht3d_ibeam_git.txt,Heat_Transfer/ht3d_ibeam_FEM_results.csv,2,3,Time,Ts_x195_40|Ts_x145_30|Ts_x095_20|Ts_x025_40|Ts_x195_1|Ts_x025_1,FEM 1|FEM 2|FEM 3|FEM 4|FEM 5|FEM 6,ro|k^|bd|gsq|mv|c>,0,100000,,0,100000,-1.00E+09,1.00E+09,20,Heat_Transfer/ht3d_ibeam_devc.csv,2,3,Time,TS_x195-40|TS_x145-30|TS_x095-20|TS_x025-40|TS_x195-01|TS_x025-01,FDS 1|FDS 2|FDS 3|FDS 4|FDS 5|FDS 6,r-|k-|b-|g-|m-|c-,0,100000,,0,100000,-1.00E+09,1.00E+09,20,HT3D I-beam Surface Temperature (ht3d\_ibeam),Time (s),Temperature (°C),0,3600,1,0,1000,1,no,0.05 0.90,EastOutside,,1.2,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_ibeam_TS,Relative Error,end,8.00E-02,Heat Transfer,r^,r,TeX
-d,ht3d_mass_conservation,Heat_Transfer/ht3d_mass_conservation_git.txt,Heat_Transfer/ht3d_mass_conservation.csv,1,2,Time,Mass,Exact (Mass),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_mass_conservation_mass.csv,2,3,Time,WOOD MOISTURE,FDS (WOOD MOISTURE),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Mass Balance  (ht3d\_mass\_conservation),Time (s),Mass (kg),0,100,1,0,0.3,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_mass_conservation,Relative Error,end,1.00E-02,Heat Transfer,r^,r,TeX
-d,ht3d_mass_conservation,Heat_Transfer/ht3d_mass_conservation_2_git.txt,Heat_Transfer/ht3d_mass_conservation.csv,1,2,Time,Mass,Exact (Mass),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_mass_conservation_2_mass.csv,2,3,Time,WOOD MOISTURE,FDS (WOOD MOISTURE),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Mass Balance  (ht3d\_mass\_conservation\_2),Time (s),Mass (kg),0,100,1,0,0.3,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_mass_conservation_2,Relative Error,end,1.00E-02,Heat Transfer,r^,r,TeX
+d,ht3d_mass_conservation,Heat_Transfer/ht3d_mass_conservation_git.txt,Heat_Transfer/ht3d_mass_conservation.csv,1,2,Time,Mass,Exact (Mass),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_mass_conservation_mass.csv,2,3,Time,WOOD MOISTURE,FDS (WOOD MOISTURE),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Mass Balance  (ht3d\_mass\_conservation),Time (s),Mass (kg),0,180,1,0,0.3,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_mass_conservation,Relative Error,end,1.00E-02,Heat Transfer,r^,r,TeX
+d,ht3d_mass_conservation,Heat_Transfer/ht3d_mass_conservation_2_git.txt,Heat_Transfer/ht3d_mass_conservation.csv,1,2,Time,Mass,Exact (Mass),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_mass_conservation_2_mass.csv,2,3,Time,WOOD MOISTURE,FDS (WOOD MOISTURE),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Mass Balance  (ht3d\_mass\_conservation\_2),Time (s),Mass (kg),0,180,1,0,0.3,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_mass_conservation_2,Relative Error,end,1.00E-02,Heat Transfer,r^,r,TeX
 d,ht3d_network,Heat_Transfer/ht3d_network_git.txt,Heat_Transfer/ht3d_network_devc.csv,2,3,Time,T-1,T-1,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_network_devc.csv,2,3,Time,T-4,T-4,k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HT3D Thin Obstructions (ht3d\_network),Time (h),Temperature (°C),0,8,3600,0,50,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_network,Relative Error,end,1.00E-03,Heat Transfer,r^,r,TeX
 d,ht3d_slab,Heat_Transfer/ht3d_slab_git.txt,Heat_Transfer/ht3d_slab_soln.csv,1,2,Time,Ts,Exact (Surface Temp),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat_Transfer/ht3d_slab_devc.csv,2,3,Time,TS,FDS (Surface Temp),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Transfer Semi-infinite Slab (ht3d\_slab),Time (s),Temperature (°C),0,1800,1,200,1200,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/ht3d_slab,Relative Error,end,1.00E-03,Heat Transfer,r^,r,TeX
 d,HVAC_aircoil,HVAC/HVAC_aircoil_git.txt,HVAC/HVAC_aircoil_ideal.csv,1,2,Time,Ideal Q,Ideal Q,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_aircoil_devc.csv,2,3,Time,FDS Q,FDS Q,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Coil Heat Addition (HVAC\_aircoil),Time (s),Heat Addition (kW),0,1,1,20,60,1,no,0.05 0.90,South,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/HVAC_aircoil_Q,Relative Error,end,0.01,HVAC,kd,k,TeX