Merge pull request #15524 from mcgratta/master

FDS Verification: Misc fixes

Author: mcgratta

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -159,8 +159,8 @@ f,duct_flow,Pressure_Solver/duct_flow_uglmat_hypre_git.txt,Pressure_Solver/duct_
 d,duct_flow,Pressure_Solver/duct_flow_git.txt,Pressure_Solver/duct_flow.csv,1,2,Time,Iterations,Ideal (Iterations),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/duct_flow_devc.csv,2,3,Time,iter,FFT IBM (iter),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (duct\_flow),Time (s),Iterations,0,60,1,0,100,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/duct_flow_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
 f,duct_flow,Pressure_Solver/duct_flow_uglmat_git.txt,Pressure_Solver/duct_flow.csv,1,2,Time,Iterations,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/duct_flow_uglmat_devc.csv,2,3,Time,iter,UGLMAT (iter),b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (duct\_flow),Time (s),Iterations,0,60,1,0,100,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/duct_flow_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
 f,duct_flow,Pressure_Solver/duct_flow_uglmat_hypre_git.txt,Pressure_Solver/duct_flow.csv,1,2,Time,Iterations,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/duct_flow_uglmat_hypre_devc.csv,2,3,Time,iter,UGLMAT HYPRE (iter),m-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Iterations (duct\_flow),Time (s),Iterations,0,60,1,0,100,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/duct_flow_iterations,N/A,end,0,Pressure Solver,kd,k,TeX
-d,e_coefficient,Sprinklers_and_Sprays/e_coefficient_git.txt,Sprinklers_and_Sprays/e_coefficient.csv,1,1,Time,HRR,Expected,ko,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/e_coefficient_devc.csv,2,3,Time,HRR_1,FDS,k-,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Heat Release Rate (OBST),Time (s),Heat Release Rate (kW),0,30,1,0,60,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/e_coefficient_obst,Absolute Error,max,3,Sprinklers and Sprays,bs,b,TeX
-d,e_coefficient,Sprinklers_and_Sprays/e_coefficient_git.txt,Sprinklers_and_Sprays/e_coefficient.csv,1,1,Time,HRR,Expected,ko,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/e_coefficient_devc.csv,2,3,Time,HRR_2,FDS,k-,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Heat Release Rate (GEOM),Time (s),Heat Release Rate (kW),0,30,1,0,60,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/e_coefficient_geom,Absolute Error,max,3,Sprinklers and Sprays,bs,b,TeX
+d,e_coefficient,Sprinklers_and_Sprays/e_coefficient_git.txt,Sprinklers_and_Sprays/e_coefficient.csv,1,2,Time,HRR,Expected,ko,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/e_coefficient_devc.csv,2,3,Time,HRR_1,FDS,k-,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Heat Release Rate (OBST),Time (s),Heat Release Rate (kW),0,30,1,0,60,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/e_coefficient_obst,Absolute Error,max,3,Sprinklers and Sprays,bs,b,TeX
+d,e_coefficient,Sprinklers_and_Sprays/e_coefficient_git.txt,Sprinklers_and_Sprays/e_coefficient.csv,1,2,Time,HRR,Expected,ko,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/e_coefficient_devc.csv,2,3,Time,HRR_2,FDS,k-,0,100000,,14.9,15.1,-1.00E+09,1.00E+09,0,Heat Release Rate (GEOM),Time (s),Heat Release Rate (kW),0,30,1,0,60,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/e_coefficient_geom,Absolute Error,max,3,Sprinklers and Sprays,bs,b,TeX
 d,edc_mixing_cvode,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_cat_git.txt,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_soln.csv,1,2,Time,TMP,Cantera,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_cat_cvode_substeps.csv,2,3,Time,TMP,FDS,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,$\zeta_0=1.0$,Time (s),Temperature (°C),0.03,0.05,1,550,3000,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_TMP,Relative Error,end,0.02,Chemistry,b*,b,TeX
 d,edc_mixing_cvode,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_cat_git.txt,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_soln.csv,1,2,Time,OH,Cantera,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_cat_cvode_substeps.csv,2,3,Time,OH,FDS,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,$\zeta_0=1.0$,Time (s),OH Mass Fraction,0.03,0.05,1,0,0.02,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/EDC_OneCFDStep_Methane_grimech30_Zeta1p0_OH,Relative Error,end,0.05,Chemistry,b*,b,TeX
 d,edc_mixing_cvode,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta0p75_cat_git.txt,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta0p75_soln.csv,1,2,Time,TMP,Cantera,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Chemistry/EDC_OneCFDStep_Methane_grimech30_Zeta0p75_cat_cvode_substeps.csv,2,3,Time,TMP,FDS,b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,$\zeta_0=0.75$,Time (s),Temperature (°C),0.03,0.05,1,550,3000,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/EDC_OneCFDStep_Methane_grimech30_Zeta0p75_TMP,Relative Error,end,0.02,Chemistry,b*,b,TeX
