Merge pull request #13671 from ericvmueller/master

FDS Verification/Validation: switch metric from HRR to HRR+HRR_OX whe…

Author: ericvmueller

Utilities/Matlab/FDS_validation_dataplot_inputs.csv

@@ -7327,12 +7327,12 @@ d,USFS/Catchpole,USFS_Catchpole/PPMC9G.csv,1,3,Time,Distance,Exp,k-,0,10000,,0,1
 d,USFS/Catchpole,USFS_Catchpole/PPMC9H.csv,1,3,Time,Distance,Exp,k-,0,10000,,0,10000,-10000,10000,0,USFS_Catchpole/PPMC9H_devc.csv,2,3,Time,x,FDS,k--,0,10000,,62,554,-10000,6.5,0,PPMC9H,Time (s),Distance (m),0,923,1,0,8,1,no,0.05 0.90,SouthEast,,1,USFS_Catchpole/PPMC9H_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Catchpole/PPMC9H,Rate of Spread,slope,0,USFS/Catchpole (Pine Needles),g^,g,TeX
 d,USFS/Catchpole,USFS_Catchpole/PPMC9J.csv,1,3,Time,Distance,Exp,k-,0,10000,,0,10000,-10000,10000,0,USFS_Catchpole/PPMC9J_devc.csv,2,3,Time,x,FDS,k--,0,10000,,30,267,-10000,6.5,0,PPMC9J,Time (s),Distance (m),0,444,1,0,8,1,no,0.05 0.90,SouthEast,,1,USFS_Catchpole/PPMC9J_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Catchpole/PPMC9J,Rate of Spread,slope,0,USFS/Catchpole (Pine Needles),g^,g,TeX
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-d,USFS/Corsica,USFS_Corsica/Case_1_0_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_1_0_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 1\_0",Time (s),Heat Release Rate (kW),0,600,1,0,200,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_1_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_1_0_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
-d,USFS/Corsica,USFS_Corsica/Case_2_0_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_2_0_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 2\_0",Time (s),Heat Release Rate (kW),0,600,1,0,200,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_2_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_2_0_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
-d,USFS/Corsica,USFS_Corsica/Case_3_0_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_3_0_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 3\_0",Time (s),Heat Release Rate (kW),0,600,1,0,200,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_3_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_3_0_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
-d,USFS/Corsica,USFS_Corsica/Case_1_20_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_1_20_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 1\_20",Time (s),Heat Release Rate (kW),0,350,1,0,400,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_1_20_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_1_20_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
-d,USFS/Corsica,USFS_Corsica/Case_2_20_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_2_20_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 2\_20",Time (s),Heat Release Rate (kW),0,350,1,0,400,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_2_20_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_2_20_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
-d,USFS/Corsica,USFS_Corsica/Case_3_20_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_3_20_cat_hrr.csv,2,3,Time,HRR,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 3\_20",Time (s),Heat Release Rate (kW),0,350,1,0,400,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_3_20_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_3_20_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
+d,USFS/Corsica,USFS_Corsica/Case_1_0_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_1_0_cat_hrr.csv,2,3,Time,HRR+HRR_OX,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 1\_0",Time (s),Heat Release Rate (kW),0,600,1,0,200,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_1_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_1_0_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
+d,USFS/Corsica,USFS_Corsica/Case_2_0_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_2_0_cat_hrr.csv,2,3,Time,HRR+HRR_OX,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 2\_0",Time (s),Heat Release Rate (kW),0,600,1,0,200,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_2_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_2_0_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
+d,USFS/Corsica,USFS_Corsica/Case_3_0_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_3_0_cat_hrr.csv,2,3,Time,HRR+HRR_OX,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 3\_0",Time (s),Heat Release Rate (kW),0,600,1,0,200,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_3_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_3_0_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
+d,USFS/Corsica,USFS_Corsica/Case_1_20_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_1_20_cat_hrr.csv,2,3,Time,HRR+HRR_OX,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 1\_20",Time (s),Heat Release Rate (kW),0,350,1,0,400,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_1_20_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_1_20_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
+d,USFS/Corsica,USFS_Corsica/Case_2_20_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_2_20_cat_hrr.csv,2,3,Time,HRR+HRR_OX,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 2\_20",Time (s),Heat Release Rate (kW),0,350,1,0,400,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_2_20_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_2_20_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
+d,USFS/Corsica,USFS_Corsica/Case_3_20_hrr.csv,2,3,Time,HRR,Exp (HRR),k-,0,10000,,0,10000,-10000,10000,0,USFS_Corsica/Test_3_20_cat_hrr.csv,2,3,Time,HRR+HRR_OX,FDS (HRR),k--,0,10000,,-1000,10000,-10000,10000,0,"HRR, Test 3\_20",Time (s),Heat Release Rate (kW),0,350,1,0,400,1,no,0.05 0.90,East,,1,USFS_Corsica/Test_3_20_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_3_20_HRR,Heat Release Rate,max,0,USFS/Corsica,m^,none,TeX
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 d,USFS/Corsica,USFS_Corsica/Case_1_0_ros.csv,2,3,Time,Front,Exp (Front),k-,-10000,10000,,-10000,10000,-10000,10000,0,USFS_Corsica/Test_1_0_cat_devc.csv,2,3,Time,x,FDS (x),k--,-1000,10000,,50,250,-10000,10000,0,Fire Front Position (Test\_1\_0),Time (s),Position (m),0,600,1,0,2,1,no,0.05 0.90,SouthEast,,1,USFS_Corsica/Test_1_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_1_0_RoS,Rate of Spread,slope,0,USFS/Corsica,m^,none,TeX
 d,USFS/Corsica,USFS_Corsica/Case_2_0_ros.csv,2,3,Time,Front,Exp (Front),k-,-10000,10000,,-10000,10000,-10000,10000,0,USFS_Corsica/Test_2_0_cat_devc.csv,2,3,Time,x,FDS (x),k--,-1000,10000,,50,250,-10000,10000,0,Fire Front Position (Test\_2\_0),Time (s),Position (m),0,600,1,0,2,1,no,0.05 0.90,SouthEast,,1,USFS_Corsica/Test_2_0_cat_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USFS_Corsica/Test_2_0_RoS,Rate of Spread,slope,0,USFS/Corsica,m^,none,TeX
