Skip to content

Commit 6059947

Browse files
authored
Merge pull request #15679 from rmcdermo/master
Python: convert exponents to unicode for specialty scripts
2 parents df85abb + b1d69ed commit 6059947

14 files changed

+22
-24
lines changed

Utilities/Python/scripts/Memorial_Tunnel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def __init__(self):
340340
x_min=0, x_max=16, y_min=0, y_max=400,
341341
revision_label=version_string,
342342
x_label='Number of Fans',
343-
y_label='Volume Flow (m$^3$/s)')
343+
y_label='Volume Flow (m³/s)')
344344
fdsplotlib.plot_to_fig(x_data=M.data[mod_time_index,0]/300, y_data=M.data[mod_time_index,1],
345345
marker_style='ko-', marker_fill_color='none', data_label='FDS', figure_handle=fig)
346346

Utilities/Python/scripts/NIST_NRC_Parallel_Panels.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def __init__(self):
8383
fig = fdsplotlib.plot_to_fig(x_data=[-1,-1], y_data=[-1,-1],
8484
x_min=0, x_max=150, y_min=0, y_max=250,
8585
revision_label=version_string,
86-
x_label='Heat Flux (kW/m$^2$)',
86+
x_label='Heat Flux (kW/m²)',
8787
y_label='Height (cm)')
8888

8989
qdot = {}
@@ -136,7 +136,7 @@ def __init__(self):
136136
fig = fdsplotlib.plot_to_fig(x_data=[-1,-1], y_data=[-1,-1],
137137
x_min=0, x_max=80, y_min=0, y_max=180,
138138
revision_label=version_string,
139-
x_label='Heat Flux (kW/m$^2$)',
139+
x_label='Heat Flux (kW/m²)',
140140
y_label='Height (cm)')
141141

142142
# Plot experimental data

Utilities/Python/scripts/Sandia_Plumes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
plot_title='Sandia Methane Pool Fire, Test 17',
7171
plot_type='loglog',
7272
x_label='Frequency (Hz)',
73-
y_label='Autospectral Density (m$^2$/s)')
73+
y_label='Autospectral Density (m²/s)')
7474

7575
# Find peak frequency
7676
k_fds = np.where(pave[k-1].real == np.max(pave[k-1].real))[0]

Utilities/Python/scripts/Sandia_Pools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
plot_origin=(plot_style['Scat_Plot_X'],plot_style['Scat_Plot_Y']),
3030
legend_location='upper left',
3131
revision_label=version_string,
32-
x_label='Measured Heat Flux (kW/m$^2$)',
33-
y_label='Predicted Heat Flux (kW/m$^2$)'
32+
x_label='Measured Heat Flux (kW/m²)',
33+
y_label='Predicted Heat Flux (kW/m²)'
3434
)
3535

3636
for i in range(4):

Utilities/Python/scripts/compression_wave.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ def clog(real_expr):
123123
x_min=0, x_max=12.5, y_min=0, y_max=8,
124124
revision_label=version_string,
125125
x_label='Time (s)',
126-
y_label=r'Density (kg/m$^3$)',
127-
usetex=True)
126+
y_label='Density (kg/m³)')
128127

129128
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)
130129
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):
146145
plot_type='loglog',
147146
revision_label=version_string,
148147
x_label='Grid Spacing (m)',
149-
y_label=r'L2 Error (kg/m$^3$)',
150-
usetex=True)
148+
y_label='L2 Error (kg/m³)')
151149

152150
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)
153151
fdsplotlib.plot_to_fig(x_data=h, y_data=e_FL0, marker_style='b*-', data_label='Central', figure_handle=fig)

Utilities/Python/scripts/fan_curve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
fig = fdsplotlib.plot_to_fig(x_data=[vdot1,vdot1], y_data=[-1000,1000], marker_style='r-', data_label='constant volume',
3232
x_min=-10, x_max=20, y_min=-1000, y_max=1000,
33-
x_label='Volume Flow Rate (m$^3$/s)',
33+
x_label='Volume Flow Rate (m³/s)',
3434
y_label='Static Pressure (Pa)')
3535

3636
fdsplotlib.plot_to_fig(x_data=vdot, y_data=dp, marker_style='k-', data_label='quadratic', figure_handle=fig)

Utilities/Python/scripts/plate_view_factor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
revision_label=version_string,
6464
plot_title=r'Radiative Heat Flux (plate_view_factor)',
6565
x_label='Number of Radiation Angles',
66-
y_label='Heat Flux (kW/m$^2$)')
66+
y_label='Heat Flux (kW/m²)')
6767

6868
fdsplotlib.plot_to_fig(x_data=NRA, y_data=Exact_Flux_2D*np.ones(3), marker_style='r-', figure_handle=fig)
6969
fdsplotlib.plot_to_fig(x_data=NRA, y_data=Flux_2D , marker_style='ro', data_label='FDS 2D', figure_handle=fig)

Utilities/Python/scripts/pulsating.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def section2_soln(rho0, x, y, B, w, t):
118118
x_min=0, x_max=12.5, y_min=0, y_max=2,
119119
revision_label=version_string,
120120
x_label='Time (s)',
121-
y_label='Density (kg/m$^3$)')
121+
y_label='Density (kg/m³)')
122122

123123
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)
124124
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):
137137
plot_type='loglog',
138138
revision_label=version_string,
139139
x_label='Grid Spacing (m)',
140-
y_label='L$_2$ Error (kg/m$^3$)')
140+
y_label='L2 Error (kg/m³)')
141141

142142
e_FL2 = np.array([error_FL2_16, error_FL2_32, error_FL2_64, error_FL2_128])
143143
e_FL4 = np.array([error_FL4_16, error_FL4_32, error_FL4_64, error_FL4_128])

Utilities/Python/scripts/radiating_polygon.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
revision_label=version_string,x_min=0,x_max=1,y_min=20,y_max=160,
5858
plot_title = 'Radiative Flux from a Hot Square Plate',
5959
data_label='Exact',
60-
y_label='Radiative Heat Flux (kW/m$^2$)',
60+
y_label='Radiative Heat Flux (kW/m²)',
6161
x_label='Distance from Plate (m)',
6262
legend_location='lower left')
6363

Utilities/Python/scripts/radiation_plane_layer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
fid.write('\\begin{tabular}{|c|c|c|c|c|c|c|} \\hline\n')
2929
fid.write('$\\tau$ & $S(\\tau)$ & \\multicolumn{2}{|c|}{FDS (I=20,J=20)} &\n')
3030
fid.write('\\multicolumn{2}{|c|}{FDS (I=20,J=1)} & FDS (I=150) \\\\ \\cline{3-7}\n')
31-
fid.write(' & (kW/m$^2$) & 1 band & 6 bands & 1 band & 6 bands & 1 band \\\\ \\hline\\hline\n')
31+
fid.write(' & (kW/m²) & 1 band & 6 bands & 1 band & 6 bands & 1 band \\\\ \\hline\\hline\n')
3232

3333
for i in range(6):
3434
fid.write(f'{kappa[i]} & {exact[i]:9.4f} & ')

0 commit comments

Comments
 (0)