@@ -522,7 +522,7 @@ d,obst_activation,Pressure_Solver/obst_activation_ulmat_git.txt,Pressure_Solver/
 f,obst_activation,Pressure_Solver/obst_activation_default_git.txt,Pressure_Solver/obst_activation_exact.csv,1,2,Time,D_max,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/obst_activation_default_devc.csv,2,3,Time,D_max,FDS (FFT),g--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Divergence (obst\_activation),Time (s),Divergence (1/s),0,2,1,1.00E-16,1.00E-13,1,no,0.05 0.90,SouthEast,,1,semilogy,FDS_Verification_Guide/SCRIPT_FIGURES/obst_activation,Absolute Error,max,1.00E-13,Pressure Solver,kd,k,TeX
 d,obst_activation,Pressure_Solver/obst_activation_default_gases_git.txt,Pressure_Solver/obst_activation_default_gases.csv,1,2,Time,T_min|T_max,Lower Bound|Upper Bound,k--|r--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/obst_activation_default_gases_devc.csv,2,3,Time,T_min|T_max,T\_min|T\_max,k-|r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Temperature (obst\_activation\_default\_gases),Time (s),Temperature (°C),0,30,1,19.99,20.01,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/obst_activation_gases,Absolute Error,max,0.005,Pressure Solver,kd,k,TeX
 d,obst_coarse_fine_interface,Pressure_Effects/obst_coarse_fine_interface_git.txt,Pressure_Effects/obst_coarse_fine_interface_exact.csv,1,2,Time,DP,Analytical (DP),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Effects/obst_coarse_fine_interface_devc.csv,2,3,Time,DP,FDS (DP),k--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Background Pressure (obst\_coarse\_fine\_interface),Time (s),Pressure (Pa),0,10,1,-10,10,1,no,0.05 0.90,NorthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/obst_coarse_fine_interface,Absolute Error,end,2,Pressure Effects,kd,k,TeX
-d,opening_ulmat,Pressure_Solver/opening_ulmat_git.txt,Pressure_Solver/opening_pressure_error.csv,1,2,Time,Pressure Tolerance,Ideal (Pressure Tolerance),ko--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/opening_ulmat_devc.csv,2,3,Time,perr-max,FDS (p err max),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Error (opening\_ulmat),Time (s),Pressure Error (Pa),0,10,1,0,1.00E-06,1,no,0.05 0.90,SouthEast,,1,semilogy,FDS_User_Guide/SCRIPT_FIGURES/opening_ulmat,Absolute Error,tolerance,1.00E-10,Pressure Solver,k+,k,TeX
+d,opening_ulmat,Pressure_Solver/opening_ulmat_git.txt,Pressure_Solver/opening_pressure_error.csv,1,2,Time,Pressure Tolerance,Ideal (Pressure Tolerance),ko--,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure_Solver/opening_ulmat_devc.csv,2,3,Time,perr-max,FDS (p err max),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Error (opening\_ulmat),Time (s),Pressure Error (Pa),0,10,1,1.00E-10,1.00E-06,1,no,0.05 0.90,SouthEast,,1,semilogy,FDS_User_Guide/SCRIPT_FIGURES/opening_ulmat,Absolute Error,tolerance,1.00E-10,Pressure Solver,k+,k,TeX
 d,parabolic_profile,Flowfields/parabolic_profile_git.txt,Flowfields/parabolic_profile.csv,1,2,Time,Pressure,Exact (Pressure),ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Flowfields/parabolic_profile_devc.csv,2,3,Time,pres,FDS (pres),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure (parabolic\_profile),Time (s),Pressure (Pa),0,60,1,0,2500,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/parabolic_profile,Relative Error,end,0.01,Pressure Effects,k+,k,TeX
 d,part_attenuation,Radiation/part_attenuation_git.txt,Radiation/part_attenuation_devc.csv,2,3,Time,Ref,Reference,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Radiation/part_attenuation_devc.csv,2,3,Time,Transparent|Water|Fuel|Opaque,Transparent|Water|Fuel|Opaque,k-|k--|r-.|b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Radiation attenuation (part\_attenuation),Time (s),Radiative heat flux (kW/m²),0,2,1,3.9,6,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/part_attenuation,N/A,end,0,Radiation,kd,k,TeX
 d,part_drag_stretched,WUI/part_drag_stretched_git.txt,WUI/part_drag_stretched_devc.csv,2,3,Time,Fx_p,Fx part,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/part_drag_stretched_devc.csv,2,3,Time,Fx_g,Fx gas,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Particle drag (part\_drag\_stretched),Time (s),Drag force (N),0,30,1,-2.00E-02,0.00E+00,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/part_drag_stretched,Relative Error,end,0.03,WUI,kd,k,TeX