Skip to content

Commit 317a723

Browse files
committed
FDS Source: Issue #13664. Add HRR_OX in _hrr.csv file
1 parent 44e70ae commit 317a723

File tree

7 files changed

+42
-42
lines changed

7 files changed

+42
-42
lines changed

Manuals/FDS_User_Guide/FDS_User_Guide.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10205,7 +10205,8 @@ \subsection{Heat Release Rate and Energy Conservation}
1020510205
\end{eqnarray}
1020610206
\begin{description}
1020710207
\item[{\ct Q\_ENTH}] The change in the sensible enthalpy of the gas. $\rho$ is the density of the gas (kg/m$^3$). $h_{\rm s}$ is the \underline{s}ensible enthalpy of the gas (kJ/kg). The volume integral is over the entire domain.
10208-
\item[{\ct HRR}] The total heat release rate of the fire (kW). By default the effects of any surface oxidation reactions are included in this value. This helps when comparing to heat release measurements obtained from oxygen consumption calorimetry, as the additional oxygen sink from surface reactions will be lumped into the measurement. However, it is possible to output only the contribution from gas-phase combustion by setting {\ct HRR\_GAS\_ONLY=T} on the {\ct DUMP} line.
10208+
\item[{\ct HRR}] The heat release rate of the fire (kW) resulting from gas phase combustion.
10209+
\item[{\ct HRR\_OX}] The heat release rate (kW) of any surface oxidation reactions. This helps when comparing to heat release measurements obtained from oxygen consumption calorimetry, as the additional oxygen sink from surface reactions will be lumped into the measurement.
1020910210
\item[{\ct Q\_RADI}] The thermal radiation {\em into} the domain from the exterior boundary or particles. $\dot{\bq}_{\rm r}''$ is the \underline{r}adiation heat flux vector (\unit{kW/m^2}). Its divergence represents the net radiative emission from a volume of gas. Typically, {\ct Q\_RADI} has a negative value, meaning that a fire or hot gases radiate energy out of the domain. $\dq_{\rm p,r}$ is the \underline{r}adiation absorbed by a droplet or \underline{p}article (kW). This term is added to {\ct Q\_RADI} and subtracted from {\ct Q\_PART} because it is implicitly included in $\nabla \cdot \dot{\bq}_{\rm r}''$ and needs to be separated off for the purpose of explicitly accounting for it in the energy budget.
1021010211
\item[{\ct Q\_CONV}] The flow of sensible enthalpy {\em into} the computational domain. $\dm_{\rm p,\alpha}$ is the production rate of gas species $\alpha$ from a solid \underline{p}article or liquid droplet (kg/s). $h_{\rm s,\alpha}$ is the \underline{s}ensible enthalpy of gas species $\alpha$ (kJ/kg). $\rho$ is the gas density (kg/m$^3$), $\bu$ is the velocity vector (m/s). $h_{\rm s}$ is the \underline{s}ensible enthalpy of the gas. If the gas is flowing out of the domain, $\bu \cdot \d {\bf S}$ is positive.
1021110212
\item[{\ct Q\_COND}] The convective heat flux {\em into} the computational domain. $\dq_{\rm c}''$ is the heat \underline{c}onvected from the gas to a surface. If the gas is relatively hot and the surfaces/particles/droplets relatively cool, {\ct Q\_COND} is negative. At {\ct OPEN} boundaries, {\ct Q\_COND} is $\int k \nabla T \cdot \d {\bf S}$, where $k$ (kW/(m$\cdot$K)) is the turbulent thermal conductivity of the gas and $\nabla T$ is the temperature gradient across the open boundary. $\dq_{\rm p,w}$ is the energy transferred from a solid surface (\underline{w}all) to a droplet or \underline{p}article adhering to it. Notice that it is subtracted off in {\ct Q\_PART} because it makes no contribution to the energy of the gas.
@@ -12066,7 +12067,6 @@ \section{\texorpdfstring{{\tt DUMP}}{DUMP} (Output Parameters)}
1206612067
{\ct DT\_TMP} & Real & Section~\ref{info:CSVF} & s & \\ \hline
1206712068
{\ct DT\_UVW} & Real & Section~\ref{info:CSVF} & s & \\ \hline
1206812069
{\ct FLUSH\_FILE\_BUFFERS} & Logical & Section~\ref{info:DUMP} & & {\ct T} \\ \hline
12069-
{\ct HRR\_GAS\_ONLY} & Logical & Section~\ref{info:HRR} & & {\ct F} \\ \hline
1207012070
{\ct MASS\_FILE} & Logical & Section~\ref{info:DUMP} & & {\ct F} \\ \hline
1207112071
{\ct MAXIMUM\_PARTICLES} & Integer & Section~\ref{info:controlling_droplets}& & 1000000 \\ \hline
1207212072
{\ct NFRAMES} & Integer & Section~\ref{info:DUMP} & & 1000 \\ \hline

