Merge remote-tracking branch 'github/master'

Author: drjfloyd

Manuals/FDS_User_Guide/FDS_User_Guide.tex

@@ -6888,12 +6888,12 @@ \subsection{Basic Equations}
 
 \begin{figure}[p]
    \begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-      \includegraphics[width=3.2in]{FIGURES/vel_L_-100}  &
-      \includegraphics[width=3.2in]{FIGURES/tmp_L_-100}  \\
-      \includegraphics[width=3.2in]{FIGURES/vel_L_100}  &
-      \includegraphics[width=3.2in]{FIGURES/tmp_L_100}  \\
-      \includegraphics[width=3.2in]{FIGURES/vel_L_-350}  &
-      \includegraphics[width=3.2in]{FIGURES/tmp_L_-350}
+      \includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_vel_L_-100}  &
+      \includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_tmp_L_-100}  \\
+      \includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_vel_L_100}  &
+      \includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_tmp_L_100}  \\
+      \includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_vel_L_-350}  &
+      \includegraphics[width=3.2in]{FIGURES/Monin_Obukhov_tmp_L_-350}
    \end{tabular*}
    \caption[Sample vertical wind and temperature profiles]{Sample vertical wind and temperature profiles.}
    \label{wind_profiles}

…Python/scripts/Monin_Obukhov_Profiles.py …_Guide/FIGURES/Monin_Obukhov_Profiles.pyUtilities/Python/scripts/Monin_Obukhov_Profiles.py renamed to Manuals/FDS_User_Guide/FIGURES/Monin_Obukhov_Profiles.py Utilities/Python/scripts/Monin_Obukhov_Profiles.py renamed to Manuals/FDS_User_Guide/FIGURES/Monin_Obukhov_Profiles.py

@@ -9,8 +9,6 @@
 
 plot_style = fdsplotlib.get_plot_style('fds')
 
-pltdir = '../../Manuals/FDS_User_Guide/FIGURES/'
-
 rho_0 = 1.2
 g = 9.81
 cp = 1005
@@ -66,7 +64,7 @@
     ax1.text(0.05, 0.80, f'$L={L[i]:4.0f}$ m', transform=ax1.transAxes, verticalalignment='top')
     ax1.text(0.05, 0.70, f'$z_0={z_0[i]:5.3f}$ m', transform=ax1.transAxes, verticalalignment='top')
 
-    plt.savefig(pltdir + f'vel_L_{Ls[i]}.pdf', format='pdf')
+    plt.savefig(f'Monin_Obukhov_vel_L_{Ls[i]}.pdf', format='pdf')
     plt.close()
 
     # Figure 2 - Temperature profile
@@ -80,6 +78,6 @@
     ax2.text(0.05, 0.80, f'$L={L[i]:4.0f}$ m', transform=ax2.transAxes, verticalalignment='top')
     ax2.text(0.05, 0.70, f'$z_0={z_0[i]:5.3f}$ m', transform=ax2.transAxes, verticalalignment='top')
 
-    plt.savefig(pltdir + f'tmp_L_{Ls[i]}.pdf', format='pdf')
+    plt.savefig(f'Monin_Obukhov_tmp_L_{Ls[i]}.pdf', format='pdf')
     plt.close()
 

…ls/FDS_User_Guide/FIGURES/tmp_L_-100.pdf …ide/FIGURES/Monin_Obukhov_tmp_L_-100.pdfManuals/FDS_User_Guide/FIGURES/tmp_L_-100.pdf renamed to Manuals/FDS_User_Guide/FIGURES/Monin_Obukhov_tmp_L_-100.pdf Manuals/FDS_User_Guide/FIGURES/tmp_L_-100.pdf renamed to Manuals/FDS_User_Guide/FIGURES/Monin_Obukhov_tmp_L_-100.pdf

@@ -7,8 +7,6 @@
 
 plot_style = fdsplotlib.get_plot_style('fds')
 
-pltdir = '../../Manuals/FDS_User_Guide/FIGURES/'
-
 b = [0, 5, 10, 100, 1000]
 mu = np.array([0, 10, 20]) * np.pi / 180
 mu_str = ['0', '10', '20']
@@ -34,6 +32,6 @@
         ax.invert_yaxis()
         ax.text(45, 0.1, r'$\mu=$' + str(mu[j]*180/np.pi) + r', $\phi_{\rm max}=$' + str(phi_max[k]*180/np.pi) + ' degrees', fontsize=plot_style['Key_Font_Size'])
 
-        plt.savefig(pltdir + 'spray_pattern_mu_' + mu_str[j] + '_phimax_' + phi_str[k] + '.pdf', format='pdf')
+        plt.savefig('spray_pattern_mu_' + mu_str[j] + '_phimax_' + phi_str[k] + '.pdf', format='pdf')
         plt.close()
 

…ls/FDS_User_Guide/FIGURES/tmp_L_-350.pdf …ide/FIGURES/Monin_Obukhov_tmp_L_-350.pdfManuals/FDS_User_Guide/FIGURES/tmp_L_-350.pdf renamed to Manuals/FDS_User_Guide/FIGURES/Monin_Obukhov_tmp_L_-350.pdf Manuals/FDS_User_Guide/FIGURES/tmp_L_-350.pdf renamed to Manuals/FDS_User_Guide/FIGURES/Monin_Obukhov_tmp_L_-350.pdf

@@ -7,7 +7,6 @@
 
 # Scripts to run prior to dataplot
 
-print("catchpole_spread_rates...");       runpy.run_path("./scripts/catchpole_spread_rates.py", run_name="__main__")
 print("NIST_deposition_gauge...");        runpy.run_path("./scripts/NIST_deposition_gauge.py", run_name="__main__")
 print("flame_height...");                 runpy.run_path("./scripts/flame_height.py", run_name="__main__")
 print("NIST_RSE...");                     runpy.run_path("./scripts/NIST_RSE.py", run_name="__main__")
@@ -63,6 +62,7 @@
 # Special cases
 print("Beyler_Hood...");                  runpy.run_path("./scripts/Beyler_Hood.py", run_name="__main__")
 print("BRE_LEMTA_Sprays...");             runpy.run_path("./scripts/BRE_LEMTA_Sprays.py", run_name="__main__")
+print("catchpole_spread_rates...");       runpy.run_path("./scripts/catchpole_spread_rates.py", run_name="__main__")
 print("FHWA_Tunnel...");                  runpy.run_path("./scripts/FHWA_Tunnel.py", run_name="__main__")
 print("FM_FPRF_Datacenter...");           runpy.run_path("./scripts/FM_FPRF_Datacenter.py", run_name="__main__")
 print("Heskestad_Flame_Height_2...");     runpy.run_path("./scripts/Heskestad_Flame_Height_2.py", run_name="__main__")