Merge remote-tracking branch 'firemodels/master' into FireX

cxp484 · cxp484 · commit 74e3d8e215b7 · 2025-12-08T10:08:18.000-05:00
diff --git a/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex b/Manuals/FDS_Verification_Guide/FDS_Verification_Guide.tex
@@ -6536,7 +6536,7 @@ \subsection{Case 7}
 
 A gas burner lies near the bottom of a 1~m by 1~m by 5~m high vertical channel whose walls are made of a thin sheet of insulated steel. Air at 20~$^\circ$C is forced into the bottom of the channel at 1~m/s. Mono-disperse water droplets with a diameter of $2\,000~\mu$m are introduced via a nozzle in the middle of the channel at a rate of 0.5~L/min, starting at 60~s. The water temperature is 20~\si{\degree C}, and the spray is directed at the walls with an initial velocity of 5~m/s. The water completely evaporates before it drips down to the bottom of the channel. Figure~\ref{water_evaporation_7_plot} displays the energy balance for this case. The heat release rate, \ct{HRR}, of the fire is expected to be 384~kW. The rate at which the water droplets extract energy from the system, \ct{Q_PART}, is expected to be
 \be - \left( 4.189 \; \hbox{\si{kJ/(kg.K)}} \times 80 \; \hbox{K} + 2269 \; \hbox{kJ/kg} \right) \times 0.5/60 \; \hbox{kg/s} = -21.7 \; \hbox{kW} \ee
-The sum of all the terms, \ct{Q_TOTAL}, is expected to be zero. The three other quantities, \ct{Q_COND}, \ct{Q_RADI}, \ct{Q_CONV}, all have plausible values, but there is no way to determine the exact values.
+The sum of all the terms, \ct{Q_TOTAL}, is expected to be zero.
 
 \begin{figure}[h!]
 \centering
diff --git a/Utilities/Python/FDS_validation_dataplot_inputs.csv b/Utilities/Python/FDS_validation_dataplot_inputs.csv
diff --git a/Utilities/Python/FDS_verification_dataplot_inputs.csv b/Utilities/Python/FDS_verification_dataplot_inputs.csv
@@ -767,7 +767,7 @@ f,water_evaporation_5,Sprinklers_and_Sprays/water_evaporation_5_git.txt,../../ex
 d,water_evaporation_6,Sprinklers_and_Sprays/water_evaporation_6_git.txt,Sprinklers_and_Sprays/water_evaporation_6.csv,1,2,Time,T_gas|T_wall,Exact (T_gas)|Exact (T_wall),ko|ro,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_6_devc.csv,2,3,Time,T_gas|T_wall,FDS (T_gas)|FDS (T_wall),k-|r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature (water_evaporation_6),Time (s),Temperature (°C),0,200,1,90,260,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_6_T,Relative Error,end,0.01,Sprinklers and Sprays,bs,b,TeX
 d,water_evaporation_6,Sprinklers_and_Sprays/water_evaporation_6_git.txt,Sprinklers_and_Sprays/water_evaporation_6.csv,1,2,Time,Pressure,Exact (Pressure),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_6_devc.csv,2,3,Time,pres,FDS (pres),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Rise (water_evaporation_6),Time (s),Pressure (kPa),0,200,1,0,40,1000,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_6_P,Relative Error,end,0.015,Sprinklers and Sprays,bs,b,TeX
 d,water_evaporation_6,Sprinklers_and_Sprays/water_evaporation_6a_git.txt,Sprinklers_and_Sprays/water_evaporation_6a.csv,1,2,Time,sum,Exact (sum),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_6a_devc.csv,2,3,Time,u_gas|h_liquid|sum,FDS (u_gas)|FDS (h_liquid)|FDS (sum),r-|b-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Change in Energy (water_evaporation_6a),Time (s),Change in Energy (kJ),0,20,1,-10,10,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_6a,Absolute Error,mean_1_3,0.01,Sprinklers and Sprays,bs,b,TeX
