Merge pull request #15521 from mcgratta/master

FDS Verification script: Remove printout, fix git name

Author: mcgratta

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -364,8 +364,8 @@ d,HVAC_filter,HVAC/HVAC_filter_git.txt,HVAC/HVAC_filter_ideal.csv,1,2,Time,Ideal
 d,HVAC_flow_loss,HVAC/HVAC_flow_loss_git.txt,HVAC/HVAC_flow_loss_ideal.csv,1,2,Time,Ideal 1 m/s|Ideal 2 m/s|Ideal 3 m/s,Ideal 1 m/s|Ideal 2 m/s|Ideal 3 m/s,ro|bo|ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_flow_loss_devc.csv,2,3,Time,FDS 1 m/s duct|FDS 2 m/s duct|FDS 3 m/s duct,FDS 1 m/s|FDS 2 m/s|FDS 3 m/s,r-|b-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Velocities (HVAC\_flow\_loss),Time (s),Velocity (m/s),0,10,1,0,5,1,no,0.40 0.90,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_flow_loss,Relative Error,end,0.02,HVAC,kd,k,TeX
 d,HVAC_leak_exponent,HVAC/HVAC_leak_exponent_git.txt,HVAC/HVAC_leak_exponent.csv,1,2,Time,Ideal 1 |Ideal 2|Ideal 3,Ideal 1 |Ideal 2|Ideal 3,ro|bo|ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_leak_exponent_devc.csv,2,3,Time,L1|L2|L3,FDS 1|FDS 2|FDS 3,r-|b-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Velocities (HVAC\_leak\_exponent),Time (s),Velocity (m/s),0,100,1,-20,0,1,no,0.40 0.90,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_leak_exponent,Relative Error,end,0.01,HVAC,kd,k,TeX
 d,HVAC_leak_exponent_2,HVAC/HVAC_leak_exponent_2_git.txt,HVAC/HVAC_leak_exponent_2.csv,1,2,p (Pa),Vdot (m3/s),Ideal,k-,0,100000,,7.9,8.1,-1.00E+09,1.00E+09,0,HVAC/HVAC_leak_exponent_2_devc.csv,2,3,PRESSURE,Vdot,FDS,ko,0,100000,,7.9,8.1,-1.00E+09,1.00E+09,0,Leakage (HVAC\_leak\_exponent\_2),Pressure Rise (Pa),Volume Flow (m³/s),0,8,1,0,0.12,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_leak_exponent_2,Relative Error,mean,0.01,HVAC,kd,k,TeX
-d,leak_enthalpy,HVAC/HVAC_leak_enthalpy_git.txt,HVAC/leak_enthalpy.csv,1,2,Time,Mass,Ideal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/leak_enthalpy_devc.csv,2,3,Time,TM,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Total Mass (HVAC\_leak\_enthalpy),Time (s),Change in Mass (kg),0,5,1,-0.0001,0.0001,1,no,0.05 0.70,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/leak_enthalpy_mass,Absolute Error,end,1.00E-05,HVAC,kd,k,TeX
-d,leak_enthalpy,HVAC/HVAC_leak_enthalpy_git.txt,HVAC/leak_enthalpy.csv,1,2,Time,Energy,Ideal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/leak_enthalpy_devc.csv,2,3,Time,TE,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Internal Energy (HVAC\_leak\_enthalpy),Time (s),Change in Energy (kJ),0,5,1,0,450,1,no,0.20 0.10,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/leak_enthalpy_energy,Relative Error,end,0.01,HVAC,kd,k,TeX
+d,leak_enthalpy,HVAC/leak_enthalpy_git.txt,HVAC/leak_enthalpy.csv,1,2,Time,Mass,Ideal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/leak_enthalpy_devc.csv,2,3,Time,TM,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Total Mass (HVAC\_leak\_enthalpy),Time (s),Change in Mass (kg),0,5,1,-0.0001,0.0001,1,no,0.05 0.70,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/leak_enthalpy_mass,Absolute Error,end,1.00E-05,HVAC,kd,k,TeX
+d,leak_enthalpy,HVAC/leak_enthalpy_git.txt,HVAC/leak_enthalpy.csv,1,2,Time,Energy,Ideal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/leak_enthalpy_devc.csv,2,3,Time,TE,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Internal Energy (HVAC\_leak\_enthalpy),Time (s),Change in Energy (kJ),0,5,1,0,450,1,no,0.20 0.10,NorthWest,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/leak_enthalpy_energy,Relative Error,end,0.01,HVAC,kd,k,TeX
 d,HVAC_mass_conservation,HVAC/HVAC_mass_conservation_git.txt,HVAC/HVAC_mass_conservation_ideal.csv,1,2,Time,Ideal Species 1|Ideal Total,Ideal Species 1|Ideal Total,ro|ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_mass_conservation_devc.csv,2,3,Time,FDS Species 1|FDS Total,FDS Species 1|FDS Total,r-|k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Total Mass (HVAC\_mass\_conservation),Time (s),Mass (kg),0,10,1,0,1.5,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_mass_conservation_plot,Relative Error,end,0.01,HVAC,ms,m,TeX
 d,HVAC_mass_transport,HVAC/HVAC_mass_transport_git.txt,HVAC/HVAC_mass_transport_ideal.csv,1,2,Time,Ideal Species 1,Ideal Species 1,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_mass_transport_devc.csv,2,3,Time,FDS Species 1,FDS Species 1,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Mass fraction (HVAC\_mass\_transport),Time (s),Mass Fraction,0,20,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_mass_transport,Relative Error,end,0.01,HVAC,kd,k,TeX
 d,HVAC_mass_transport_1,HVAC/HVAC_mass_transport_1_git.txt,HVAC/HVAC_mass_transport_ideal.csv,1,2,Time,Ideal Species 1,Ideal Species 1,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HVAC/HVAC_mass_transport_1_devc.csv,2,3,Time,FDS Species 1,FDS case 1 (1 duct),r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Mass fraction (HVAC\_mass\_transport\_x),Time (s),Mass Fraction,0,20,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/HVAC_mass_transport_x,Relative Error,end,0.01,HVAC,kd,k,TeX