@@ -7993,4 +7993,4 @@ f,Scaling_Pyrolysis_Mixtures,Scaling_Pyrolysis/RISE_zhpolyolefin_pp-08mm-50.csv,
 f,Scaling_Pyrolysis_Mixtures,Scaling_Pyrolysis/RISE_zhpolyolefin_pp-08mm-75.csv,1,2,Time,HRRPUA,Exp (75 kW/m²),g-,0,100000,,0,100000,-10000,10000,0,Scaling_Pyrolysis/RISE_zhpolyolefin-pp-8_devc.csv,2,3,Time,HRRPUA-CONE_8p40_075,FDS (75 kW/m²),g--,0,100000,,0,100000,-10000,10000,0,Zhpolyolefin| PP 8.4 mm,Time (min),Heat Release Rate (kW/m²),0,25,60,0,490,1,no,0.05 0.90,NorthEast,,1,Scaling_Pyrolysis/RISE_zhpolyolefin-pp-8_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Scaling_Pyrolysis/RISE_zhpolyolefin-pp-8_cone_8p4,Scaling Heat Release Rate Per Unit Area,max,0,Mixtures,vg,g,TeX
 d,Scaling_Pyrolysis_Mixtures,Scaling_Pyrolysis/RISE_rppvc_pef-04mm-35.csv,1,2,Time,HRRPUA,Exp (35 kW/m²),k-,0,100000,,0,100000,-10000,10000,0,Scaling_Pyrolysis/RISE_rppvc-pef-4_devc.csv,2,3,Time,HRRPUA-CONE_4p50_035,FDS (35 kW/m²),k--,0,100000,,0,100000,-10000,10000,0,RPPVC| PEF 4.5 mm,Time (min),Heat Release Rate (kW/m²),0,8,60,0,215,1,no,0.05 0.90,NorthEast,,1,Scaling_Pyrolysis/RISE_rppvc-pef-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Scaling_Pyrolysis/RISE_rppvc-pef-4_cone_4p5,Scaling Heat Release Rate Per Unit Area,max,0,Mixtures,vg,g,TeX
 f,Scaling_Pyrolysis_Mixtures,Scaling_Pyrolysis/RISE_rppvc_pef-04mm-50.csv,1,2,Time,HRRPUA,Exp (50 kW/m²),r-,0,100000,,0,100000,-10000,10000,0,Scaling_Pyrolysis/RISE_rppvc-pef-4_devc.csv,2,3,Time,HRRPUA-CONE_4p50_050,FDS (50 kW/m²),r--,0,100000,,0,100000,-10000,10000,0,RPPVC| PEF 4.5 mm,Time (min),Heat Release Rate (kW/m²),0,8,60,0,215,1,no,0.05 0.90,NorthEast,,1,Scaling_Pyrolysis/RISE_rppvc-pef-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Scaling_Pyrolysis/RISE_rppvc-pef-4_cone_4p5,Scaling Heat Release Rate Per Unit Area,max,0,Mixtures,vg,g,TeX