-d,water_evaporation_7,Sprinklers_and_Sprays/water_evaporation_7_git.txt,Sprinklers_and_Sprays/water_evaporation_7.csv,1,2,Time,HRR|Q_TOTAL|Q_PART,Expected (HRR)|Expected (Q_TOTAL)|Expected (Q_PART),ko|go|bo,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_7_hrr.csv,2,3,Time,HRR|Q_COND|Q_TOTAL|Q_PART|Q_RADI|Q_CONV,FDS (HRR)|FDS (Q_COND)|FDS (Q_TOTAL)|FDS (Q_PART)|FDS (Q_RADI)|FDS (Q_CONV),k-|r-|g-|b-|c-|m-,0,100000,,100,200,-1.00E+09,1.00E+09,0,Energy Budget (water_evaporation_7),Time (s),Heat Loss/Gain (kW),0,200,1,-400,600,1,no,0.05 0.90,EastOutside,,1.35,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_7,Relative Error,mean_3_4,0.01,Sprinklers and Sprays,kd,k,TeX
+d,water_evaporation_7,Sprinklers_and_Sprays/water_evaporation_7_git.txt,Sprinklers_and_Sprays/water_evaporation_7.csv,1,2,Time,HRR|Q_TOTAL|Q_PART,Expected (HRR)|Expected (Q_TOTAL)|Expected (Q_PART),ko|go|bo,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_7_hrr.csv,2,3,Time,HRR|Q_TOTAL|Q_PART,FDS (HRR)|FDS (Q_TOTAL)|FDS (Q_PART),k-|g-|b-,0,100000,,100,200,-1.00E+09,1.00E+09,0,Energy Budget (water_evaporation_7),Time (s),Heat Loss/Gain (kW),0,200,1,-400,600,1,no,0.05 0.90,EastOutside,,1.35,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_7,Relative Error,mean,0.01,Sprinklers and Sprays,kd,k,TeX
 d,water_evaporation_8,Sprinklers_and_Sprays/water_evaporation_8_git.txt,Sprinklers_and_Sprays/water_evaporation_8.csv,1,2,Time,z,Measured,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_8_devc.csv,2,3,Time,z_thin,FDS thermally thin,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,(water_evaporation_8),Time (s),Position (m),0,16,1,0.5,4,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_8_z,Absolute Error,end,0.05,Sprinklers and Sprays,kd,k,TeX
 f,water_evaporation_8,Sprinklers_and_Sprays/water_evaporation_8_git.txt,Sprinklers_and_Sprays/water_evaporation_8.csv,1,2,Time,z,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_8_devc.csv,2,3,Time,z_thick,FDS thermally thick,r--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,(water_evaporation_8),Time (s),Position (m),0,16,1,0.5,4,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_8_z,Absolute Error,end,0.05,Sprinklers and Sprays,kd,k,TeX
 d,water_evaporation_8,Sprinklers_and_Sprays/water_evaporation_8_git.txt,Sprinklers_and_Sprays/water_evaporation_8.csv,1,2,Time,d,Measured,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/water_evaporation_8_devc.csv,2,3,Time,D_thin,FDS thermally thin,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,(water_evaporation_8),Time (s),Diameter (µm),0,16,1,0,120,1,no,0.05 0.90,Southwest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/water_evaporation_8_d,Absolute Error,end,5,Sprinklers and Sprays,kd,k,TeX
diff --git a/Utilities/Python/scripts/Memorial_Tunnel.py b/Utilities/Python/scripts/Memorial_Tunnel.py
@@ -340,7 +340,7 @@ def __init__(self):
                              x_min=0, x_max=16, y_min=0, y_max=400,
                              revision_label=version_string,
                              x_label='Number of Fans',
-                             y_label='Volume Flow (m$^3$/s)')
+                             y_label='Volume Flow (m³/s)')
 fdsplotlib.plot_to_fig(x_data=M.data[mod_time_index,0]/300, y_data=M.data[mod_time_index,1], 
                        marker_style='ko-', marker_fill_color='none', data_label='FDS', figure_handle=fig)
 
