FireX: Merge with firemodels/master

Author: cxp484

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -14195,6 +14195,7 @@ \chapter{Error Codes}
 266  \> \ct{REAC ... FUEL ... is not a predefined or tracked species.} \> Section~\ref{info:simple_chemistry}  \\
 267  \> \ct{REAC ... has no consumed species.} \> Section~\ref{info:REAC_Diagnostics}  \\
 268  \> \ct{BACK tracked species ... not found.} \> Section~\ref{info:BACK}  \\
+269  \> \ct{MATL ... The specified pyrolysis parameters result in A >...} \> Section~\ref{info:kinetic_parameters}  \\
      \>                                                                               \>                                     \\
 299  \> \ct{SURF ... has no solid or particle for TGA.} \> Section~\ref{info:TGA_DSC_MCC} \\
 300  \> \ct{N_LAYER_CELLS_MAX should be at least ... for ...} \> Section~\ref{info:solid_phase_stability} \\

Source/dump.f90

@@ -1409,7 +1409,7 @@ SUBROUTINE INITIALIZE_MESH_DUMPS(NM)
             IF (ABS(OB%Z2-M%ZS)<TWO_EPSILON_EB) IOR =  3
             IF (IOR==0) CYCLE OBST_LOOP
             M%N_PATCH = M%N_PATCH + 1
-            IF (M%N_PATCH>SIZE(M%PATCH)) CALL REALLOCATE_PATCH(NM,SIZE(M%PATCH),SIZE(M%PATCH)+10)
+            IF (M%N_PATCH>SIZE(M%PATCH)) CALL REALLOCATE_PATCH(NM,SIZE(M%PATCH),SIZE(M%PATCH)+10,'PATCH')
             PA => M%PATCH(M%N_PATCH)
             PA%I1 = MIN(M%IBAR,MAX(0,NINT( GINV(OB%X1-M%XS,1,NM)*RDXI   ))) ; PA%IG1 = PA%I1+1
             PA%I2 = MIN(M%IBAR,MAX(0,NINT( GINV(OB%X2-M%XS,1,NM)*RDXI   ))) ; PA%IG2 = PA%I2
@@ -1733,20 +1733,30 @@ END SUBROUTINE WRITE_STL_FILE
 !> \param NM Mesh number
 !> \param N1 Current size of array
 !> \param N2 New size of array
+!> \param PATCH_NAME Character string indicating which PATCH_TYPE variable to reallocate
 
-SUBROUTINE REALLOCATE_PATCH(NM,N1,N2)
+SUBROUTINE REALLOCATE_PATCH(NM,N1,N2,PATCH_NAME)
 
 INTEGER, INTENT(IN) :: N1,N2,NM
 TYPE (PATCH_TYPE), DIMENSION(:), ALLOCATABLE :: PATCH_DUMMY
 TYPE (MESH_TYPE), POINTER :: M
+CHARACTER(*), INTENT(IN) :: PATCH_NAME
 
 M => MESHES(NM)
 
 ALLOCATE(PATCH_DUMMY(1:N2))
-PATCH_DUMMY(1:N1) = M%PATCH(1:N1)
-DEALLOCATE(M%PATCH)
-ALLOCATE(M%PATCH(1:N2))
-M%PATCH(1:N2) = PATCH_DUMMY(1:N2)
+SELECT CASE(PATCH_NAME)
+   CASE('PATCH')
+      PATCH_DUMMY(1:N1) = M%PATCH(1:N1)
+      DEALLOCATE(M%PATCH)
+      ALLOCATE(M%PATCH(1:N2))
+      M%PATCH(1:N2) = PATCH_DUMMY(1:N2)
+   CASE('EXTERIOR_PATCH')
+      PATCH_DUMMY(1:N1) = M%EXTERIOR_PATCH(1:N1)
+      DEALLOCATE(M%EXTERIOR_PATCH)
+      ALLOCATE(M%EXTERIOR_PATCH(1:N2))
+      M%EXTERIOR_PATCH(1:N2) = PATCH_DUMMY(1:N2)
+END SELECT
 DEALLOCATE(PATCH_DUMMY)
 
 END SUBROUTINE REALLOCATE_PATCH
@@ -2784,6 +2794,8 @@ SUBROUTINE DUMMY_VENTS(FI,N1,N2)
       VENT_INDICES(I:ISTP,J:JSTP,FI) = -1
 
       M%N_EXTERIOR_PATCH = M%N_EXTERIOR_PATCH + 1