-f,Scaling_Pyrolysis_Mixtures,Scaling_Pyrolysis/RISE_rppvc_pef-04mm-75.csv,1,2,Time,HRRPUA,Exp (75 kW/m²),g-,0,100000,,0,100000,-10000,10000,0,Scaling_Pyrolysis/RISE_rppvc-pef-4_devc.csv,2,3,Time,HRRPUA-CONE_4p50_075,FDS (75 kW/m²),g--,0,100000,,0,100000,-10000,10000,0,RPPVC| PEF 4.5 mm,Time (min),Heat Release Rate (kW/m²),0,8,60,0,215,1,no,0.05 0.90,NorthEast,,1,Scaling_Pyrolysis/RISE_rppvc-pef-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Scaling_Pyrolysis/RISE_rppvc-pef-4_cone_4p5,Scaling Heat Release Rate Per Unit Area,max,0,Mixtures,vg,g,TeX
+f,Scaling_Pyrolysis_Mixtures,Scaling_Pyrolysis/RISE_rppvc_pef-04mm-75.csv,1,2,Time,HRRPUA,Exp (75 kW/m²),g-,0,100000,,0,100000,-10000,10000,0,Scaling_Pyrolysis/RISE_rppvc-pef-4_devc.csv,2,3,Time,HRRPUA-CONE_4p50_075,FDS (75 kW/m²),g--,0,100000,,0,100000,-10000,10000,0,RPPVC| PEF 4.5 mm,Time (min),Heat Release Rate (kW/m²),0,8,60,0,215,1,no,0.05 0.90,NorthEast,,1,Scaling_Pyrolysis/RISE_rppvc-pef-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Scaling_Pyrolysis/RISE_rppvc-pef-4_cone_4p5,Scaling Heat Release Rate Per Unit Area,max,0,Mixtures,vg,g,TeX

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -73,7 +73,7 @@ f,cascadempi,Sprinklers_and_Sprays/cascadempi_git.txt,Sprinklers_and_Sprays/casc
 f,cascadempi,Sprinklers_and_Sprays/cascadempi_git.txt,Sprinklers_and_Sprays/cascadempi.csv,2,3,Time,Mass,blank,blank,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Sprinklers_and_Sprays/cascadempi_devc.csv,2,3,Time,GEOM-M-water mass,FDS (GEOM 2 Mesh),c-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Accumulated Mass (cascadempi),Time (s),Mass (kg),0,100,1,0,1.2,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/cascadempi,Relative Error,area,0.02,Sprinklers and Sprays,bs,b,TeX
 d,clocks_restart,Restart/clocks_restart_base_case_git.txt,Restart/clocks_restart_base_case_hrr.csv,2,3,Time,HRR,Uninterrupted Case,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Restart/clocks_restart_a_hrr.csv,2,3,Time,HRR,Interrupted Case,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Release Rate (clocks\_restart),Time (s),HRR (kW),0,30,1,0,2.00E+03,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/clocks_restart,Relative Error,mean,0.01,Restart,kd,k,TeX
 d,cell_burn_away,Pyrolysis/cell_burn_away_git.txt,Pyrolysis/cell_burn_away.csv,1,2,Time,m_dot,Ideal,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/cell_burn_away_hrr.csv,2,3,Time,MLR_PROPANE,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Burning Rate (cell\_burn\_away),Time (s),Burning Rate (kg/s),0,110,1,0,2.00E-04,1,no,0.05 0.90,East,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/cell_burn_away,Relative Error,area,0.04,Pyrolysis,kd,k,TeX