@@ -833,4 +833,4 @@ d,sphere_radiate,Complex_Geometry/sphere_radiate_git.txt,Complex_Geometry/sphere
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 d,rms_cov_corr,Controls/rms_cov_corr_git.txt,Controls/rms_cov_corr.csv,1,2,Time,urms,Analytic,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Controls/rms_cov_corr_devc.csv,2,3,Time,U-RMS,FDS,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,U-RMS (rms\_cov\_cor),Time (s),$u$ rms (m/s),0,1000,1,0.14,0.22,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/rms_cov_corr_rms,Relative Error,end,0.01,rmscovcorr,yd,b,TeX
 d,rms_cov_corr,Controls/rms_cov_corr_git.txt,Controls/rms_cov_corr.csv,1,2,Time,uwcov,Analytic,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Controls/rms_cov_corr_devc.csv,2,3,Time,U-W COV,FDS,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,U-W COV  (rms\_cov\_cor),Time (s),$uw$ covariance (m$^2$/s$^2$),0,1000,1,-0.15,0.15,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/rms_cov_corr_cov,Relative Error,end,0.01,rmscovcorr,yd,b,TeX
-d,rms_cov_corr,Controls/rms_cov_corr_git.txt,Controls/rms_cov_corr.csv,1,2,Time,uwcorr,Analytic,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Controls/rms_cov_corr_devc.csv,2,3,Time,U-W CORR,FDS,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,U-W CORR  (rms\_cov\_cor),Time (s),$uw$ cross correlation,0,1000,1,-1,1,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/rms_cov_corr_corr,Relative Error,end,0.01,rmscovcorr,yd,b,TeX
+d,rms_cov_corr,Controls/rms_cov_corr_git.txt,Controls/rms_cov_corr.csv,1,2,Time,uwcorr,Analytic,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Controls/rms_cov_corr_devc.csv,2,3,Time,U-W CORR,FDS,r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,U-W CORR  (rms\_cov\_cor),Time (s),$uw$ cross correlation,0,1000,1,-1,1,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/rms_cov_corr_corr,Relative Error,end,0.01,rmscovcorr,yd,b,TeX

Utilities/Python/scripts/ashrae_7.py

@@ -77,4 +77,3 @@
    fid.write('\\end{tabular}\n')
    fid.write('\\end{center}\n')
 
-print(f"\n? Successfully generated LaTeX table in {texname}")

Utilities/Python/scripts/burke_schumann.py

@@ -160,7 +160,6 @@
 # Create DataFrame for easy CSV writing with header
 df_expected = pd.DataFrame(burke_expected, columns=header1_expected)
 df_expected.to_csv(base_dir+'burke_schumann_expected.csv', index=False)
