Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
35d573a
FDS User's Guide: further clean and formatting
drjfloyd May 5, 2026
72c9ac2
Merge remote-tracking branch 'firemodels/master' into FireX
cxp484 May 8, 2026
1999a74
FDS Source: Experimental CFT
mcgratta May 8, 2026
37b82e5
Merge pull request #16241 from mcgratta/master
mcgratta May 8, 2026
e4ba3e4
Merge remote-tracking branch 'github/master'
drjfloyd May 8, 2026
a1bea8d
FDS User's Guide: some final edits
drjfloyd May 8, 2026
d77cb04
Merge pull request #16243 from drjfloyd/master
drjfloyd May 8, 2026
6fde9bc
Merge remote-tracking branch 'firemodels/FireX' into FireX
cxp484 May 8, 2026
f473391
FDS Verification: Shorten stairwell case
mcgratta May 8, 2026
5476bbd
Merge pull request #16244 from mcgratta/master
mcgratta May 8, 2026
cf83ebe
FDS Source: reformulate UGENT VARIABLE_CFT
rmcdermo May 8, 2026
84db978
Merge pull request #16245 from rmcdermo/master
rmcdermo May 8, 2026
0fba570
Python: Use linux line endings
mcgratta May 8, 2026
5b25382
Merge pull request #16246 from mcgratta/master
mcgratta May 8, 2026
6379b4d
FDS V&V: Deprecate REAC C H O N
drjfloyd May 9, 2026
89ba7eb
Merge pull request #16248 from drjfloyd/master
drjfloyd May 9, 2026
ea7a364
FDS Source: Fix typo
drjfloyd May 9, 2026
fb53616
Merge pull request #16249 from drjfloyd/master
drjfloyd May 9, 2026
dd3f1b5
FDS User Guide: move SOOT FORMULA example.
drjfloyd May 9, 2026
0e86cf5
Merge pull request #16250 from drjfloyd/master
drjfloyd May 9, 2026
ecd760a
FDS guides: Add definition of RADTMP.
shostikk May 9, 2026
bd4170d
Merge pull request #16251 from shostikk/master
shostikk May 9, 2026
7cc2e47
FDS User Guide: Remove inputs related to McArthur level set model
ericvmueller May 11, 2026
17c2471
Merge pull request #16253 from ericvmueller/master
ericvmueller May 11, 2026
36a4c96
FDS Verification: Reduce T_END for obst_geom
drjfloyd May 11, 2026
22e3100
Merge pull request #16254 from drjfloyd/master
drjfloyd May 11, 2026
d7669dc
Python: fix legend on Heskestand flame height 2 plot
rmcdermo May 11, 2026
8b22e02
Merge pull request #16255 from rmcdermo/master
rmcdermo May 11, 2026
d45a52f
FDS Validation: Use 99th percentile flame height
mcgratta May 11, 2026
1aedc7e
Merge pull request #16256 from mcgratta/master
mcgratta May 11, 2026
1f8d769
FireX: Merge with firemodels/master
cxp484 May 12, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9,555 changes: 4,782 additions & 4,773 deletions Manuals/FDS_User_Guide/FDS_User_Guide.tex

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions Manuals/FDS_User_Guide/smv_objects.tex
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ \subsection{Devices with Variable Properties}

The appearance of Smokeview objects may be modified using data specified with the array of character strings called \ct{SMOKEVIEW_PARAMETERS} on the \ct{PROP} line. For example, the input lines
\begin{lstlisting}
&PROP ID='ballprops', SMOKEVIEW_ID='ball',
SMOKEVIEW_PARAMETERS(1:6)='R=255','G=0','B=0','DX=0.5','DY=0.25','DZ=0.1' /
&PROP ID='ballprops', SMOKEVIEW_ID='ball', SMOKEVIEW_PARAMETERS(1:6)=
'R=255','G=0','B=0','DX=0.5','DY=0.25','DZ=0.1' /
&DEVC XYZ=0.5,0.8,1.5, QUANTITY='TEMPERATURE', PROP_ID='ballprops' /
\end{lstlisting}
create an ellipsoid colored red with $x$, $y$, and $z$ axis diameters of 0.5~m and 0.25~m and 0.1~m, respectively. Note that these parameters are enclosed within single quotes because they are character strings passed to Smokeview.
Expand Down Expand Up @@ -177,8 +177,10 @@ \subsection{Objects that Represent Lagrangian Particles}

