Skip to content

Commit 3270a33

Browse files
rmcdermormcdermo
authored
Merge pull request #15251 from rmcdermo/master
FDS Validation: fix git filenames for SWJTU tunnels
2 parents 659821e + 3e2abd0 commit 3270a33

File tree

2 files changed

+36
-26
lines changed

2 files changed

+36
-26
lines changed

‎Utilities/Matlab/FDS_validation_dataplot_inputs.csv‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2870,19 +2870,19 @@ s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
28702870
d,PR2 FES PA2a,PRISME/PR2_FES_PA2a.csv,1,3,Time,CO2_L4_HAUT|CO2_L4_BAS,Exp (CO2\_L4\_HAUT)|Exp (CO2\_L4\_BAS),k-|r-,0,10000,,0,10000,-10000,10000,0,PRISME/PR2_FES_PA2a_devc.csv,2,3,Time,CO2_L4_HAUT|CO2_L4_BAS,FDS (CO2\_L4\_HAUT)|FDS (CO2\_L4\_BAS),k--|r--,0,10000,,0,10000,-10000,10000,0,Carbon Dioxide,Time (min),Volume Fraction,0,20,60,0,0.025,1,no,0.05 0.90,SouthEast,,1,PRISME/PR2_FES_PA2a_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/PRISME/PR2_FES_PA2a_CO2,Carbon Dioxide Concentration,max,0,PRISME,mo,m,TeX
28712871
d,PR2 FES PA2a,PRISME/PR2_FES_PA2a.csv,1,3,Time,O2_L4_HAUT|O2_L4_BAS,Exp (O2\_L4\_HAUT)|Exp (O2\_L4\_BAS),k-|r-,0,10000,,0,10000,-10000,10000,0.21,PRISME/PR2_FES_PA2a_devc.csv,2,3,Time,O2_L4_HAUT|O2_L4_BAS,FDS (O2\_L4\_HAUT)|FDS (O2\_L4\_BAS),k--|r--,0,10000,,0,10000,-10000,10000,0.21,Oxygen,Time (min),Volume Fraction,0,20,60,0.17,0.22,1,no,0.05 0.90,SouthWest,,1,PRISME/PR2_FES_PA2a_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/PRISME/PR2_FES_PA2a_O2,Oxygen Concentration,max,0,PRISME,mo,m,TeX
28722872
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
2873-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-1 O2 0.2m|I-1 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-1_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-1",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-1_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-1_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2874-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-2 O2 0.2m|I-2 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-2_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-2",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-2_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-2_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2875-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-3 O2 0.2m|I-3 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-3_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-3",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-3_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-3_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2876-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-4 O2 0.2m|I-4 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-4_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-4",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-4_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-4_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2877-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-5 O2 0.2m|I-5 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-5_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-5",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-5_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-5_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2878-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-6 O2 0.2m|I-6 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-6_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-6",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-6_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-6_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2879-
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
2880-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-1 CO2 0.2m|I-1 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-1_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-1",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-1_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-1_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2881-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-2 CO2 0.2m|I-2 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-2_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-2",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-2_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-2_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2882-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-3 CO2 0.2m|I-3 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-3_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-3",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-3_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-3_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2883-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-4 CO2 0.2m|I-4 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-4_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-4",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-4_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-4_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2884-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-5 CO2 0.2m|I-5 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-5_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-5",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-5_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-5_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2885-
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-6 CO2 0.2m|I-6 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-6_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-6",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-6_64_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-6_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2873+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-1 O2 0.2m|I-1 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-1_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-1",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-1_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-1_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2874+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-2 O2 0.2m|I-2 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-2_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-2",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-2_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-2_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2875+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-3 O2 0.2m|I-3 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-3_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-3",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-3_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-3_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2876+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-4 O2 0.2m|I-4 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-4_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-4",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-4_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2877+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-5 O2 0.2m|I-5 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-5_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-5",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-5_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-5_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2878+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-6 O2 0.2m|I-6 O2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0.21,SWJTU_Tunnels/Test_I-6_devc.csv,2,3,Time,X_O2-1|X_O2-2,FDS (X\_O2-1)|FDS (X\_O2-2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test I-6",Time (s),Volume Fraction,0,600,1,0.1,0.25,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-6_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-6_O2,Oxygen Concentration,min,0,SWJTU Tunnels,g^,g,TeX
2879+
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
2880+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-1 CO2 0.2m|I-1 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-1_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-1",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-1_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-1_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2881+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-2 CO2 0.2m|I-2 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-2_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-2",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-2_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-2_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2882+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-3 CO2 0.2m|I-3 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-3_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-3",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-3_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-3_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2883+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-4 CO2 0.2m|I-4 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-4_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-4",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-4_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-4_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2884+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-5 CO2 0.2m|I-5 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-5_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-5",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-5_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-5_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
2885+
d,SWJTU Tunnels,SWJTU_Tunnels/SWJTU_Tunnels_Gases.csv,1,2,Time,I-6 CO2 0.2m|I-6 CO2 5m,Exp (0.2 m)|Exp (5 m),k-|r-,0,10000,,0,10000,-10000,10000,0,SWJTU_Tunnels/Test_I-6_devc.csv,2,3,Time,X_CO2-1|X_CO2-2,FDS (X\_CO2-1)|FDS (X\_CO2-2),k--|r--,0,10000,,0,10000,-10000,10000,0,"CO_2, Test I-6",Time (s),Volume Fraction,0,600,1,0,0.1,1,no,0.05 0.90,NorthEast,,1,SWJTU_Tunnels/Test_I-6_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/SWJTU_Tunnels/Test_I-6_CO2,Carbon Dioxide Concentration,max,0,SWJTU Tunnels,g^,g,TeX
28862886
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
28872887
d,Utiskul Compartment,Utiskul_Compartment/case1.csv,1,3,Time,Adjusted Upper O2|Adjusted Lower O2,Exp (Upper O2)|Exp (Lower O2),k-|r-,0,10000,,0,10000,-10000,10000,0.21,Utiskul_Compartment/hu_1p_devc.csv,2,3,Time,G1|G2,FDS (Upper O2)|FDS (Lower O2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test 1",Time (s),Volume Fraction,0,400,1,0,0.3,1,no,0.05 0.90,Southeast,,1,Utiskul_Compartment/hu_1p_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Utiskul_Compartment/Utiskul_Compartment_Test_1_O2,0,min,0,Utiskul Compartment,ko,k,TeX
28882888
d,Utiskul Compartment,Utiskul_Compartment/case2.csv,1,3,Time,Adjusted Upper O2|Adjusted Lower O2,Exp (Upper O2)|Exp (Lower O2),k-|r-,0,10000,,0,10000,-10000,10000,0.21,Utiskul_Compartment/hu_2p_devc.csv,2,3,Time,G1|G2,FDS (Upper O2)|FDS (Lower O2),k--|r--,0,10000,,0,10000,-10000,10000,0.21,"O_2, Test 2",Time (s),Volume Fraction,0,400,1,0,0.3,1,no,0.05 0.90,Southeast,,1,Utiskul_Compartment/hu_2p_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Utiskul_Compartment/Utiskul_Compartment_Test_2_O2,0,min,0,Utiskul Compartment,ko,k,TeX

‎Utilities/Python/fdsplotlib.py‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -852,10 +852,10 @@ def get_plot_style(style="fds"):
852852

853853
def define_plot_parameters(C, irow):
854854
import numpy as np
855+
import re
855856

856857
class plot_parameters:
857858
def __init__(self):
858-
859859
self.switch_id = C.values[irow,C.columns.get_loc('switch_id')]
860860
self.Dataname = C.values[irow,C.columns.get_loc('Dataname')]
861861
self.VerStr_Filename = C.values[irow,C.columns.get_loc('VerStr_Filename')]
@@ -916,31 +916,41 @@ def __init__(self):
916916
def __repr__(self):
917917
return str(self.__dict__)
918918

919-
# LaTeX specials
920-
specials = {
921-
"&": r"\&", "%": r"\%", "_": r"\_", "#": r"\#",
922-
"$": r"\$", "{": r"\{", "}": r"\}", "^": r"\^{}", "~": r"\~{}",
923-
}
924-
925919
inst = plot_parameters()
926920

927921
latex_fields = {
928922
"Plot_Title", "Ind_Title", "Dep_Title",
929923
"Quantity", "Metric", "Group_Key_Label"
930-
# add any other fields that appear in labels
931924
}
932925

926+
specials = {
927+
"&": r"\&", "%": r"\%", "_": r"\_", "#": r"\#",
928+
"$": r"\$", "{": r"\{", "}": r"\}", "^": r"\^{}", "~": r"\~{}",
929+
}
930+
931+
def sanitize_latex(text: str) -> str:
932+
"""Escape specials outside of $...$ math regions."""
933+
# Split into math and non-math parts
934+
parts = re.split(r"(\$.*?\$)", text)
935+
sanitized = []
936+
for part in parts:
937+
if part.startswith("$") and part.endswith("$"):
938+
sanitized.append(part) # leave math untouched
939+
else:
940+
s = part
941+
for k, v in specials.items():
942+
s = s.replace(k, v)
943+
sanitized.append(s)
944+
return "".join(sanitized)
945+
933946
for attr, val in inst.__dict__.items():
934947
if attr in latex_fields and isinstance(val, str):
935-
s = val.strip()
936-
for k, v in specials.items():
937-
s = s.replace(k, v)
938-
setattr(inst, attr, s)
948+
setattr(inst, attr, sanitize_latex(val.strip()))
939949

940-
# print("DEBUG sanitized:", inst.Plot_Title)
941950
return inst
942951

943952

953+
944954
def matlab_legend_to_matplotlib(position):
945955
"""
946956
Convert a MATLAB legend position string to the corresponding matplotlib location string.

0 commit comments

Comments
 (0)