diff --git a/Utilities/Python/scripts/NIST_NRC_Parallel_Panels.py b/Utilities/Python/scripts/NIST_NRC_Parallel_Panels.py
@@ -83,7 +83,7 @@ def __init__(self):
 fig = fdsplotlib.plot_to_fig(x_data=[-1,-1], y_data=[-1,-1],
                              x_min=0, x_max=150, y_min=0, y_max=250,
                              revision_label=version_string,
-                             x_label='Heat Flux (kW/m$^2$)',
+                             x_label='Heat Flux (kW/m²)',
                              y_label='Height (cm)')
 
 qdot = {}
@@ -136,7 +136,7 @@ def __init__(self):
 fig = fdsplotlib.plot_to_fig(x_data=[-1,-1], y_data=[-1,-1],
                              x_min=0, x_max=80, y_min=0, y_max=180,
                              revision_label=version_string,
-                             x_label='Heat Flux (kW/m$^2$)',
+                             x_label='Heat Flux (kW/m²)',
                              y_label='Height (cm)')
 
 # Plot experimental data
diff --git a/Utilities/Python/scripts/Sandia_Plumes.py b/Utilities/Python/scripts/Sandia_Plumes.py
@@ -70,7 +70,7 @@
                              plot_title='Sandia Methane Pool Fire, Test 17',
                              plot_type='loglog',
                              x_label='Frequency (Hz)',
-                             y_label='Autospectral Density (m$^2$/s)')
+                             y_label='Autospectral Density (m²/s)')
 
 # Find peak frequency
 k_fds = np.where(pave[k-1].real == np.max(pave[k-1].real))[0]
diff --git a/Utilities/Python/scripts/Sandia_Pools.py b/Utilities/Python/scripts/Sandia_Pools.py
@@ -29,8 +29,8 @@
                              plot_origin=(plot_style['Scat_Plot_X'],plot_style['Scat_Plot_Y']),
                              legend_location='upper left',
                              revision_label=version_string,
-                             x_label='Measured Heat Flux (kW/m$^2$)',
-                             y_label='Predicted Heat Flux (kW/m$^2$)'
+                             x_label='Measured Heat Flux (kW/m²)',
+                             y_label='Predicted Heat Flux (kW/m²)'
                              )
 
 for i in range(4):
diff --git a/Utilities/Python/scripts/compression_wave.py b/Utilities/Python/scripts/compression_wave.py
@@ -123,8 +123,7 @@ def clog(real_expr):
                              x_min=0, x_max=12.5, y_min=0, y_max=8,
                              revision_label=version_string,
                              x_label='Time (s)',
-                             y_label=r'Density (kg/m$^3$)',
-                             usetex=True)
+                             y_label='Density (kg/m³)')
 
 fdsplotlib.plot_to_fig(x_data=t_FL4_16, y_data=rho_fds_FL4_16, marker_style='c--', data_label=r'FDS $N=16$', figure_handle=fig)
 fdsplotlib.plot_to_fig(x_data=t_FL4_32, y_data=rho_fds_FL4_32, marker_style='g--', data_label=r'FDS $N=32$', figure_handle=fig)
@@ -146,8 +145,7 @@ def clog(real_expr):
                              plot_type='loglog',
                              revision_label=version_string,
                              x_label='Grid Spacing (m)',
-                             y_label=r'L2 Error (kg/m$^3$)',
-                             usetex=True)
+                             y_label='L2 Error (kg/m³)')
 
 fdsplotlib.plot_to_fig(x_data=h, y_data=0.1*h**2, marker_style='k-', data_label=r'${\cal O}(\delta x^2)$', figure_handle=fig)
 fdsplotlib.plot_to_fig(x_data=h, y_data=e_FL0, marker_style='b*-', data_label='Central', figure_handle=fig)
diff --git a/Utilities/Python/scripts/fan_curve.py b/Utilities/Python/scripts/fan_curve.py
@@ -30,7 +30,7 @@
 
 fig = fdsplotlib.plot_to_fig(x_data=[vdot1,vdot1], y_data=[-1000,1000], marker_style='r-', data_label='constant volume',
                              x_min=-10, x_max=20, y_min=-1000, y_max=1000,
-                             x_label='Volume Flow Rate (m$^3$/s)',
+                             x_label='Volume Flow Rate (m³/s)',
                              y_label='Static Pressure (Pa)')
 
 fdsplotlib.plot_to_fig(x_data=vdot, y_data=dp, marker_style='k-', data_label='quadratic', figure_handle=fig)
