Merge pull request #14112 from rmcdermo/master

Python: update plot library

Author: rmcdermo

Utilities/Matlab/FDS_verification_dataplot_inputs.csv

@@ -745,6 +745,7 @@ d,pine_wood_TGA,Pyrolysis/pine_wood_TGA_exp13_3C_cat_git.txt,Pyrolysis/pine_wood
 f,pine_wood_TGA,Pyrolysis/pine_wood_TGA_exp13_3C_cat_git.txt,Pyrolysis/pine_wood_TGA.csv,3,4,Temp,MLR 16,Exp (8.2 % O_2),r^,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/pine_wood_TGA_exp16_3C_cat_tga.csv,2,3,Temp,Total MLR,FDS (8.2 % O_2),r-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,5 K/min (pine\_wood\_TGA\_3C),Temperature (°C),Normalized Mass Loss Rate (1/s),200,550,1,0,2.00E-03,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/pine_wood_TGA_3C_oxygen,Relative Error,max,0.1,pine wood TGA,kd,k,TeX
 f,pine_wood_TGA,Pyrolysis/pine_wood_TGA_exp13_3C_cat_git.txt,Pyrolysis/pine_wood_TGA.csv,3,4,Temp,MLR 17,Exp (4.3 % O_2),b*,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/pine_wood_TGA_exp17_3C_cat_tga.csv,2,3,Temp,Total MLR,FDS (4.3 % O_2),b-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,5 K/min (pine\_wood\_TGA\_3C),Temperature (°C),Normalized Mass Loss Rate (1/s),200,550,1,0,2.00E-03,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/pine_wood_TGA_3C_oxygen,Relative Error,max,0.1,pine wood TGA,kd,k,TeX
 f,pine_wood_TGA,Pyrolysis/pine_wood_TGA_exp13_3C_cat_git.txt,Pyrolysis/pine_wood_TGA.csv,3,4,Temp,MLR 3,Exp (0 % O_2),gs,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/pine_wood_TGA_exp03_3C_cat_tga.csv,2,3,Temp,Total MLR,FDS (0 % O_2),g-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,5 K/min (pine\_wood\_TGA\_3C),Temperature (°C),Normalized Mass Loss Rate (1/s),200,550,1,0,2.00E-03,1,no,0.05 0.90,NorthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/pine_wood_TGA_3C_oxygen,Relative Error,max,0.1,pine wood TGA,kd,k,TeX
+s,pine_wood_TGA,Pyrolysis/pine_wood_TGA_exp04_3C_cat_git.txt,Pyrolysis/Anca-Couce_DSC.csv,2,3,Temp1,DSC1,Exp DSC (N2),gs,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pyrolysis/pine_wood_TGA_exp04_3C_cat_tga.csv,2,3,Temp,DSC,FDS DSC (N2),k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,10 K/min (pine\_wood\_TGA\_3C),Temperature (°C),DSC (W/g),200,450,1,-.2,3,1,no,0.05 0.90,West,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/pine_wood_TGA_3C_DSC,Relative Error,max,0.1,pine wood TGA,kd,k,TeX
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 g,sphere_leak,Complex_Geometry/sphere_leak_git.txt,Complex_Geometry/sphere_leak.csv,1,2,Time,Pressure,Exact,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/sphere_leak_devc.csv,2,3,Time,Pressure,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Pressure Rise (sphere\_leak),Time (s),Pressure (Pa),0,100,1,0,5000,1,no,0.05 0.90,SouthEast,,1,linear,FDS_User_Guide/SCRIPT_FIGURES/sphere_leak,Relative Error,max,0.05,Pressure Effects,k+,k,TeX
 d,sphere_radiate,Complex_Geometry/sphere_radiate_git.txt,Complex_Geometry/sphere_radiate.csv,1,2,Time,HF,Exact,ko,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Complex_Geometry/sphere_radiate_devc.csv,2,3,Time,HF1,FDS,k-,0,100000,,0,100000,-1.00E+09,1.00E+09,0,Heat Flux (sphere\_radiate),Time (s),Heat Flux (kW/m²),0,0.01,1,0,8,1,no,0.05 0.90,SouthEast,,1,linear,FDS_Verification_Guide/SCRIPT_FIGURES/sphere_radiate,Relative Error,max,0.07,Radiation,bs,b,TeX

Utilities/Python/FDS_verification_script.py

@@ -18,13 +18,13 @@
 
 # Run dataplot and scatplot scripts
 
-fdsplotlib.dataplot(config_filename='FDS_verification_dataplot_config.csv',
+fdsplotlib.dataplot(config_filename='../Matlab/FDS_verification_dataplot_inputs.csv',
                     expdir='../../Verification/',
                     cmpdir='../../Verification/',
                     pltdir='../../Manuals/',
                     close_figs=True,
                     verbose=True,
-                    plot_list=['cantera_ignition_delay'])
+                    plot_range=[2])
 
 # Special cases