Lagrangian particles, like water droplets or small solid particles, are represented in Smokeview as tiny points. However, it is possible to draw Lagrangian particles in other ways, such as those depicted in Table~\ref{tab:devices_dynamic2}. For example, the following lines define particles that represent segments of electrical cables that are 10~cm long with a diameter of 1.24~cm:
\begin{lstlisting}
&PART ID='cables', QUANTITIES(1)='PARTICLE TEMPERATURE', ..., PROP_ID='cable image' /
&PROP ID='cable image', SMOKEVIEW_ID='tube', SMOKEVIEW_PARAMETERS='L=0.1','D=0.0124' /
&PART ID='cables', QUANTITIES(1)='PARTICLE TEMPERATURE', ...,
PROP_ID='cable image' /
&PROP ID='cable image', SMOKEVIEW_ID='tube',
SMOKEVIEW_PARAMETERS='L=0.1','D=0.0124' /
\end{lstlisting}
By default, the cables are colored black, but you can specify your own default color using the parameters \ct{R}, \ct{G}, and \ct{B}. In addition, you can color the particles according to the listed \ct{QUANTITIES} on the \ct{PART} line. Menus in Smokeview allow you to toggle between the various color options.

Expand Down
1 change: 1 addition & 0 deletions Source/cons.f90
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ MODULE GLOBAL_CONSTANTS
LOGICAL :: OUTPUT_CHEM_IT=.FALSE.
LOGICAL :: REAC_SOURCE_CHECK=.FALSE.
LOGICAL :: COMPUTE_ADIABATIC_FLAME_TEMPERATURE=.FALSE. !< Report adiabatic flame temperature per REAC in LU_OUTPUT
LOGICAL :: VARIABLE_CFT=.FALSE. !< Experimental critical flame temp concept

REAL(EB) :: RSUM0 !< Initial specific gas constant, \f$ R \sum_i Z_{i,0}/W_i \f$