diff --git a/Utilities/Python/scripts/plate_view_factor.py b/Utilities/Python/scripts/plate_view_factor.py
@@ -63,7 +63,7 @@
                              revision_label=version_string,
                              plot_title=r'Radiative Heat Flux (plate_view_factor)',
                              x_label='Number of Radiation Angles',
-                             y_label='Heat Flux (kW/m$^2$)')
+                             y_label='Heat Flux (kW/m²)')
 
 fdsplotlib.plot_to_fig(x_data=NRA, y_data=Exact_Flux_2D*np.ones(3), marker_style='r-', figure_handle=fig)
 fdsplotlib.plot_to_fig(x_data=NRA, y_data=Flux_2D                 , marker_style='ro', data_label='FDS 2D', figure_handle=fig)
diff --git a/Utilities/Python/scripts/pulsating.py b/Utilities/Python/scripts/pulsating.py
@@ -118,7 +118,7 @@ def section2_soln(rho0, x, y, B, w, t):
                              x_min=0, x_max=12.5, y_min=0, y_max=2,
                              revision_label=version_string,
                              x_label='Time (s)',
-                             y_label='Density (kg/m$^3$)')
+                             y_label='Density (kg/m³)')
 
 fdsplotlib.plot_to_fig(x_data=t_FL2_16, y_data=rho_fds_FL2_16, marker_style='c--', data_label='FDS $N=16$', figure_handle=fig)
 fdsplotlib.plot_to_fig(x_data=t_FL2_32, y_data=rho_fds_FL2_32, marker_style='g--', data_label='FDS $N=32$', figure_handle=fig)
@@ -137,7 +137,7 @@ def section2_soln(rho0, x, y, B, w, t):
                              plot_type='loglog',
                              revision_label=version_string,
                              x_label='Grid Spacing (m)',
-                             y_label='L$_2$ Error (kg/m$^3$)')
+                             y_label='L2 Error (kg/m³)')
 
 e_FL2 = np.array([error_FL2_16, error_FL2_32, error_FL2_64, error_FL2_128])
 e_FL4 = np.array([error_FL4_16, error_FL4_32, error_FL4_64, error_FL4_128])
diff --git a/Utilities/Python/scripts/radiating_polygon.py b/Utilities/Python/scripts/radiating_polygon.py
@@ -57,7 +57,7 @@
       revision_label=version_string,x_min=0,x_max=1,y_min=20,y_max=160,
       plot_title = 'Radiative Flux from a Hot Square Plate',
       data_label='Exact',
-      y_label='Radiative Heat Flux (kW/m$^2$)',
+      y_label='Radiative Heat Flux (kW/m²)',
       x_label='Distance from Plate (m)',
       legend_location='lower left')
 
diff --git a/Utilities/Python/scripts/radiation_plane_layer.py b/Utilities/Python/scripts/radiation_plane_layer.py
@@ -28,7 +28,7 @@
     fid.write('\\begin{tabular}{|c|c|c|c|c|c|c|} \\hline\n')
     fid.write('$\\tau$ & $S(\\tau)$ & \\multicolumn{2}{|c|}{FDS (I=20,J=20)} &\n')
     fid.write('\\multicolumn{2}{|c|}{FDS (I=20,J=1)} & FDS (I=150) \\\\ \\cline{3-7}\n')
-    fid.write(' & (kW/m$^2$) & 1 band & 6 bands & 1 band & 6 bands & 1 band \\\\ \\hline\\hline\n')
+    fid.write(' & (kW/m²) & 1 band & 6 bands & 1 band & 6 bands & 1 band \\\\ \\hline\\hline\n')
     
     for i in range(6):
         fid.write(f'{kappa[i]} & {exact[i]:9.4f} & ')
diff --git a/Utilities/Python/scripts/saad_mms_temporal_error.py b/Utilities/Python/scripts/saad_mms_temporal_error.py
@@ -124,7 +124,7 @@
       revision_label=version_string,x_min=-1,x_max=1,y_min=0,y_max=5,
       data_label = 'Initial field',
       x_label='$x$ (m)',
