Merge pull request #13837 from rmcdermo/master

FDS Source: fix HRRPUV REAC for RK2_RICHARDSON

Author: rmcdermo

Source/fire.f90

@@ -722,7 +722,7 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
             ZZ_TEMP(1:N_TRACKED_SPECIES), ATOL(1:N_TRACKED_SPECIES)
 INTEGER :: NR,NS,ITER,TVI,RICH_ITER,TIME_ITER,RICH_ITER_MAX
 INTEGER, PARAMETER :: TV_ITER_MIN=5
-LOGICAL :: TV_FLUCT(1:N_TRACKED_SPECIES),EXTINCT,NO_REACTIONS
+LOGICAL :: TV_FLUCT(1:N_TRACKED_SPECIES),EXTINCT,NO_REACTIONS,NO_REAC_2,NO_REAC_4
 DOUBLE PRECISION :: T1,T2
 TYPE(REACTION_TYPE), POINTER :: RN !,R1=>NULL()
 
@@ -732,7 +732,6 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
 
 ! Determine the mixing time for this cell
 
-
 IF (FIXED_MIX_TIME>0._EB) THEN
    MIX_TIME_OUT=FIXED_MIX_TIME
 ELSE
@@ -829,9 +828,9 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
                         Q_REAC_1,TOTAL_MIXED_MASS_1,NO_REACTIONS)
             IF (NO_REACTIONS) EXIT RICH_EX_LOOP
             CALL FIRE_RK2(A2,ZZ_MIXED,ZZ_0,ZETA_2,ZETA_0,DT_SUB,2,TMP_IN,RHO_HAT,CELL_MASS,TAU_MIX,&
-                        Q_REAC_2,TOTAL_MIXED_MASS_2,NO_REACTIONS)
+                        Q_REAC_2,TOTAL_MIXED_MASS_2,NO_REAC_2)
             CALL FIRE_RK2(A4,ZZ_MIXED,ZZ_0,ZETA_4,ZETA_0,DT_SUB,4,TMP_IN,RHO_HAT,CELL_MASS,TAU_MIX,&
-                        Q_REAC_4,TOTAL_MIXED_MASS_4,NO_REACTIONS)
+                        Q_REAC_4,TOTAL_MIXED_MASS_4,NO_REAC_4)
             ! Species Error Analysis
             ERR_EST = ABS((4._EB*A4-5._EB*A2+A1))/45._EB ! FDS Tech Guide (E.8)
             ZZ_TEMP = (4._EB*A4-A2)*ONTH ! FDS Tech Guide (E.7)
@@ -849,7 +848,7 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
 
          IF (NO_REACTIONS) THEN
             ZZ_MIXED = A1
-            Q_REAC_SUB = 0._EB
+            Q_REAC_SUB = Q_REAC_1
             ZETA = ZETA_1
          ELSE
             IF (ANY(ZZ_TEMP < -TWO_EPSILON_EB))THEN