Skip to content

Commit 311b4ed

Browse files
rmcdermormcdermo
authored
Merge pull request #15232 from rmcdermo/master
Python/Matlab: specials not working, punting until I get them to work
2 parents eec94ea + 4c5d7de commit 311b4ed

File tree

2 files changed

+15
-25
lines changed

2 files changed

+15
-25
lines changed

‎Utilities/Matlab/FDS_validation_dataplot_inputs.csv‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2286,12 +2286,12 @@ d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_4,Time_4,Exp,
22862286
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_5,Time_5,Exp,k-,0,10000,,10,12,-10000,10000,0,SWJTU_Tunnels/Test_I-5_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,10,12,-10000,10000,0,Extinction Time; Test I-5,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-5_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-5_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
22872287
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Extinction.csv,1,2,HRR_6,Time_6,Exp,k-,0,10000,,15,17,-10000,10000,0,SWJTU_Tunnels/Test_I-6_hrr.csv,2,3,HRR,Time,FDS,k--,0,10000,,12,17,-10000,10000,0,Extinction Time; Test I-6,HRR (kW),Time (s),0,20,1,0,800,1,yes,0.05 0.90,East,,1,SWJTU_Tunnels/Test_I-6_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-6_Ext_Time,0,max,0,SWJTU Tunnels,g^,g,TeX
22882288
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
2289-
d,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/CH4_A_Data.csv,1,2,XO2,eta,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/methane_dx_1p25cm.csv,1,2,XO2,eta,FDS 1.25 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Methane",O_2 Volume Fraction,\eta,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/methane_dx_1p25cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/methane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2290-
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/CH4_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/methane_dx_p625cm.csv,1,2,XO2,eta,FDS 0.625 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Methane",O_2 Volume Fraction,\eta,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/methane_dx_p625cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/methane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2291-
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/CH4_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/methane_dx_p3125cm.csv,1,2,XO2,eta,FDS 0.3125 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Methane",O_2 Volume Fraction,\eta,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/methane_dx_p3125cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/methane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2292-
d,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/C3H8_A_Data.csv,1,2,XO2,eta,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/propane_dx_1p25cm.csv,1,2,XO2,eta,FDS 1.25 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Propane",O_2 Volume Fraction,\eta,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/propane_dx_1p25cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/propane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2293-
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/C3H8_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/propane_dx_p625cm.csv,1,2,XO2,eta,FDS 0.625 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Propane",O_2 Volume Fraction,\eta,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/propane_dx_p625cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/propane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2294-
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/C3H8_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/propane_dx_p3125cm.csv,1,2,XO2,eta,FDS 0.3125 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Propane",O_2 Volume Fraction,\eta,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/propane_dx_p3125cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/propane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2289+
d,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/CH4_A_Data.csv,1,2,XO2,eta,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/methane_dx_1p25cm.csv,1,2,XO2,eta,FDS 1.25 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Methane",O_2 Volume Fraction,Combustion Efficiency,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/methane_dx_1p25cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/methane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2290+
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/CH4_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/methane_dx_p625cm.csv,1,2,XO2,eta,FDS 0.625 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Methane",O_2 Volume Fraction,Combustion Efficiency,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/methane_dx_p625cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/methane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2291+
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/CH4_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/methane_dx_p3125cm.csv,1,2,XO2,eta,FDS 0.3125 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Methane",O_2 Volume Fraction,Combustion Efficiency,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/methane_dx_p3125cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/methane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2292+
d,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/C3H8_A_Data.csv,1,2,XO2,eta,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/propane_dx_1p25cm.csv,1,2,XO2,eta,FDS 1.25 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Propane",O_2 Volume Fraction,Combustion Efficiency,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/propane_dx_1p25cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/propane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2293+
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/C3H8_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/propane_dx_p625cm.csv,1,2,XO2,eta,FDS 0.625 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Propane",O_2 Volume Fraction,Combustion Efficiency,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/propane_dx_p625cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/propane_eta,0,max,0,UMD Line Burner,r^,r,TeX
2294+
f,UMD Line Burner,Submodules/macfp-db/Extinction/UMD_Line_Burner/Experimental_Data/C3H8_A_Data.csv,1,2,XO2,eta,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,UMD_Line_Burner/propane_dx_p3125cm.csv,1,2,XO2,eta,FDS 0.3125 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, Propane",O_2 Volume Fraction,Combustion Efficiency,0.1,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,UMD_Line_Burner/propane_dx_p3125cm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/UMD_Line_Burner/propane_eta,0,max,0,UMD Line Burner,r^,r,TeX
22952295
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
22962296
d,USCG/HAI,USCG_HAI/USCG_HAI_HRR.csv,1,2,HRR_1000_C_Gr,Time_1000_C_Gr,"Exp (1 MW, Closed, Grinnell)",k-,0,10000,,100,2000,-10000,10000,0,USCG_HAI/USCG_HAI_1000_kW_Closed_Grinnell_devc.csv,2,3,HRR,Time,"FDS (1 MW, Closed, Grinnell)",k--,0,10000,,500,2000,-10000,10000,0,USCG HAI Extinction Times,HRR (kW),Time (s),0,1500,1,0,600,1,yes,0.05 0.90,East,,1,USCG_HAI/USCG_HAI_1000_kW_Closed_Grinnell_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USCG_HAI/USCG_HAI_HRR_1000_Closed_Grinnell,Extinction Time,max,0,USCG/HAI,m+,m,TeX
22972297
d,USCG/HAI,USCG_HAI/USCG_HAI_HRR.csv,1,2,HRR_1000_N_Gr,Time_1000_N_Gr,"Exp (1 MW, Natural, Grinnell)",k-,0,10000,,100,2000,-10000,10000,0,USCG_HAI/USCG_HAI_1000_kW_Natural_Grinnell_devc.csv,2,3,HRR,Time,"FDS (1 MW, Natural, Grinnell)",k--,0,10000,,500,2000,-10000,10000,0,USCG HAI Extinction Times,HRR (kW),Time (s),0,1500,1,0,600,1,yes,0.05 0.90,East,,1,USCG_HAI/USCG_HAI_1000_kW_Natural_Grinnell_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/USCG_HAI/USCG_HAI_HRR_1000_Natural_Grinnell,Extinction Time,max,0,USCG/HAI,m+,m,TeX

‎Utilities/Python/fdsplotlib.py‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -864,25 +864,15 @@ def __repr__(self):
864864

865865
# --- sanitize string attributes ---
866866
specials = {
867-
"&": r"\&", # escape
868-
"%": r"\%", # escape
869-
"_": r"\_", # escape
870-
"#": r"\#", # escape
871-
"$": r"\$", # escape
872-
"{": r"\{", # escape
873-
"}": r"\}", # escape
874-
"^": r"\^{}", # escape
875-
"~": r"\~{}", # escape
876-
877-
# Matlab "TeX interpreter" to Matplotlib LaTeX
878-
r"\eta": r"$\eta$",
879-
r"\theta": r"$\theta$",
880-
r"\alpha": r"$\alpha$",
881-
r"\beta": r"$\beta$",
882-
r"\mu": r"$\mu$",
883-
r"\nu": r"$\nu$",
884-
r"\rho": r"$\rho$",
885-
# ... add as many as you want
867+
"&": r"\&",
868+
"%": r"\%",
869+
"_": r"\_",
870+
"#": r"\#",
871+
"$": r"\$",
872+
"{": r"\{",
873+
"}": r"\}",
874+
"^": r"\^{}",
875+
"~": r"\~{}",
886876
}
887877

888878
for attr, val in plot_parameters.__dict__.items():

0 commit comments

Comments
 (0)