+      IF (M%N_EXTERIOR_PATCH>SIZE(M%EXTERIOR_PATCH)) &
+         CALL REALLOCATE_PATCH(NM,SIZE(M%EXTERIOR_PATCH),SIZE(M%EXTERIOR_PATCH)+10,'EXTERIOR_PATCH')
       EP => M%EXTERIOR_PATCH(M%N_EXTERIOR_PATCH)
       SELECT CASE(FI)
          CASE (1) ; EP%I1=0      ; EP%I2=0      ; EP%J1=I-1 ; EP%J2=ISTP ; EP%K1=J-1 ; EP%K2=JSTP ; EP%IOR= 1
@@ -2816,7 +2828,7 @@ SUBROUTINE ADD_EXTERIOR_VENTS
       IF (PROCESS(NM)/=MY_RANK) CYCLE
       M => MESHES(NM)
 
-      ALLOCATE(M%EXTERIOR_PATCH(10*(6+N_VENT_TOTAL))) ; M%N_EXTERIOR_PATCH = 0
+      ALLOCATE(M%EXTERIOR_PATCH(10)) ; M%N_EXTERIOR_PATCH = 0 ! The size of EXTERIOR_PATCH will expand if need be.
       ALLOCATE(VENT_INDICES(MAX(M%IBAR,M%JBAR),MAX(M%JBAR,M%KBAR),6)) ; VENT_INDICES = 0
 
       VENT_LOOP: DO N=1,M%N_VENT

Source/read.f90

@@ -7461,6 +7461,12 @@ SUBROUTINE READ_MATL
             PEAK_REACTION_RATE = 2._EB*ML%HEATING_RATE(NR)/ML%PYROLYSIS_RANGE(NR)
          ENDIF
          ML%E(NR) = EXP(1._EB)*PEAK_REACTION_RATE*R0*ML%TMP_REF(NR)**2/ML%HEATING_RATE(NR)
+         ! 0.0001 HUGE_EB is used so the reaction rate is not overflowed when multiplied by RHO.
+         IF (LOG(0.0001_EB*HUGE_EB)*R0*ML%TMP_REF(NR) < ML%E(NR)) THEN
+            WRITE(MESSAGE,'(3A,E10.3)') 'ERROR(269): MATL ',TRIM(ML%ID),' The specified pyrolysis parameters result in A >',&
+               0.0001_EB*HUGE_EB
+            CALL SHUTDOWN(MESSAGE) ; RETURN
+         ENDIF
          ML%A(NR) = EXP(1._EB)*PEAK_REACTION_RATE*EXP(ML%E(NR)/(R0*ML%TMP_REF(NR)))
       ENDIF
 

Utilities/Matlab/FDS_validation_dataplot_inputs.csv

@@ -2532,7 +2532,7 @@ s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_1,Time_1,Exp,k-,0,10000,,5.2,6,-10000,10000,0,SWJTU_Tunnels/Test_I-1_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,5.2,6,-10000,10000,0,Extinction Time; Test I-1,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-1_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-1_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
 d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_2,Time_2,Exp,k-,0,10000,,10,12,-10000,10000,0,SWJTU_Tunnels/Test_I-2_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,10,12,-10000,10000,0,Extinction Time; Test I-2,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-2_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-2_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
 d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_3,Time_3,Exp,k-,0,10000,,16,17,-10000,10000,0,SWJTU_Tunnels/Test_I-3_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,16,17,-10000,10000,0,Extinction Time; Test I-3,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-3_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-3_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
-d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_4,Time_4,Exp,k-,0,10000,,5.2,6,-10000,10000,0,SWJTU_Tunnels/Test_I-4_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,5.2,6,-10000,10000,0,Extinction Time; Test I-4,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-4_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
+d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_4,Time_4,Exp,k-,0,10000,,4.5,6,-10000,10000,0,SWJTU_Tunnels/Test_I-4_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,4.5,6,-10000,10000,0,Extinction Time; Test I-4,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-4_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
 d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_5,Time_5,Exp,k-,0,10000,,10,12,-10000,10000,0,SWJTU_Tunnels/Test_I-5_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,10,12,-10000,10000,0,Extinction Time; Test I-5,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-5_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-5_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
 d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_6,Time_6,Exp,k-,0,10000,,15,17,-10000,10000,0,SWJTU_Tunnels/Test_I-6_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,12,17,-10000,10000,0,Extinction Time; Test I-6,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-6_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-6_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

Utilities/Python/FDS_validation_script.py

@@ -70,6 +70,9 @@
 #                     verbose=True,
 #                     )
 
+# Create table of git statistics for FDS Validation Guide
+
+print("validation_git_stats...");         runpy.run_path("./scripts/validation_git_stats.py", run_name="__main__")
 
 # Special cases