Source/cons.f90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ MODULE GLOBAL_CONSTANTS
260260
LOGICAL :: PERIODIC_DOMAIN_Y=.FALSE. !< The domain is periodic \f$ y \f$
261261
LOGICAL :: PERIODIC_DOMAIN_Z=.FALSE. !< The domain is periodic \f$ z \f$
262262
LOGICAL :: OPEN_WIND_BOUNDARY=.FALSE. !< There is a prevailing wind
263-
LOGICAL :: HRR_GAS_ONLY=.FALSE. !< Surface oxidation is not included in total HRR
264263
LOGICAL :: WRITE_DEVC_CTRL=.FALSE. !< Flag for writing DEVC and CTRL logfile
265264
LOGICAL :: INIT_INVOKED_BY_SURF=.FALSE. !< Flag indicating that a SURF line specifies an INIT line
266265
LOGICAL :: NO_PRESSURE_ZONES=.FALSE. !< Flag to suppress pressure zones

Source/data.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ MODULE OUTPUT_DATA
77

88
IMPLICIT NONE (TYPE,EXTERNAL)
99

10-
INTEGER, PARAMETER :: N_Q_DOT=8
10+
INTEGER, PARAMETER :: N_Q_DOT=9
1111
INTEGER :: PLOT3D_QUANTITY_INDEX(5),PLOT3D_Y_INDEX(5)=0,PLOT3D_Z_INDEX(5)=0,PLOT3D_PART_INDEX(5),&
1212
PLOT3D_VELO_INDEX(5)=0
1313
CHARACTER(LABEL_LENGTH) :: PLOT3D_QUANTITY(5),PLOT3D_SPEC_ID(5),PLOT3D_PART_ID(5),PLOT3D_SMOKEVIEW_BAR_LABEL(5)