-print(f"Written expected data to burke_schumann_expected.csv")
 
 # 2. Write FDS Data
 burke_FDS = np.zeros((len(mix_frac[0, :]), 5)) # 15 rows, 5 columns
@@ -177,4 +176,3 @@
 # Create DataFrame for easy CSV writing with header
 df_FDS = pd.DataFrame(burke_FDS, columns=header1_FDS)
 df_FDS.to_csv(base_dir+'burke_schumann_FDS.csv', index=False)
-print(f"Written FDS data to burke_schumann_FDS.csv")

Utilities/Python/scripts/cat_propane_depo.py

@@ -70,7 +70,6 @@
 D1_final = pd.concat([H1_df, D1]).reset_index(drop=True)
 
 D1_final.to_csv(outdir+'propane_flame_deposition_cat_wall.csv', header=False, index=False)
-print(f"Written condensed phase aerosol data to propane_flame_deposition_cat_wall.csv")
 
 # List of files for gas phase aerosol (mass loss)
 gas_files = [
@@ -132,7 +131,6 @@
 
 # Write to CSV
 D2_final.to_csv(outdir+'propane_flame_deposition_cat_gas.csv', header=False, index=False)
-print(f"Written gas phase aerosol data to propane_flame_deposition_cat_gas.csv")
 
 # Create DataFrame D3
 D3 = pd.DataFrame({
@@ -156,4 +154,3 @@
 
 # Write to CSV
 D3_final.to_csv(outdir+ 'propane_flame_deposition_cat_total.csv', header=False, index=False)
-print(f"Written total aerosol data to propane_flame_deposition_cat_total.csv")

Utilities/Python/scripts/flame_species.py

@@ -49,20 +49,13 @@
 
 header_lp = tuple(h_mf_p.iloc[0,:]) + tuple(h_mf_l.iloc[0,1:])
 
-print(header_lp)
-
 data_combined_lp = pd.concat([mf_p, mf_l.iloc[:, 1:4]], axis=1)
 data_combined_lp.columns = header_lp
 
-print(data_combined_lp)
-
 header_ml =  tuple(h_mf_p_2.iloc[0,:]) +  tuple(h_mf_l_f.iloc[0,1:3]) +  tuple(h_mf_l_o.iloc[0,1:3])
-print(header_ml)
 data_combined_ml = pd.concat([mf_p_2, mf_l_f.iloc[:, 1:3], mf_l_o.iloc[:, 1:3]], axis=1)
 data_combined_ml.columns = header_ml
 
-print(data_combined_ml)
-
 output_file_1 = outdir+'methane_flame_lumpedprimitive.csv'
 
 # The MATLAB script uses a hardcoded units line for the final output.
@@ -76,7 +69,6 @@
 
 # Write to CSV without the pandas index or automatically generated header
 df_out_1.to_csv(output_file_1, header=False, index=False)
-print(f"Successfully wrote combined data to {output_file_1}")
 
 output_file_2 = outdir+'methane_flame_multilumped.csv'
 
@@ -88,4 +80,3 @@
 
 # Write to CSV without the pandas index or automatically generated header
 df_out_2.to_csv(output_file_2, header=False, index=False)
-print(f"Successfully wrote multi-lumped data to {output_file_2}")

Utilities/Python/scripts/ns2d.py

@@ -84,4 +84,3 @@
    for j in range(4):
       fid12.write(f"{dx[j]:8.3f}, {dx[j]**2:8.3f}, {rms[j, 1]:8.4f}\n")
 
-print("Processing complete. Exact solution files and RMS error summary files created.")

Utilities/Python/scripts/rms_cov_corr.py

@@ -59,16 +59,11 @@
 outdata[:,2] = uwcov
 outdata[:,3] = uwcorr
 
-print(header)
-print(outdata)
-
 with open(datadir+'rms_cov_corr.csv','w') as fid:
    fid.write(f"{header}\n")
    string_with_separator = np.array2string(outdata[0,:], separator=', ')[1:-1] # [1:-1] removes brackets
-   print(string_with_separator)
    fid.write(f"{string_with_separator}\n")
    string_with_separator = np.array2string(outdata[1,:], separator=', ')[1:-1] # [1:-1] removes brackets
-   print(string_with_separator)
    fid.write(f"{string_with_separator}\n")
 
 

Utilities/Python/scripts/water_evap_1_const_gamma.py

@@ -126,4 +126,3 @@
     )
     fid.write(line_10)
 
-print(f"Calculation complete. Results written to: {output_filename}")