Merge pull request #15522 from mcgratta/master

FDS Verification Script: Remove print outs and do not use + sign in c…

Author: mcgratta

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -472,7 +472,7 @@ d,mass_heat_wall_device_test_2,Flowfields/mass_heat_wall_device_test_2_git.txt,F
 d,methane_flame,Species/methane_flame_primitive_git.txt,Species/methane_flame_simple_devc.csv,2,3,Time,CO2|H2O|CO,CO2 simple|H2O simple|CO simple * 30,k|r|b,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/methane_flame_lumpedprimitive.csv,2,3,Time,pCO2|pH2O|pCO|lCO2|lH2O|lCO,CO2 primitive|H2O primitive|CO primitive * 30|CO2 lumped|H2O lumped|CO lumped * 30,ko|rs|bd|kx|r+|b*,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species mass (simple v. primitive v. lumped),Time (s),Mass (kg),0,10,1,0,0.05,1,no,0.03 0.90,EastOutside,,1.4,linear,FDS_Verification_Guide/SCRIPT_FIGURES/methane_flame_reac_comp,Relative Error,end_1_1,1.00E-02,Species,mx,m,TeX
 d,methane_flame,Species/methane_flame_primitive_2_git.txt,Species/methane_flame_primitive_2_devc.csv,2,3,Time,pCO2|pH2O,CO2 primitive|H2O primitive,k|r,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/methane_flame_multilumped.csv,2,3,Time,lfCO2|lfH2O|loCO2|loH2O,CO2 lumped fuel|H2O lumped fuel|CO2 lumped oxidizer|H2O lumped oxidizer,ko|rs|bd|kx,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species mass (primitive v. lumped fuel v. lumped oxidizer),Time (s),Mass (kg),0,10,1,0,0.15,1,no,0.03 0.90,EastOutside,,1.4,linear,FDS_Verification_Guide/SCRIPT_FIGURES/methane_flame_lumped_comp,Relative Error,end_1_1,0.01,Species,mx,m,TeX
 d,methane_flame,Species/methane_flame_simple_git.txt,Species/methane_flame_simple_devc.csv,2,3,Time,CO2|H2O|CO,CO2 simple|H2O simple|CO simple * 30,k|r|b,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/methane_flame_simple_2_devc.csv,2,3,Time,CO2|H2O|CO,CO2 simple 2| H2O lumped 2 | CO lumped 2 * 30,ko|rs|bd,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species mass (simple v. simple 2),Time (s),Mass (kg),0,10,1,0,0.05,1,no,0.03 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/methane_flame_simp_comp,Relative Error,end,0.01,Species,mx,m,TeX
-d,multiple_reac_hrrpua,Species/multiple_reac_hrrpua_git.txt,Species/multiple_reac_hrrpua.csv,1,2,Time,CH4|C2H6|C3H8|CHO|H2+C7H8,Ideal CH4|Ideal C2H6|Ideal C3H8|Ideal CHO|Ideal H2+C7H8,ko|ro|bo|mo|go,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/multiple_reac_hrrpua_hrr.csv,2,3,Time,MLR_METHANE|MLR_ETHANE|MLR_PROPANE|MLR_MYFUEL|MLR_MYFUEL2,FDS CH4|FDS C2H6|FDS C3H8|FDS CHO|FDS H2+C7H8,k|r|b|m|g,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species Mass Flux,Time (s),Mass Flux (kg/m²/s),0,5,1,0,0.001,1,no,0.03 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/multiple_reac_hrrpua,Relative Error,end,0.01,Species,yx,y,TeX
+d,multiple_reac_hrrpua,Species/multiple_reac_hrrpua_git.txt,Species/multiple_reac_hrrpua.csv,1,2,Time,CH4|C2H6|C3H8|CHO|H2plusC7H8,Ideal CH4|Ideal C2H6|Ideal C3H8|Ideal CHO|Ideal H2+C7H8,ko|ro|bo|mo|go,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/multiple_reac_hrrpua_hrr.csv,2,3,Time,MLR_METHANE|MLR_ETHANE|MLR_PROPANE|MLR_MYFUEL|MLR_MYFUEL2,FDS CH4|FDS C2H6|FDS C3H8|FDS CHO|FDS H2+C7H8,k|r|b|m|g,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species Mass Flux,Time (s),Mass Flux (kg/m²/s),0,5,1,0,0.001,1,no,0.03 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/multiple_reac_hrrpua,Relative Error,end,0.01,Species,yx,y,TeX
 d,multiple_reac_n_simple,Species/multiple_reac_n_simple_git.txt,Species/multiple_reac_n_simple.csv,1,2,Time,CH4_CO|CH4_H2,Ideal CO|Ideal H2,ko|ro,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/multiple_reac_n_simple_devc.csv,2,3,Time,CH4_CO|CH4_H2,FDS CO|FDS H2,k|r,0,100000,,0,100000,-1.00E+09,1.00E+09,0,CH4 Species Mass,Time (s),Mass (kg),0,0.0001,1,0,0.006,1,no,0.03 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/multiple_reac_n_simple_CH4,Relative Error,end,0.01,Species,yd,y,TeX
 d,multiple_reac_n_simple,Species/multiple_reac_n_simple_git.txt,Species/multiple_reac_n_simple.csv,1,2,Time,C3H8_CO|C3H8_H2O,Ideal CO|Ideal H2O,ko|ro,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/multiple_reac_n_simple_devc.csv,2,3,Time,C3H8_CO|C3H8_H2O,FDS CO|FDS H2O,k|r,0,100000,,0,100000,-1.00E+09,1.00E+09,0,C3H8 Species Mass,Time (s),Mass (kg),0,0.0001,1,0,0.025,1,no,0.03 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/multiple_reac_n_simple_C3H8,Relative Error,end,0.01,Species,ys,y,TeX
 d,multiple_reac_n_simple,Species/multiple_reac_n_simple_git.txt,Species/multiple_reac_n_simple.csv,1,2,Time,C2H6_CO|C2H6_H2,Ideal CO|Ideal H2O,ko|ro,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Species/multiple_reac_n_simple_devc.csv,2,3,Time,C2H6_CO|C2H6_H2,FDS CO|FDS H2,k|r,0,100000,,0,100000,-1.00E+09,1.00E+09,0,C2H6 Species Mass,Time (s),Mass (kg),0,0.0001,1,0,0.035,1,no,0.03 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/multiple_reac_n_simple_C2H6,Relative Error,end,0.01,Species,yd,y,TeX

