Merge pull request #8111 from mcgratta/master

FDS Source: Properly initialize CHI_R
firemodels · Mar 5, 2020 · 0e6e09e · 0e6e09e
2 parents 5a49d42 + 8c2bedb
commit 0e6e09e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Source/fire.f90 b/Source/fire.f90
@@ -416,6 +416,8 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
       CHI_R_SUM = CHI_R_SUM + Q_REAC_SUM(NR)*RN%CHI_R*TIME_RAMP_FACTOR
    ENDDO
    CHI_R_OUT = CHI_R_SUM/(SUM(Q_REAC_SUM))
+ELSE
+   CHI_R_OUT = REACTION(1)%CHI_R*EVALUATE_RAMP(T,0._EB,REACTION(1)%RAMP_CHI_R_INDEX)
 ENDIF
 CHI_R_OUT = MAX(CHI_R_MIN,MIN(CHI_R_MAX,CHI_R_OUT))
 

diff --git a/Source/init.f90 b/Source/init.f90
@@ -291,7 +291,7 @@ SUBROUTINE INITIALIZE_MESH_VARIABLES_1(DT,NM)
 IF (.NOT.EVACUATION_ONLY(NM)) THEN
    ALLOCATE(M%CHI_R(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO)
    CALL ChkMemErr('INIT','QR',IZERO)
-   M%CHI_R = MAX(0._EB,RADIATIVE_FRACTION)
+   M%CHI_R = MAX(0._EB,RADIATIVE_FRACTION*EVALUATE_RAMP(T_BEGIN,0._EB,REACTION(1)%RAMP_CHI_R_INDEX))
    ALLOCATE(M%QR(0:IBP1,0:JBP1,0:KBP1),STAT=IZERO)
    CALL ChkMemErr('INIT','QR',IZERO)
    M%QR = 0._EB