Expand Down
16 changes: 11 additions & 5 deletions Source/fire.f90
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ SUBROUTINE COMBUSTION_MODEL(T,DT,ZZ_GET,Q_OUT,MIX_TIME_OUT,CHI_R_OUT,CHEM_SUBIT_
IF (SUPPRESSION .AND. .NOT.EXTINCT) THEN
SELECT CASE(EXTINCT_MOD)
CASE(EXTINCTION_1); CALL EXTINCT_1(EXTINCT,ZZ_0,TMP_IN)
CASE(EXTINCTION_2); CALL EXTINCT_2(EXTINCT,ZZ_0,ZZ_MIXED,TMP_IN)
CASE(EXTINCTION_2); CALL EXTINCT_2(EXTINCT,ZZ_0,ZZ_MIXED,TMP_IN,TAU_MIX)
END SELECT
ENDIF

Expand Down Expand Up @@ -1419,15 +1419,16 @@ END SUBROUTINE EXTINCT_1
!> \param ZZ_IN Array of lumped species mass fractions in the mixed part of the grid cell at the end of the time step
!> \param TMP_IN Initial temperature of the grid cell

SUBROUTINE EXTINCT_2(EXTINCT,ZZ_0,ZZ_IN,TMP_IN)
SUBROUTINE EXTINCT_2(EXTINCT,ZZ_0,ZZ_IN,TMP_IN,TAU_MIX)

USE PHYSICAL_FUNCTIONS, ONLY: GET_ENTHALPY
REAL(EB),INTENT(IN) :: TMP_IN,ZZ_IN(1:N_TRACKED_SPECIES),ZZ_0(1:N_TRACKED_SPECIES)
REAL(EB),INTENT(IN) :: TMP_IN,ZZ_IN(1:N_TRACKED_SPECIES),ZZ_0(1:N_TRACKED_SPECIES),TAU_MIX
LOGICAL, INTENT(INOUT) :: EXTINCT
REAL(EB) :: ZZ_HAT_0(1:N_TRACKED_SPECIES),ZZ_HAT(1:N_TRACKED_SPECIES),H_0,H_CRIT,PHI_TILDE,CFT
REAL(EB) :: ZZ_HAT_0(1:N_TRACKED_SPECIES),ZZ_HAT(1:N_TRACKED_SPECIES),H_0,H_CRIT,PHI_TILDE,CFT,TMP_INF
INTEGER :: NS,NR
REAL(EB) :: SUM_ZZ,SUM_CFT
TYPE(REACTION_TYPE), POINTER :: RN,R1
REAL(EB), PARAMETER :: DELTA_TMP_INF=-425._EB, TMP_EXT_0 = 1700._EB, TAU_CHEM_LOC = 1.45E-3_EB

! Get the weighted average of the critical flame temperature (CFT) based on the relative amounts of fuels of the primary reactions

Expand All @@ -1445,7 +1446,12 @@ SUBROUTINE EXTINCT_2(EXTINCT,ZZ_0,ZZ_IN,TMP_IN)
RETURN
ENDIF

CFT = SUM_CFT/SUM_ZZ
IF (VARIABLE_CFT) THEN
TMP_INF = SUM_CFT/SUM_ZZ + DELTA_TMP_INF
CFT = TMP_INF + (TMP_EXT_0-TMP_INF)*EXP(-SQRT(TAU_MIX/TAU_CHEM_LOC)) ! Experimental mechanism, UGent
ELSE
CFT = SUM_CFT/SUM_ZZ
ENDIF

! Compute the modified cell equivalence ratio

Expand Down
2 changes: 1 addition & 1 deletion Source/hvac.f90
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ SUBROUTINE SET_HVAC_DEFAULTS
AREA = -1._EB
COOLANT_SPECIFIC_HEAT = 4.186_EB
COOLANT_MASS_FLOW = -1.E10_EB
COOLANT_TEMPERATURE = 20._EB
COOLANT_TEMPERATURE = TMPA
DISCHARGE_COEFFICIENT = 1._EB
EFFICIENCY = 1.0_EB
CLEAN_LOSS = 0._EB
Expand Down
7 changes: 6 additions & 1 deletion Source/read.f90
Original file line number Diff line number Diff line change
Expand Up @@ -4636,7 +4636,7 @@ SUBROUTINE READ_COMB
EXTINCTION_MODEL,FINITE_RATE_MIN_TEMP, FIXED_MIX_TIME,FREE_BURN_TEMPERATURE, &
FUEL_ID_FOR_AFT,INITIAL_UNMIXED_FRACTION, MAX_CHEMISTRY_SUBSTEPS, MAX_EQUIV_RATIO, MIN_EQUIV_RATIO, &
N_FIXED_CHEMISTRY_SUBSTEPS, ODE_MIN_ATOL,ODE_REL_ERROR,ODE_SOLVER,SUPPRESSION,TAU_CHEM, &
TAU_FLAME,TURBULENT_FLAME_SPEED,RAMP_ZETA_0,USE_MIXED_ZN_AFT_TMP,ZZ_MIN_GLOBAL
TAU_FLAME,TURBULENT_FLAME_SPEED,RAMP_ZETA_0,USE_MIXED_ZN_AFT_TMP,VARIABLE_CFT,ZZ_MIN_GLOBAL

ODE_SOLVER = 'null'
ODE_REL_ERROR = -1._EB
Expand Down Expand Up @@ -4793,6 +4793,11 @@ SUBROUTINE READ_REAC

RN => REACTION(NR)

IF (C > 0._EB .OR. H > 0._EB .OR. O > 0._EB .OR. H > 0._EB) THEN
WRITE(MESSAGE,'(A)') 'WARNING: Recommend using SPEC to define FUEL chemistry for REAC'
IF (MY_RANK==0) WRITE(LU_ERR,'(A)') TRIM(MESSAGE)
ENDIF

IF ((A > 0._EB .OR. E > 0._EB) .AND. (C>TWENTY_EPSILON_EB .OR. H>TWENTY_EPSILON_EB)) THEN
WRITE(MESSAGE,'(A,I0,A)') 'ERROR(189): REAC ',NR,' cannot use both finite rate REAC and simple chemistry.'
CALL SHUTDOWN(MESSAGE) ; RETURN
Expand Down
12 changes: 6 additions & 6 deletions Utilities/Python/FDS_verification_dataplot_inputs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@ d,geom_particle_cascade_2,Complex_Geometry/geom_particle_cascade_2_git.txt,Compl
f,geom_particle_cascade_2,Complex_Geometry/geom_particle_cascade_2_git.txt,Complex_Geometry/geom_particle_cascade_2.csv,1,2,Time,Mass,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/geom_particle_cascade_2_devc.csv,2,3,Time,m2,Case 2,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Droplet Mass (geom_particle_cascade_2),Time (s),Mass (kg),0,15,1,0,12,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/geom_particle_cascade_2,Relative Error,end,0.01,Sprinklers and Sprays,bs,b,TeX
f,geom_particle_cascade_2,Complex_Geometry/geom_particle_cascade_2_git.txt,Complex_Geometry/geom_particle_cascade_2.csv,1,2,Time,Mass,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/geom_particle_cascade_2_devc.csv,2,3,Time,m3,Case 3,g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Droplet Mass (geom_particle_cascade_2),Time (s),Mass (kg),0,15,1,0,12,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/geom_particle_cascade_2,Relative Error,end,0.01,Sprinklers and Sprays,bs,b,TeX
f,geom_particle_cascade_2,Complex_Geometry/geom_particle_cascade_2_git.txt,Complex_Geometry/geom_particle_cascade_2.csv,1,2,Time,Mass,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/geom_particle_cascade_2_devc.csv,2,3,Time,m4,Case 4,m-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Droplet Mass (geom_particle_cascade_2),Time (s),Mass (kg),0,15,1,0,12,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/geom_particle_cascade_2,Relative Error,end,0.01,Sprinklers and Sprays,bs,b,TeX
d,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,OBST 0°,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_20,OBST 20°,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,120,1,0,80,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_45,OBST 45°,g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,120,1,0,80,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,GEOM_0,GEOM 0°,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,120,1,0,80,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,GEOM_20,GEOM 20°,m-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,120,1,0,80,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,GEOM_45,GEOM 45°,c-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,120,1,0,80,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
d,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,OBST 0°,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_20,OBST 20°,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,100,1,0,60,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_45,OBST 45°,g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,100,1,0,60,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,GEOM_0,GEOM 0°,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,100,1,0,60,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,GEOM_20,GEOM 20°,m-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,100,1,0,60,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
f,obst_geom_sprk,Complex_Geometry/obst_geom_sprk_git.txt,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,OBST_0,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/obst_geom_sprk_devc.csv,2,3,Time,GEOM_45,GEOM 45°,c-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Link Temperature Change (obst_geom_sprk),Time (s),Link Temprature Change (°C),0,100,1,0,60,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_geom_sprk,Relative Error,end,0.15,Sprinklers and Sprays,ms,m,TeX
d,geom_rad,Radiation/geom_rad_git.txt,Radiation/geom_rad_devc.csv,2,3,Time,E_OB,FDS (OBST),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Radiation/geom_rad_devc.csv,2,3,Time,E_GE,FDS (GEOM),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Integrated Heat Flux (geom_rad),Time (s),Integrated Heat Flux (kW),0,2,1,0,40,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/geom_rad_energy,Relative Error,max,0.001,Radiation,kd,k,TeX
d,geom_rad,Radiation/geom_rad_git.txt,Radiation/geom_rad_devc.csv,2,3,Time,HF_OB,FDS (OBST),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Radiation/geom_rad_devc.csv,2,3,Time,HF_GE,FDS (GEOM),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Flux (geom_rad),Time (s),Heat Flux (kW/m²),0,2,1,0,40,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/geom_rad_flux,Relative Error,max,0.001,Radiation,kd,k,TeX
d,geom_rad_2,Radiation/geom_rad_2_git.txt,Radiation/geom_rad_2.csv,1,2,Time,Energy Flow,Exact,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Radiation/geom_rad_2_devc.csv,2,3,Time,E,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Integrated Heat Flux (geom_rad_2),Time (s),Integrated Heat Flux (kW),0,2,1,0,40,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/geom_rad_2_energy,Relative Error,max,0.03,Radiation,kd,k,TeX
Expand Down Expand Up @@ -667,7 +667,7 @@ d,spray_burner,Fires/spray_burner_git.txt,Fires/spray_burner.csv,1,2,Time,HRR,Sp
d,spreading_fire,Controls/spreading_fire_git.txt,Controls/spreading_fire.csv,1,2,Time,HRR,Specified (HRR),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Controls/spreading_fire_hrr.csv,2,3,Time,HRR,FDS (HRR),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Release Rate (spreading_fire),Time (s),Heat Release Rate (kW),0,200,1,0,14000,1,no,0.05 0.90,South,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/spreading_fire_HRR,Relative Error,area,0.05,Fires,kd,k,TeX
d,stack_effect,Atmospheric_Effects/stack_effect_git.txt,Atmospheric_Effects/stack_effect.csv,1,2,Time,Ideal Upper|Ideal Lower,Ideal Upper|Ideal Lower,bo|ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Atmospheric_Effects/stack_effect_devc.csv,2,3,Time,FDS Upper|FDS Lower,FDS Upper|FDS Lower,b-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Leakage Velocity,Time (s),Velocity (m/s),0,100,1,0,5,1,no,0.05 0.90,South,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/stack_effect_v,Relative Error,end,0.05,Atmospheric Effects,kd,k,TeX
d,stack_effect,Atmospheric_Effects/stack_effect_git.txt,Atmospheric_Effects/stack_effect.csv,1,2,Time,Ideal Upper Exterior|Ideal Lower Exterior|Ideal Upper Interior|Ideal Lower Interior,Ideal Upper Exterior|Ideal Lower Exterior|Ideal Upper Interior|Ideal Lower Interior,bo|ko|ro|go,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Atmospheric_Effects/stack_effect_devc.csv,2,3,Time,FDS Upper Exterior|FDS Lower Exterior|FDS Upper Interior|FDS Lower Interior,FDS Upper Exterior|FDS Lower Exterior|FDS Upper Interior|FDS Lower Interior,b-|k-|r-|g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Density,Time (s),Density (kg/m³),0,100,1,0,1.5,1,no,0.05 0.90,South,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/stack_effect_rho,Relative Error,end,0.01,Atmospheric Effects,kd,k,TeX
d,stairwell,Pressure_Solver/stairwell_git.txt,Pressure_Solver/stairwell.csv,1,2,Time,Vdot,Ideal (Vdot),k-,0,100000,,40,50,-1.00E+09,1.00E+09,0,Pressure_Solver/stairwell_devc.csv,2,3,Time,Vdot,FDS (Vdot),k--,0,100000,,40,50,-1.00E+09,1.00E+09,0,stairwell,Time (s),Volume Flow (m³/s),0,50,1,0,1,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/stairwell,Relative Error,mean,0.05,Pressure Solver,kd,k,TeX
d,stairwell,Pressure_Solver/stairwell_git.txt,Pressure_Solver/stairwell.csv,1,2,Time,Vdot,Ideal (Vdot),k-,0,100000,,40,50,-1.00E+09,1.00E+09,0,Pressure_Solver/stairwell_devc.csv,2,3,Time,Vdot,FDS (Vdot),k--,0,100000,,40,50,-1.00E+09,1.00E+09,0,stairwell,Time (s),Volume Flow (m³/s),0,50,1,0,1.5,1,no,0.05 0.90,NorthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/stairwell,Relative Error,mean,0.05,Pressure Solver,kd,k,TeX
d,spyro_cone_demo,Pyrolysis/spyro_cone_demo_git.txt,Pyrolysis/spyro_cone_demo.csv,1,2,Time,25 kW/m2|50 kW/m2|75 kW/m2,Cone 25|Cone 50|Cone 75,k-|r-|g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/spyro_cone_demo_devc.csv,2,3,Time,Q50 to Q25|Q50 to Q50|Q50 to Q75,FDS 50-25|FDS 50-50|FDS 50-75,k--|r--|g--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Spyro Cone Demo,Time (s),HRRPUA (kW/m²),0,1500,1,0,500,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/spyro_cone_demo,N/A,end,0,Pyrolysis,rx,r,TeX
f,spyro_cone_demo,Pyrolysis/spyro_cone_demo_git.txt,Pyrolysis/spyro_cone_demo.csv,1,2,Time,25 kW/m2,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/spyro_cone_demo_devc.csv,2,3,Time,Q25 Q75 to Q50,FDS 25 75-50,b--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Spyro Cone Demo,Time (s),HRRPUA (kW/m²),0,1500,1,0,500,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/spyro_cone_demo,N/A,end,0,Pyrolysis,rx,r,TeX
d,spyro_cone_demo_2,Pyrolysis/spyro_cone_demo_2_git.txt,Pyrolysis/spyro_cone_demo_2.csv,1,2,Time,Exact,Cone,k-,0,100000,,200,400,-1.00E+09,1.00E+09,0,Pyrolysis/spyro_cone_demo_2_devc.csv,2,3,Time,HRRPUA,FDS,r-,0,100000,,200,400,-1.00E+09,1.00E+09,0,Spyro Cone Demo 2,Time (s),HRRPUA (kW/m²),0,600,1,0,500,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/spyro_cone_demo_2,Relative Error,mean,0.01,Pyrolysis,rx,r,TeX
Expand Down
2 changes: 1 addition & 1 deletion Utilities/Python/scripts/Heskestad_Flame_Height_2.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
fdsplotlib.plot_to_fig(x_data=Qstar, y_data=Cetegen, marker_style='b-', figure_handle=fig, data_label='Cetegen')
fdsplotlib.plot_to_fig(x_data=Qstar, y_data=Delichatsios, marker_style='y-', figure_handle=fig, data_label='Delichatsios')
fdsplotlib.plot_to_fig(x_data=Qstar, y_data=np.max(L_99[:, :3], axis=1), marker_style='r--', figure_handle=fig, data_label='Max FDS 99 %')
fdsplotlib.plot_to_fig(x_data=Qstar, y_data=np.min(L_95[:, :3], axis=1), marker_style='b--', figure_handle=fig, data_label='Min FDS 99 %')
fdsplotlib.plot_to_fig(x_data=Qstar, y_data=np.min(L_95[:, :3], axis=1), marker_style='b--', figure_handle=fig, data_label='Min FDS 95 %')

plt.savefig(pltdir + 'Flame_Height2.pdf', format='pdf')

2 changes: 1 addition & 1 deletion Utilities/Python/scripts/fds_timing_stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
resdir = '../../Manuals/FDS_Verification_Guide/SCRIPT_FIGURES/Scatterplots/'
resfile = resdir + 'fds_timing_stats.csv'

with open(resfile, 'w') as f:
with open(resfile, 'w', newline='\n') as f:
f.write('FDS Case,Wall Clock Time (s),CPU Time (s),Number of Cells,Number of Time Steps,Performance Metric (1e-6)\n')

with open(verdir + 'FDS_Cases.sh', 'r') as casefile:
Expand Down
Loading
Loading