-d,char_oxidation_1,WUI/char_oxidation_1_git.txt,WUI/char_oxidation_1.csv,1,2,Time,HR,N/A,k.,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/char_oxidation_1_hrr.csv,2,3,Time,HRR,FDS (HRR),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HRR (char\_oxidation\_1),Time (s),HRR (kW),0,25,1,0,6.00E+02,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/char_oxidation_1_hrr,Relative Error,area,0.03,WUI,kd,k,TeX
+d,char_oxidation_1,WUI/char_oxidation_1_git.txt,WUI/char_oxidation_1.csv,1,2,Time,HR,N/A,k.,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/char_oxidation_1_hrr.csv,2,3,Time,HRR+HRR_OX,FDS (HRR),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,HRR (char\_oxidation\_1),Time (s),HRR (kW),0,25,1,0,6.00E+02,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/char_oxidation_1_hrr,Relative Error,area,0.03,WUI,kd,k,TeX
 d,char_oxidation_1,WUI/char_oxidation_1_git.txt,WUI/char_oxidation_1.csv,1,2,Time,mass,Ash Mass,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/char_oxidation_1_devc.csv,2,3,Time,mass foliage,FDS (mass foliage),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Particle Mass (char\_oxidation\_1),Time (s),Mass (kg),0,25,1,0,8.00E-02,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/char_oxidation_1_mass,Relative Error,end,0.01,WUI,kd,k,TeX
 d,char_oxidation_2,WUI/char_oxidation_2_git.txt,WUI/char_oxidation_2.csv,1,2,Time,Delta e_part|Delta e_gas,Exact (Delta e\_part)|Exact (Delta e\_gas),ko|ro,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/char_oxidation_2_devc.csv,2,3,Time,Delta e_part dry needle|Delta e_gas dry needle,FDS (Delta e\_part)|FDS (Delta e\_gas),k-|r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Energy Balance (char\_oxidation\_2),Time (s),Energy (kJ),0,25,1,-0.25,2.50E-01,1,no,0.05 0.90,East,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/char_oxidation_2_energy,Relative Error,end,0.1,WUI,kd,k,TeX
 d,char_oxidation_2,WUI/char_oxidation_2_git.txt,WUI/char_oxidation_2.csv,1,2,Time,mass fuel gas|mass CO2|mass foliage|mass O2,Exact (fuel)|Exact (CO2)|Exact (Solid)|Exact (O2),ko|ro|go|mo,0,100000,,0,100000,-1.00E+09,1.00E+09,0,WUI/char_oxidation_2_devc.csv,2,3,Time,mass fuel gas dry needle|mass CO2 dry needle|dry needle mass|mass O2 dry needle,FDS (fuel)|FDS (CO2)|FDS (solid)|FDS (O2),k-|r-|g-|m-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Vapor Mass (char\_oxidation\_2),Time (s),Mass (kg),0,25,1,-2.00E-05,5.00E-05,1,no,0.05 0.90,South,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/char_oxidation_2_mass,Relative Error,end,0.01,WUI,kd,k,TeX