Skip to content

Commit 631678d

Browse files
authored
Merge pull request #15484 from rmcdermo/master
Python: add support for multiple x datasets and flip_axis
2 parents cc21c4b + c8bac96 commit 631678d

File tree

2 files changed

+142
-144
lines changed

2 files changed

+142
-144
lines changed

Utilities/Matlab/FDS_validation_dataplot_inputs.csv

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5563,12 +5563,12 @@ d,NRL/HAI,NRL_HAI/NRL_HAI.csv,1,2,Test 7 Height,Test 7 Flux,Exp (Test 7 Flux),ko
55635563
d,NRL/HAI,NRL_HAI/NRL_HAI.csv,1,2,Test 8 Height,Test 8 Flux,Exp (Test 8 Flux),ko,0,500,,0,500,-10000,10000,0,NRL_HAI/NRL_HAI_8_line.csv,2,3,Tot_Flux-z,Tot_Flux,FDS (Tot\_Flux),k--,0,500,,0,500,-10000,10000,0,"NRL/HAI Wall Fires, Test 8",Height (m),Heat Flux (kW/m²),0,2.4,1,0,100,1,yes,0.3 0.90,SouthWest,,1,NRL_HAI/NRL_HAI_8_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NRL_HAI/NRL_HAI_8_Heat_Flux,Surface Heat Flux,max,0,NRL/HAI,ro,r,TeX
55645564
d,NRL/HAI,NRL_HAI/NRL_HAI.csv,1,2,Test 9 Height,Test 9 Flux,Exp (Test 9 Flux),ko,0,500,,0,500,-10000,10000,0,NRL_HAI/NRL_HAI_9_line.csv,2,3,Tot_Flux-z,Tot_Flux,FDS (Tot\_Flux),k--,0,500,,0,500,-10000,10000,0,"NRL/HAI Wall Fires, Test 9",Height (m),Heat Flux (kW/m²),0,2.4,1,0,150,1,yes,0.3 0.90,SouthWest,,1,NRL_HAI/NRL_HAI_9_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/NRL_HAI/NRL_HAI_9_Heat_Flux,Surface Heat Flux,max,0,NRL/HAI,ro,r,TeX
55655565
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
5566-
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),30 kW Left 3.25 cm|30 kW Left 16.5 cm|30 kW Left 29 cm,Exp (Left 3.25 cm)|Exp (Left 16.5 cm)|Exp (Left 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_30_kW_line.csv,2,3,Height,Left 3|Left 16|Left 29,FDS (Left 3)|FDS (Left 16)|FDS (Left 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 30 kW, Left Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,no,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_30_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_30_kW_Left_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5567-
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),45 kW Left 3.25 cm|45 kW Left 16.5 cm|45 kW Left 29 cm,Exp (Left 3.25 cm)|Exp (Left 16.5 cm)|Exp (Left 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_45_kW_line.csv,2,3,Height,Left 3|Left 16|Left 29,FDS (Left 3)|FDS (Left 16)|FDS (Left 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 45 kW, Left Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,no,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_45_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_45_kW_Left_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5568-
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),60 kW Left 3.25 cm|60 kW Left 16.5 cm|60 kW Left 29 cm,Exp (Left 3.25 cm)|Exp (Left 16.5 cm)|Exp (Left 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_60_kW_line.csv,2,3,Height,Left 3|Left 16|Left 29,FDS (Left 3)|FDS (Left 16)|FDS (Left 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 60 kW, Left Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,no,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_60_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_60_kW_Left_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5569-
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),30 kW Right 3.25 cm|30 kW Right 16.5 cm|30 kW Right 29 cm,Exp (Right 3.25 cm)|Exp (Right 16.5 cm)|Exp (Right 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_30_kW_line.csv,2,3,Height,Right 3|Right 16|Right 29,FDS (Right 3)|FDS (Right 16)|FDS (Right 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 30 kW, Right Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,no,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_30_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_30_kW_Right_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5570-
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),45 kW Right 3.25 cm|45 kW Right 16.5 cm|45 kW Right 29 cm,Exp (Right 3.25 cm)|Exp (Right 16.5 cm)|Exp (Right 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_45_kW_line.csv,2,3,Height,Right 3|Right 16|Right 29,FDS (Right 3)|FDS (Right 16)|FDS (Right 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 45 kW, Right Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,no,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_45_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_45_kW_Right_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5571-
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),60 kW Right 3.25 cm|60 kW Right 16.5 cm|60 kW Right 29 cm,Exp (Right 3.25 cm)|Exp (Right 16.5 cm)|Exp (Right 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_60_kW_line.csv,2,3,Height,Right 3|Right 16|Right 29,FDS (Right 3)|FDS (Right 16)|FDS (Right 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 60 kW, Right Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,no,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_60_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_60_kW_Right_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5566+
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),30 kW Left 3.25 cm|30 kW Left 16.5 cm|30 kW Left 29 cm,Exp (Left 3.25 cm)|Exp (Left 16.5 cm)|Exp (Left 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_30_kW_line.csv,2,3,Height,Left 3|Left 16|Left 29,FDS (Left 3)|FDS (Left 16)|FDS (Left 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 30 kW, Left Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,yes,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_30_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_30_kW_Left_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5567+
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),45 kW Left 3.25 cm|45 kW Left 16.5 cm|45 kW Left 29 cm,Exp (Left 3.25 cm)|Exp (Left 16.5 cm)|Exp (Left 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_45_kW_line.csv,2,3,Height,Left 3|Left 16|Left 29,FDS (Left 3)|FDS (Left 16)|FDS (Left 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 45 kW, Left Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,yes,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_45_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_45_kW_Left_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5568+
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),60 kW Left 3.25 cm|60 kW Left 16.5 cm|60 kW Left 29 cm,Exp (Left 3.25 cm)|Exp (Left 16.5 cm)|Exp (Left 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_60_kW_line.csv,2,3,Height,Left 3|Left 16|Left 29,FDS (Left 3)|FDS (Left 16)|FDS (Left 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 60 kW, Left Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,yes,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_60_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_60_kW_Left_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5569+
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),30 kW Right 3.25 cm|30 kW Right 16.5 cm|30 kW Right 29 cm,Exp (Right 3.25 cm)|Exp (Right 16.5 cm)|Exp (Right 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_30_kW_line.csv,2,3,Height,Right 3|Right 16|Right 29,FDS (Right 3)|FDS (Right 16)|FDS (Right 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 30 kW, Right Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,yes,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_30_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_30_kW_Right_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5570+
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),45 kW Right 3.25 cm|45 kW Right 16.5 cm|45 kW Right 29 cm,Exp (Right 3.25 cm)|Exp (Right 16.5 cm)|Exp (Right 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_45_kW_line.csv,2,3,Height,Right 3|Right 16|Right 29,FDS (Right 3)|FDS (Right 16)|FDS (Right 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 45 kW, Right Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,yes,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_45_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_45_kW_Right_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
5571+
d,Ulster SBI,Ulster_SBI/Heat_Flux_SBI_Ulster.csv,1,2,Height (m),60 kW Right 3.25 cm|60 kW Right 16.5 cm|60 kW Right 29 cm,Exp (Right 3.25 cm)|Exp (Right 16.5 cm)|Exp (Right 29 cm),ko|ro|go,0,500,,0,500,-10000,10000,0,Ulster_SBI/Ulster_SBI_60_kW_line.csv,2,3,Height,Right 3|Right 16|Right 29,FDS (Right 3)|FDS (Right 16)|FDS (Right 29),k-|r-|g-,0,500,,0,500,-10000,10000,0,"Ulster SBI, 60 kW, Right Panel",Height (m),Heat Flux (kW/m²),0,1.5,1,0,80,1,yes,0.3 0.90,,,1,Ulster_SBI/Ulster_SBI_60_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Ulster_SBI/Ulster_SBI_60_kW_Right_Heat_Flux,Surface Heat Flux,max,0,Ulster SBI,g*,g,TeX
55725572
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
55735573
d,FAA Cargo Compartments,FAA_Cargo_Compartments/TestCase1_FAA_EXPDATA.csv,1,3,Time,HF1o|HF2o,Exp (HF1o)|Exp (HF2o),k-|r-,0,10000,,0,10000,-10000,10000,0,FAA_Cargo_Compartments/FAA_B707_Test_1_devc.csv,2,3,Time,QCONVA|QCONVB,FDS (QCONVA)|FDS (QCONVB),k--|r--,0,10000,,0,10000,-10000,10000,0,"Heat Flux, FAA Cargo Compartments Test 1",Time (s),Heat Flux (kW/m²),0,180,1,0,0.5,1,no,0.05 0.90,West,,1,FAA_Cargo_Compartments/FAA_B707_Test_1_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FAA_Cargo_Compartments/FAA_Cargo_Compartments_Test_1_Heat_Flux,Target Heat Flux,max,0,FAA Cargo Compartments,b*,b,TeX
55745574
d,FAA Cargo Compartments,FAA_Cargo_Compartments/TestCase2_FAA_EXPDATA.csv,1,3,Time,HF1o|HF2o,Exp (HF1o)|Exp (HF2o),k-|r-,0,10000,,0,10000,-10000,10000,0,FAA_Cargo_Compartments/FAA_B707_Test_2_devc.csv,2,3,Time,QCONVA|QCONVB,FDS (QCONVA)|FDS (QCONVB),k--|r--,0,10000,,0,10000,-10000,10000,0,"Heat Flux, FAA Cargo Compartments Test 2",Time (s),Heat Flux (kW/m²),0,180,1,0,0.05,1,no,0.05 0.90,West,,1,FAA_Cargo_Compartments/FAA_B707_Test_2_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FAA_Cargo_Compartments/FAA_Cargo_Compartments_Test_2_Heat_Flux,Target Heat Flux,max,0,FAA Cargo Compartments,b*,b,TeX
@@ -5578,7 +5578,7 @@ d,Utiskul Compartment,Utiskul_Compartment/case1.csv,1,3,Time,HF1|HF2|HF3|HF4,Exp
55785578
d,Utiskul Compartment,Utiskul_Compartment/case2.csv,1,3,Time,HF1|HF2|HF3|HF4,Exp (HF1)|Exp (HF2)|Exp (HF3)|Exp (HF4),k-|r-|g-|b-,0,10000,,0,10000,-10000,10000,0,Utiskul_Compartment/hu_2p_devc.csv,2,3,Time,HF1|HF2|HF3|HF4,FDS (HF1)|FDS (HF2)|FDS (HF3)|FDS (HF4),k--|r--|g--|b--,0,10000,,0,10000,-10000,10000,0,"Heat Flux, Test 2",Time (s),Heat Flux (kW/m²),0,400,1,0,100,1,no,0.05 0.90,East,,1,Utiskul_Compartment/hu_2p_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Utiskul_Compartment/Utiskul_Compartment_Test_2_Heat_Flux,0,max,0,Utiskul Compartment,ko,k,TeX
55795579
d,Utiskul Compartment,Utiskul_Compartment/case3.csv,1,3,Time,HF1|HF2|HF3|HF4,Exp (HF1)|Exp (HF2)|Exp (HF3)|Exp (HF4),k-|r-|g-|b-,0,10000,,0,10000,-10000,10000,0,Utiskul_Compartment/hu_3p_devc.csv,2,3,Time,HF1|HF2|HF3|HF4,FDS (HF1)|FDS (HF2)|FDS (HF3)|FDS (HF4),k--|r--|g--|b--,0,10000,,0,10000,-10000,10000,0,"Heat Flux, Test 3",Time (s),Heat Flux (kW/m²),0,400,1,0,100,1,no,0.05 0.90,East,,1,Utiskul_Compartment/hu_3p_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Utiskul_Compartment/Utiskul_Compartment_Test_3_Heat_Flux,0,max,0,Utiskul Compartment,ko,k,TeX
55805580
d,Utiskul Compartment,Utiskul_Compartment/case4.csv,1,3,Time,HF1|HF2|HF3|HF4,Exp (HF1)|Exp (HF2)|Exp (HF3)|Exp (HF4),k-|r-|g-|b-,0,10000,,0,10000,-10000,10000,0,Utiskul_Compartment/hu_4p_devc.csv,2,3,Time,HF1|HF2|HF3|HF4,FDS (HF1)|FDS (HF2)|FDS (HF3)|FDS (HF4),k--|r--|g--|b--,0,10000,,0,10000,-10000,10000,0,"Heat Flux, Test 4",Time (s),Heat Flux (kW/m²),0,100,1,0,40,1,no,0.05 0.90,East,,1,Utiskul_Compartment/hu_4p_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Utiskul_Compartment/Utiskul_Compartment_Test_4_Heat_Flux,0,max,0,Utiskul Compartment,ko,k,TeX
5581-
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TeX
5581+
s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
55825582
d,Fleury Heat Flux,Fleury_Heat_Flux/Fleury_1t1_100_kW.csv,2,3,x distance,f000|f050|f100|f150,Exp (0.0 m)|Exp (0.5 m)|Exp (1.0 m)|Exp (1.5 m),ko|ro|go|co,0,10000,,0,10000,-10000,10000,0,Fleury_Heat_Flux/Fleury_1t1_100_kW_line.csv,2,3,x distance,f000|f050|f100|f150,FDS (0.0 m)|FDS (0.5 m)|FDS (1.0 m)|FDS (1.5 m),k-|r-|g-|c-,0,10000,,0,10000,-10000,10000,0,"Fleury Heat Flux, 100 kW, Front, 1:1 Burner",Distance (m),Heat Flux (kW/m²),0.4,2.1,1,0,10,1,no,0.05 0.90,East,,1,Fleury_Heat_Flux/Fleury_1t1_100_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Fleury_Heat_Flux/Fleury_1t1_100_kW_Front_Heat_Flux,Target Heat Flux,max,0,Fleury Heat Flux,b+,b,TeX
55835583
d,Fleury Heat Flux,Fleury_Heat_Flux/Fleury_1t1_150_kW.csv,2,3,x distance,f000|f050|f100|f150,Exp (0.0 m)|Exp (0.5 m)|Exp (1.0 m)|Exp (1.5 m),ko|ro|go|co,0,10000,,0,10000,-10000,10000,0,Fleury_Heat_Flux/Fleury_1t1_150_kW_line.csv,2,3,x distance,f000|f050|f100|f150,FDS (0.0 m)|FDS (0.5 m)|FDS (1.0 m)|FDS (1.5 m),k-|r-|g-|c-,0,10000,,0,10000,-10000,10000,0,"Fleury Heat Flux, 150 kW, Front, 1:1 Burner",Distance (m),Heat Flux (kW/m²),0.4,2.1,1,0,15,1,no,0.05 0.90,East,,1,Fleury_Heat_Flux/Fleury_1t1_150_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Fleury_Heat_Flux/Fleury_1t1_150_kW_Front_Heat_Flux,Target Heat Flux,max,0,Fleury Heat Flux,b+,b,TeX
55845584
d,Fleury Heat Flux,Fleury_Heat_Flux/Fleury_1t1_200_kW.csv,2,3,x distance,f000|f050|f100|f150,Exp (0.0 m)|Exp (0.5 m)|Exp (1.0 m)|Exp (1.5 m),ko|ro|go|co,0,10000,,0,10000,-10000,10000,0,Fleury_Heat_Flux/Fleury_1t1_200_kW_line.csv,2,3,x distance,f000|f050|f100|f150,FDS (0.0 m)|FDS (0.5 m)|FDS (1.0 m)|FDS (1.5 m),k-|r-|g-|c-,0,10000,,0,10000,-10000,10000,0,"Fleury Heat Flux, 200 kW, Front, 1:1 Burner",Distance (m),Heat Flux (kW/m²),0.4,2.1,1,0,20,1,no,0.05 0.90,East,,1,Fleury_Heat_Flux/Fleury_1t1_200_kW_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/Fleury_Heat_Flux/Fleury_1t1_200_kW_Front_Heat_Flux,Target Heat Flux,max,0,Fleury Heat Flux,b+,b,TeX

0 commit comments

Comments
 (0)