Source/dump.f90

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -799,13 +799,13 @@ SUBROUTINE INITIALIZE_GLOBAL_DUMPS(T,DT)
799799
CALL APPEND_FILE(LU_HRR,2,T_BEGIN+(T-T_BEGIN)*TIME_SHRINK_FACTOR)
800800
ELSE
801801
OPEN(LU_HRR,FILE=FN_HRR,FORM='FORMATTED',STATUS='REPLACE')
802-
WRITE(TCFORM,'(A,I0,A)') "(",9+N_TRACKED_SPECIES+N_ZONE_TMP,"(A,','),A)"
803-
WRITE(LU_HRR,TCFORM) 's','kW','kW','kW','kW','kW','kW','kW','kW','kW',('kg/s',N=1,N_TRACKED_SPECIES),('Pa',N=1,N_ZONE_TMP)
802+
WRITE(TCFORM,'(A,I0,A)') "(",N_Q_DOT+1+N_TRACKED_SPECIES+N_ZONE_TMP,"(A,','),A)"
803+
WRITE(LU_HRR,TCFORM) 's','kW','kW','kW','kW','kW','kW','kW','kW','kW','kW',('kg/s',N=1,N_TRACKED_SPECIES),('Pa',N=1,N_ZONE_TMP)
804804
IF (N_ZONE_TMP>0) THEN
805-
WRITE(LU_HRR,TCFORM) 'Time','HRR','Q_RADI','Q_CONV','Q_COND','Q_DIFF','Q_PRES','Q_PART','Q_ENTH','Q_TOTAL',&
805+
WRITE(LU_HRR,TCFORM) 'Time','HRR','HRR_OX','Q_RADI','Q_CONV','Q_COND','Q_DIFF','Q_PRES','Q_PART','Q_ENTH','Q_TOTAL',&
806806
('MLR_'//TRIM(SPECIES_MIXTURE(N)%ID),N=1,N_TRACKED_SPECIES),(TRIM(P_ZONE(N)%ID),N=1,N_ZONE_TMP)
807807
ELSE
808-
WRITE(LU_HRR,TCFORM) 'Time','HRR','Q_RADI','Q_CONV','Q_COND','Q_DIFF','Q_PRES','Q_PART','Q_ENTH','Q_TOTAL',&
808+
WRITE(LU_HRR,TCFORM) 'Time','HRR','HRR_OX','Q_RADI','Q_CONV','Q_COND','Q_DIFF','Q_PRES','Q_PART','Q_ENTH','Q_TOTAL',&
809809
('MLR_'//TRIM(SPECIES_MIXTURE(N)%ID),N=1,N_TRACKED_SPECIES)
810810
ENDIF
811811
ENDIF
@@ -3923,7 +3923,7 @@ SUBROUTINE WRITE_DIAGNOSTICS(T,DT)
39233923
IF (SIM_MODE==DNS_MODE .OR. CHECK_VN) WRITE(LU_OUTPUT,230) M%VN,M%I_VN,M%J_VN,M%K_VN
39243924
IF (M%NLP>0) WRITE(LU_OUTPUT,141) M%NLP
39253925
IF (ABS(Q_DOT(1,NM))>1._EB) WRITE(LU_OUTPUT,119) Q_DOT(1,NM)/1000._EB
3926-
IF (ABS(Q_DOT(2,NM))>1._EB) WRITE(LU_OUTPUT,120) Q_DOT(2,NM)/1000._EB
3926+
IF (ABS(Q_DOT(3,NM))>1._EB) WRITE(LU_OUTPUT,120) Q_DOT(3,NM)/1000._EB
39273927
IF (M%DT_RESTRICT_STORE>0 ) THEN
39283928
WRITE(LU_OUTPUT,121) M%DT_RESTRICT_STORE
39293929
M%DT_RESTRICT_STORE=0
@@ -9935,13 +9935,14 @@ END SUBROUTINE DUMP_HVAC
99359935
!> \param NM Mesh number
99369936
!> \details
99379937
!> Q_DOT(1,NM) = \f$ \int \dot{q}''' \, dV \f$
9938-
!> Q_DOT(2,NM) = \f$ \int \nabla \cdot \mathbf{q}_{\rm r}'' \, dV \f$
9939-
!> Q_DOT(3,NM) = \f$ \int \mathbf{u} \rho h_{\rm s} \cdot \, d\mathbf{S} \f$
9940-
!> Q_DOT(4,NM) = \f$ \int k \nabla T \cdot d\mathbf{S} \f$
9941-
!> Q_DOT(5,NM) = \f$ \int \sum_\alpha h_{{\rm s},\alpha} \rho D_\alpha \nabla Z_\alpha \cdot d\mathbf{S} \f$
9942-
!> Q_DOT(6,NM) = \f$ \int dp/dt \, dV \f$
9943-
!> Q_DOT(7,NM) = \f$ \sum \dot{q}_{\rm p} \f$
9944-
!> Q_DOT(8,NM) = \f$ \int d(\rho h_{\rm s})/dt \, dV \f$
9938+
!> Q_DOT(2,NM) = \f$ \int \dot{q}_{\rm ox}'' \, dS \f$
9939+
!> Q_DOT(3,NM) = \f$ \int \nabla \cdot \mathbf{q}_{\rm r}'' \, dV \f$
9940+
!> Q_DOT(4,NM) = \f$ \int \mathbf{u} \rho h_{\rm s} \cdot \, d\mathbf{S} \f$
9941+
!> Q_DOT(5,NM) = \f$ \int k \nabla T \cdot d\mathbf{S} \f$
9942+
!> Q_DOT(6,NM) = \f$ \int \sum_\alpha h_{{\rm s},\alpha} \rho D_\alpha \nabla Z_\alpha \cdot d\mathbf{S} \f$
9943+
!> Q_DOT(7,NM) = \f$ \int dp/dt \, dV \f$
9944+
!> Q_DOT(8,NM) = \f$ \sum \dot{q}_{\rm p} \f$
9945+
!> Q_DOT(9,NM) = \f$ \int d(\rho h_{\rm s})/dt \, dV \f$
99459946

99469947
SUBROUTINE UPDATE_HRR(DT,NM)
99479948

@@ -9973,21 +9974,21 @@ SUBROUTINE UPDATE_HRR(DT,NM)
99739974
IF (CYLINDRICAL) VC = VC*2._EB*PI
99749975

99759976
Q_DOT(1,NM) = Q_DOT(1,NM) + Q(I,J,K)*VC
9976-
Q_DOT(2,NM) = Q_DOT(2,NM) + QR(I,J,K)*VC
9977-
Q_DOT(6,NM) = Q_DOT(6,NM) + 0.5_EB*(D_PBAR_DT_S(PRESSURE_ZONE(I,J,K))+D_PBAR_DT(PRESSURE_ZONE(I,J,K)))*VC
9977+
Q_DOT(3,NM) = Q_DOT(3,NM) + QR(I,J,K)*VC
9978+
Q_DOT(7,NM) = Q_DOT(7,NM) + 0.5_EB*(D_PBAR_DT_S(PRESSURE_ZONE(I,J,K))+D_PBAR_DT(PRESSURE_ZONE(I,J,K)))*VC
99789979
ZZ_GET(1:N_TRACKED_SPECIES) = ZZ(I,J,K,1:N_TRACKED_SPECIES)
99799980
CALL GET_SENSIBLE_ENTHALPY(ZZ_GET,H_S,TMP(I,J,K))
99809981
ENTHALPY_SUM(NM) = ENTHALPY_SUM(NM) + RHO(I,J,K)*H_S*VC
99819982
ENDDO
99829983
ENDDO
99839984
ENDDO
99849985

9985-
IF (CC_IBM) CALL ADD_Q_DOT_CUTCELLS(NM,Q_DOT(1,NM),Q_DOT(2,NM),Q_DOT(6,NM),ENTHALPY_SUM(NM))
9986+
IF (CC_IBM) CALL ADD_Q_DOT_CUTCELLS(NM,Q_DOT(1,NM),Q_DOT(3,NM),Q_DOT(7,NM),ENTHALPY_SUM(NM))
99869987

99879988
IF (ICYC>0) THEN
9988-
Q_DOT(8,NM) = (ENTHALPY_SUM(NM)-ENTHALPY_SUM_OLD)/DT
9989+
Q_DOT(9,NM) = (ENTHALPY_SUM(NM)-ENTHALPY_SUM_OLD)/DT
99899990
ELSE
9990-
Q_DOT(8,NM) = 0._EB
9991+
Q_DOT(9,NM) = 0._EB
99919992
ENDIF
99929993

99939994
! Compute the surface integral of all Del Dot terms
@@ -10036,10 +10037,10 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1003610037
AREA_F = B1%AREA
1003710038
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1003810039
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
10039-
Q_DOT(3,NM) = Q_DOT(3,NM) - U_N*B1%RHO_F*H_S*AREA_F
10040-
Q_DOT(4,NM) = Q_DOT(4,NM) - B1%Q_CON_F*AREA_F
10041-
Q_DOT(5,NM) = Q_DOT(5,NM) - H_S_J_ALPHA*AREA_F
10042-
IF (.NOT. HRR_GAS_ONLY) Q_DOT(1,NM) = Q_DOT(1,NM) + B1%Q_DOT_O2_PP*AREA_F
10040+
Q_DOT(2,NM) = Q_DOT(2,NM) + B1%Q_DOT_O2_PP*AREA_F
10041+
Q_DOT(4,NM) = Q_DOT(4,NM) - U_N*B1%RHO_F*H_S*AREA_F
10042+
Q_DOT(5,NM) = Q_DOT(5,NM) - B1%Q_CON_F*AREA_F
10043+
Q_DOT(6,NM) = Q_DOT(6,NM) - H_S_J_ALPHA*AREA_F
1004310044
ENDDO WALL_LOOP
1004410045

1004510046
CFACE_LOOP : DO ICF=INTERNAL_CFACE_CELLS_LB+1,INTERNAL_CFACE_CELLS_LB+N_INTERNAL_CFACE_CELLS
@@ -10068,13 +10069,13 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1006810069
AREA_F = B1%AREA
1006910070
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1007010071
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
10071-
Q_DOT(3,NM) = Q_DOT(3,NM) - U_N*B1%RHO_F*H_S*AREA_F
10072-
Q_DOT(4,NM) = Q_DOT(4,NM) - B1%Q_CON_F*AREA_F
10073-
Q_DOT(5,NM) = Q_DOT(5,NM) - H_S_J_ALPHA*AREA_F
10072+
Q_DOT(4,NM) = Q_DOT(4,NM) - U_N*B1%RHO_F*H_S*AREA_F
10073+
Q_DOT(5,NM) = Q_DOT(5,NM) - B1%Q_CON_F*AREA_F
10074+
Q_DOT(6,NM) = Q_DOT(6,NM) - H_S_J_ALPHA*AREA_F
1007410075

1007510076
ENDDO CFACE_LOOP
1007610077

10077-
IF (OXIDATION_REACTION .AND. .NOT. HRR_GAS_ONLY) THEN
10078+
IF (OXIDATION_REACTION) THEN
1007810079
PARTICLE_LOOP: DO IP=1,NLP
1007910080
LP => LAGRANGIAN_PARTICLE(IP)
1008010081
LPC => LAGRANGIAN_PARTICLE_CLASS(LP%CLASS_INDEX)
@@ -10084,7 +10085,7 @@ SUBROUTINE UPDATE_HRR(DT,NM)
1008410085
AREA_F = B1%AREA
1008510086
IF (TWO_D) AREA_F = AREA_F/DY(BC%JJG)
1008610087
IF (CYLINDRICAL) AREA_F = AREA_F*2._EB*PI
10087-
Q_DOT(1,NM) = Q_DOT(1,NM) + LP%PWT*B1%Q_DOT_O2_PP*AREA_F
10088+
Q_DOT(2,NM) = Q_DOT(2,NM) + LP%PWT*B1%Q_DOT_O2_PP*AREA_F
1008810089
ENDDO PARTICLE_LOOP
1008910090
ENDIF
1009010091

@@ -10152,7 +10153,7 @@ SUBROUTINE DUMP_HRR(T,DT)
1015210153
ENDDO
1015310154
ENDIF
1015410155

10155-
WRITE(TCFORM,'(A,I0,5A)') "(",9+N_TRACKED_SPECIES+N_ZONE_TMP,"(",FMT_R,",','),",FMT_R,")"
10156+
WRITE(TCFORM,'(A,I0,5A)') "(",N_Q_DOT+1+N_TRACKED_SPECIES+N_ZONE_TMP,"(",FMT_R,",','),",FMT_R,")"
1015610157
IF (N_ZONE_TMP>0) THEN
1015710158
WRITE(LU_HRR,TCFORM) STIME,0.001_EB*Q_DOT_TOTAL(1:N_Q_DOT),0.001_EB*SUM(Q_DOT_TOTAL(1:N_Q_DOT-1)),&
1015810159
M_DOT_TOTAL(1:N_TRACKED_SPECIES),(P_ZONE_P(I),I=1,N_ZONE_TMP)

Source/part.f90

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3907,9 +3907,9 @@ SUBROUTINE PARTICLE_MASS_ENERGY_TRANSFER(T,DT,NM)
39073907

39083908
! Add energy losses and gains to overall energy budget array
39093909

3910-
Q_DOT(7,NM) = Q_DOT(7,NM) - Q_RAD*WGT/DT ! Q_PART
3911-
Q_DOT(3,NM) = Q_DOT(3,NM) + M_VAP*H_S_B*WGT/DT ! Q_CONV
3912-
Q_DOT(2,NM) = Q_DOT(2,NM) + Q_RAD*WGT/DT ! Q_RADI
3910+
Q_DOT(8,NM) = Q_DOT(8,NM) - Q_RAD*WGT/DT ! Q_PART
3911+
Q_DOT(4,NM) = Q_DOT(4,NM) + M_VAP*H_S_B*WGT/DT ! Q_CONV
3912+
Q_DOT(3,NM) = Q_DOT(3,NM) + Q_RAD*WGT/DT ! Q_RADI
39133913

39143914
IF (LPC%Z_INDEX>0) M_DOT(LPC%Z_INDEX,NM) = M_DOT(LPC%Z_INDEX,NM) + WGT*M_VAP/DT/LPC%ADJUST_EVAPORATION
39153915

@@ -4282,10 +4282,10 @@ SUBROUTINE PARTICLE_MASS_ENERGY_TRANSFER(T,DT,NM)
42824282

42834283
! Add energy losses and gains to overall energy budget array
42844284

4285-
Q_DOT(7,NM) = Q_DOT(7,NM) - (Q_CON_GAS + Q_CON_WALL + Q_RAD)*WGT/DT ! Q_PART
4286-
Q_DOT(3,NM) = Q_DOT(3,NM) + M_VAP*H_S_B*WGT/DT ! Q_CONV
4287-
Q_DOT(2,NM) = Q_DOT(2,NM) + Q_RAD*WGT/DT ! Q_RADI
4288-
Q_DOT(4,NM) = Q_DOT(4,NM) + Q_CON_WALL*WGT/DT ! Q_COND
4285+
Q_DOT(8,NM) = Q_DOT(8,NM) - (Q_CON_GAS + Q_CON_WALL + Q_RAD)*WGT/DT ! Q_PART
4286+
Q_DOT(4,NM) = Q_DOT(4,NM) + M_VAP*H_S_B*WGT/DT ! Q_CONV
4287+
Q_DOT(3,NM) = Q_DOT(3,NM) + Q_RAD*WGT/DT ! Q_RADI
4288+
Q_DOT(5,NM) = Q_DOT(5,NM) + Q_CON_WALL*WGT/DT ! Q_COND
42894289

42904290
IF (LPC%Z_INDEX>0) M_DOT(LPC%Z_INDEX,NM) = M_DOT(LPC%Z_INDEX,NM) + WGT*M_VAP/DT/LPC%ADJUST_EVAPORATION
42914291

Source/read.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2322,7 +2322,7 @@ SUBROUTINE READ_DUMP
23222322
DIAGNOSTICS_INTERVAL,&
23232323
DT_BNDF,DT_CPU,DT_CTRL,DT_DEVC,DT_FLUSH,DT_HRR,DT_HVAC,DT_ISOF,DT_MASS,DT_PART,DT_PL3D,DT_PROF,&
23242324
DT_RADF,DT_RESTART,DT_SL3D,DT_SLCF,DT_SMOKE3D,DT_UVW,DT_TMP,DT_SPEC,&
2325-
FLUSH_FILE_BUFFERS,GET_CUTCELLS_VERBOSE,HRR_GAS_ONLY,MASS_FILE,MAXIMUM_PARTICLES,MMS_TIMER,&
2325+
FLUSH_FILE_BUFFERS,GET_CUTCELLS_VERBOSE,MASS_FILE,MAXIMUM_PARTICLES,MMS_TIMER,&
23262326
NFRAMES,PLOT3D_PART_ID,PLOT3D_QUANTITY,PLOT3D_SPEC_ID,PLOT3D_VELO_INDEX,&
23272327
RAMP_BNDF,RAMP_CPU,RAMP_CTRL,RAMP_DEVC,RAMP_FLUSH,RAMP_HRR,RAMP_HVAC,RAMP_ISOF,RAMP_MASS,&
23282328
RAMP_PART,RAMP_PL3D,RAMP_PROF,RAMP_RADF,RAMP_RESTART,RAMP_SLCF,RAMP_SL3D,RAMP_SMOKE3D,&

Source/wall.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,7 +1425,7 @@ SUBROUTINE DEPOSIT_PARTICLE_MASS(NM,LP,LPC)
14251425
ZZ_GET(NS) = 1._EB
14261426
CALL GET_SENSIBLE_ENTHALPY(ZZ_GET,H_S_B,B1%TMP_F)
14271427
!$OMP CRITICAL
1428-
Q_DOT(3,NM) = Q_DOT(3,NM) + B1%M_DOT_G_PP_ADJUST(NS)*B1%AREA*H_S_B*LP%PWT ! Q_CONV
1428+
Q_DOT(4,NM) = Q_DOT(4,NM) + B1%M_DOT_G_PP_ADJUST(NS)*B1%AREA*H_S_B*LP%PWT ! Q_CONV
14291429
!$OMP END CRITICAL
14301430
ENDDO
14311431

@@ -1444,8 +1444,8 @@ SUBROUTINE DEPOSIT_PARTICLE_MASS(NM,LP,LPC)
14441444

14451445
! Add energy losses and gains to overall energy budget array
14461446

1447-
Q_DOT(7,NM) = Q_DOT(7,NM) - (B1%Q_CON_F + B1%Q_RAD_IN - B1%Q_RAD_OUT)*B1%AREA*LP%PWT ! Q_PART
1448-
Q_DOT(2,NM) = Q_DOT(2,NM) + (B1%Q_RAD_IN-B1%Q_RAD_OUT)*B1%AREA*LP%PWT ! Q_RADI
1447+
Q_DOT(8,NM) = Q_DOT(8,NM) - (B1%Q_CON_F + B1%Q_RAD_IN - B1%Q_RAD_OUT)*B1%AREA*LP%PWT ! Q_PART
1448+
Q_DOT(3,NM) = Q_DOT(3,NM) + (B1%Q_RAD_IN-B1%Q_RAD_OUT)*B1%AREA*LP%PWT ! Q_RADI
14491449
!$OMP END CRITICAL
14501450

14511451
! Calculate the mass flux of fuel gas from particles

0 commit comments

Comments
 (0)