-      y_label='Density (kg/m$^3$')
+      y_label='Density (kg/m³')
 
 fdsplotlib.plot_to_fig(x_data=x, y_data=rho_3, marker_style='r-',
    figure_handle=fig,
@@ -152,7 +152,7 @@
       revision_label=version_string,x_min=-1,x_max=1,y_min=-0.0006,y_max=0.0006,
       data_label = '$\\rho_3$ - $\\rho_2$',
       x_label='$x$ (m)',
-      y_label='Density (kg/m$^3$)')
+      y_label='Density (kg/m³)')
 
 fdsplotlib.plot_to_fig(x_data=x, y_data=rho_2-rho_1, marker_style='r-',
    figure_handle=fig,
@@ -264,7 +264,7 @@
       revision_label=version_string,x_min=-1,x_max=1,y_min=0,y_max=5,
       data_label = 'Initial field',
       x_label='$x$ (m)',
-      y_label='Density (kg/m$^3$')
+      y_label='Density (kg/m³')
 
 fdsplotlib.plot_to_fig(x_data=x, y_data=rho_3, marker_style='r-',
    figure_handle=fig,
@@ -292,7 +292,7 @@
       revision_label=version_string,x_min=-1,x_max=1,y_min=-0.0006,y_max=0.0006,
       data_label = '$\\rho_3$ - $\\rho_2$',
       x_label='$x$ (m)',
-      y_label='Density (kg/m$^3$)')
+      y_label='Density (kg/m³)')
 
 fdsplotlib.plot_to_fig(x_data=x, y_data=rho_2-rho_1, marker_style='r-',
    figure_handle=fig,
diff --git a/Utilities/Python/scripts/tree_shapes.py b/Utilities/Python/scripts/tree_shapes.py
@@ -57,7 +57,7 @@
     data_label='ideal',
     revision_label=version_string,
     plot_title='Initialized bulk density (tree_shapes)',
-    x_label=r'Input volume (m$^3$)',
+    x_label='Input volume (m³)',
     y_label='Tree crown mass (kg)',
     legend_location='lower right',
 )
diff --git a/Utilities/Python/scripts/turb_model.py b/Utilities/Python/scripts/turb_model.py
@@ -154,7 +154,7 @@ def energy_decay(chid, N):
                              x_min=0, x_max=0.7, y_min=0, y_max=0.07,
                              revision_label=version_string,
                              x_label='Time (s)',
-                             y_label='Kinetic Energy (m$^2$/s$^2$)',
+                             y_label='Kinetic Energy (m²/s²)',
                              legend_location='upper right')
 
     if chid == 'csmag_32':
@@ -198,7 +198,7 @@ def plotspec(chid, N):
                                  revision_label=version_string,
                                  plot_type='loglog',
                                  x_label='$k$ (1/m)',
-                                 y_label='$E(k)$ (m$^3$/s$^2$)')
+                                 y_label='$E(k)$ (m³/s²)')
 
     L = 9*2*np.pi/100  # box length (m)
     k0 = 2*np.pi/L
diff --git a/Utilities/Python/scripts/wall_internal_radiation.py b/Utilities/Python/scripts/wall_internal_radiation.py
@@ -21,7 +21,7 @@
         fid.write('\\begin{center}\n')
         fid.write('\\begin{tabular}{|c|c|c|} \\hline\n')
         fid.write('$\\tau$      & $S(\\tau)$   & FDS \\\\\n')
-        fid.write('            & (kW/m$^2$)  & (kW/m$^2$) \\\\ \\hline\\hline\n')
+        fid.write('            & (kW/m²)  & (kW/m²) \\\\ \\hline\\hline\n')
         fid.write(f'0.01        & 2.897       & {-flux[0]:6.3f} \\\\\n')
         fid.write(f'0.1         & 24.94       & {-flux[1]:5.2f} \\\\\n')
         fid.write(f'0.5         & 82.95       & {-flux[2]:5.2f} \\\\\n')
