Merge pull request #15519 from mcgratta/master

FDS Validation scripts: Minor edits

Author: mcgratta

Utilities/Python/scripts/Crown_Fires.py

@@ -1,51 +1,43 @@
-"""
-McGrattan
-10-29-2019
-Crown_Fires.py
 
-Read the Crown_Fires *_cat_devc.csv files and determine the rate of spread based on the time history of front position.
-Write the results to a file that will be plotted via dataplot.m.
-"""
+# Read the Crown_Fires *_cat_devc.csv files and determine the rate of spread based on the time history of front position.
+# Write the results to a file that will be plotted via dataplot.py.
 
 import numpy as np
 import pandas as pd
 import os
 
-# Parameters
 outdir = '../../../out/Crown_Fires/'
 
-# Get only *_cat_devc.csv files (like MATLAB dir)
 file_list = [f for f in os.listdir(outdir) if f.endswith('_cat_devc.csv')]
-file_list.sort()  # optional, to keep consistent ordering with MATLAB
+file_list.sort() 
 
 wind_speed = []
 slope = []
 
 for fname in file_list:
     full_path = os.path.join(outdir, fname)
 
-    # Read CSV (skip 2 header rows like MATLAB importdata)
-    M = pd.read_csv(full_path, skiprows=2)
+    M = pd.read_csv(full_path, skiprows=2, header=None)
     M_data = M.to_numpy()
 
-    # Extract rows satisfying conditions (700<=col2<=900, 30<col1<300)
+    # Extract rows satisfying conditions (700<=x<=900, 30<Time<300)
     indices = np.where(
         (M_data[:, 1] >= 700) &
         (M_data[:, 1] <= 900) &
         (M_data[:, 0] > 30) &
         (M_data[:, 0] < 300)
     )[0]
 
-    # Mean wind speed (col3)
+    # Mean wind speed (U10)
     wind_speed.append(np.mean(M_data[indices, 2]))
 
-    # Polyfit slope for col2 vs col1
+    # Polyfit slope for x vs Time
     p = np.polyfit(M_data[indices, 0], M_data[indices, 1], 1)
     slope.append(p[0])
 
-# Write output file
 with open(os.path.join(outdir, 'ROS.csv'), 'w') as fid:
     fid.write('km/h,m/min\n')
     fid.write('U,ROS\n')
     for u, s in zip(wind_speed, slope):
         fid.write(f'{3.6*u:4.1f},{60*s:6.2f}\n')
+

Utilities/Python/scripts/FHWA_Tunnel.py

@@ -1,4 +1,6 @@
 
+# For each experiment, make a contour plot of the extent of a single temperature contour at each time during the experiment
+
 import numpy as np
 import pandas as pd
 import matplotlib.pyplot as plt
@@ -21,8 +23,6 @@
 single_level = [50]
 setpoint = [10000, 400, 399, 338, 240, 322, 390, 420, 360, 10000, 10000]
 
-# For each experiment, make a contour plot of the extent of a single temperature contour at each time during the experiment
-
 for k in range(11):  # Experiments
 
     fig = fdsplotlib.plot_to_fig(x_data=[5.5,5.5], y_data=[0,15], marker_style='k--',

Utilities/Python/scripts/Heskestad_Flame_Height_2.py

@@ -1,4 +1,6 @@
 
+# Plot results of the Heskestad_Flame_Height cases against various experimental correlations
+
 import numpy as np
 import matplotlib.pyplot as plt
 import pandas as pd