Utilities/Python/scripts/geom_channel_test.py

@@ -50,9 +50,5 @@ def check_geom_channel():
 
 if __name__ == '__main__':
     """Main execution block"""
-    print("Running geom channel test verification...")
     success = check_geom_channel()
-    if success:
-        print("Geom channel test verification completed successfully!")
-    else:
-        print("Geom channel test verification completed with errors.")
+

Utilities/Python/scripts/geom_positive_errors.py

@@ -65,9 +65,5 @@ def check_positive_errors():
 
 if __name__ == '__main__':
     """Main execution block"""
-    print("Running geometry positive errors verification...")
     success = check_positive_errors()
-    if success:
-        print("Geometry positive errors verification completed successfully!")
-    else:
-        print("Geometry positive errors verification completed with errors.")
+

Utilities/Python/scripts/mass_balance.py

@@ -84,7 +84,6 @@ def plot_mass_balance(chid, title_text):
 if __name__ == '__main__':
     """Main execution block"""
 
-    print("Running mass balance verification plots...")
     error1 = plot_mass_balance('mass_flux_wall_yindex','Primitive Species Mass Balance')
     error2 = plot_mass_balance('mass_flux_wall_zindex','Lumped Species Mass Balance')
-    print("Mass balance verification completed successfully!")
+

Utilities/Python/scripts/mass_balance_gas_volume.py

@@ -77,6 +77,5 @@ def plot_mass_balance(chid, title_text):
 
 if __name__ == '__main__':
     """Main execution block"""
-    print("Running mass balance gas volume verification plot...")
     error = plot_mass_balance('mass_balance_gas_volume', '')
-    print("Mass balance gas volume verification completed successfully!")
+

Utilities/Python/scripts/mass_balance_reac.py

@@ -76,11 +76,10 @@ def plot_mass_balance(chid, title_text, mass_id, devc_id, y_min=None, y_max=None
 
 if __name__ == '__main__':
     """Main execution block"""    
-    print("Running mass balance reac verification plots...")
     error1 = plot_mass_balance('mass_balance_reac', 'Propane Mass Balance', 'PROPANE', 'C3H8',y_min=-0.15,y_max=0.1,ynumticks=6)
     error2 = plot_mass_balance('mass_balance_reac', 'Oxygen Mass Balance', 'OXYGEN', 'O2',y_min=-2,y_max=1.5,ynumticks=8)
     error3 = plot_mass_balance('mass_balance_reac', 'Nitrogen Mass Balance', 'NITROGEN', 'N2',y_min=-6,y_max=4,ynumticks=6)
     error4 = plot_mass_balance('mass_balance_reac', 'Carbon Dioxide Mass Balance', 'CARBON DIOXIDE', 'CO2',y_min=-0.4,y_max=0.4,ynumticks=5)
     error5 = plot_mass_balance('mass_balance_reac', 'Water Vapor Mass Balance', 'WATER VAPOR', 'H2O',y_min=-0.2,y_max=0.2,ynumticks=5)
     error6 = plot_mass_balance('mass_balance_reac', 'Soot Mass Balance', 'SOOT', 'Soot',y_min=-0.002,y_max=0.002,ynumticks=5)
-    print("Mass balance reac verification completed successfully!")
+

Verification/Species/multiple_reac_hrrpua.csv

@@ -1,4 +1,4 @@
-Time,CH4,C2H6,C3H8,CHO,H2+C7H8
+Time,CH4,C2H6,C3H8,CHO,H2plusC7H8
 3,0.0002,0.000194,0.0000485,0.000923,0.000124
 4,0.0002,0.000194,0.0000485,0.000923,0.000124
 5,0.0002,0.000194,0.0000485,0.000923,0.000124