Skip to content

Commit

Permalink
Merge pull request #1462 from rpeacoc/master
Browse files Browse the repository at this point in the history 
V&V: Add Delco Trainer Test 25
  • Loading branch information
@rpeacoc
rpeacoc authored May 5, 2020
2 parents 9e4ec54 + 4d4e6d7 commit e3ab6e6
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ d,s,DelCo Trainers,DelCo_Trainers/Test_23_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (
d,s,DelCo Trainers,DelCo_Trainers/Test_23_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_23_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 23, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_23_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_23_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
d,s,DelCo Trainers,DelCo_Trainers/Test_24_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,32,"HGL Temperature, Test 24, Floor 1",Time (min),Temperature ($^\circ$C),0,20,60,0,400,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_1,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
d,s,DelCo Trainers,DelCo_Trainers/Test_24_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 24, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
s,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 1",Time (min),Temperature ($^\circ$C),0,20,60,0,400,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_1,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
s,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
d,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_1_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 1",Time (min),Temperature ($^\circ$C),0,20,60,0,400,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_1,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
d,s,DelCo Trainers,DelCo_Trainers/Test_25_Floor_2_HGL.csv,1,2,Time,T_upper,Exp (T\_upper),k-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_compartments.csv,1,5,Time,ULT_6,CFAST (ULT\_6),k--,0,10000,,0,10000,32,"HGL Temperature, Test 25, Floor 2",Time (min),Temperature ($^\circ$C),0,20,60,0,200,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_2,HGL Temperature: Natural Ventilation|HGL Temperature,max,0,DelCo Trainers,go,g
s,s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
d,s,FM/NBS,FM_NBS/fm19.csv,1,5,C123,C114,Exp (T\_Upper),k-,0,10000,,180,10000,21.7,FM_NBS/FM19_compartments.csv,1,5,Time,ULT_1,CFAST (ULT\_1),k--,0,10000,,0,10000,21,"HGL Temperature, FM/NBS Test 19",Time (min),Temperature ($^\circ$C),0,10,60,0,400,1,no,"0.05,0.90",SouthEast,,1,FM_NBS/FM19_git.txt,linear,SCRIPT_FIGURES/FM_NBS/FM19_1_HGL_Temp,HGL Temperature: Forced Ventilation|HGL Temperature,max,0,FM/NBS,g^,w
d,s,FM/NBS,FM_NBS/fm19.csv,1,5,C123,C115|C116|C117,Exp (T\_Upper\_Near)|Exp (T\_Upper\_Middle)|Exp (T\_Upper\_Far),k-|r-|g-,0,10000,,180,10000,16.76666667,FM_NBS/FM19_compartments.csv,1,5,Time,ULT_2|ULT_2|ULT_2,CFAST (ULT\_2)|CFAST (ULT\_2)|CFAST (ULT\_2),k--|r--|g--,0,10000,,0,10000,21,"HGL Temperature, FM/NBS Test 19",Time (min),Temperature ($^\circ$C),0,10,60,0,120,1,no,"0.05,0.90",SouthEast,,1,FM_NBS/FM19_git.txt,linear,SCRIPT_FIGURES/FM_NBS/FM19_2_HGL_Temp,HGL Temperature: Forced Ventilation|HGL Temperature,max,0,FM/NBS,g^,w
Expand Down Expand Up @@ -668,8 +668,8 @@ d,,DelCo Trainers,DelCo_Trainers/Test_23.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Ex
d,,DelCo Trainers,DelCo_Trainers/Test_23.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_23_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 23, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_23_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_23_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
d,,DelCo Trainers,DelCo_Trainers/Test_24.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Exp (TC\_A1\_1)|Exp (TC\_A2\_1)|Exp (TC\_A3\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_2|TRGGAST_3,CFAST (Targ 1)|CFAST (Targ 2)|CFAST (Targ 3),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 24, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
d,,DelCo Trainers,DelCo_Trainers/Test_24.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_24_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 24, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_24_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_24_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
s,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Exp (TC\_A1\_1)|Exp (TC\_A2\_1)|Exp (TC\_A3\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_2|TRGGAST_3,CFAST (Targ 1)|CFAST (Targ 2)|CFAST (Targ 3),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
s,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
d,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A1_1|TC_A2_1|TC_A3_1,Exp (TC\_A1\_1)|Exp (TC\_A2\_1)|Exp (TC\_A3\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_2|TRGGAST_3,CFAST (Targ 1)|CFAST (Targ 2)|CFAST (Targ 3),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
d,,DelCo Trainers,DelCo_Trainers/Test_25.csv,1,3,Time,TC_A7_1|TC_A8_1|TC_A9_1,Exp (TC\_A7\_1)|Exp (TC\_A8\_1)|Exp (TC\_A9\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_25_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5|TRGGAST_6,CFAST (Targ 4)|CFAST (Targ 5)|CFAST (Targ 6),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 25, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_25_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_25_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
s,s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
d,d,FM/SNL,FM_SNL/FM_SNL_Test_1_TC.csv,1,3,TIME,1|11,Exp (1/(0.98 H))|Exp (11/(0.98 H)),k-|r-,0,10000,,0,10000,20,FM_SNL/FMSNL_1_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_3,CFAST (Targ 2)|CFAST (Targ 3),k--|r--,0,10000,,0,10000,20,"Ceiling Jet Temperature, FM/SNL Test 1",Time (min),Temperature ($^\circ$C),0,30,60,0,250,1,no,"0.05,0.90",SouthEast,,1,FM_SNL/FMSNL_1_git.txt,linear,SCRIPT_FIGURES/FM_SNL/FM_SNL_01_Ceiling_Jet,Ceiling Jet Temperature,max,0,FM/SNL,g^,g
d,d,FM/SNL,FM_SNL/FM_SNL_Test_2_TC.csv,1,3,TIME,1|11,Exp (1/(0.98 H))|Exp (11/(0.98 H)),k-|r-,0,10000,,0,10000,20,FM_SNL/FMSNL_2_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_3,CFAST (Targ 2)|CFAST (Targ 3),k--|r--,0,10000,,0,10000,20,"Ceiling Jet Temperature, FM/SNL Test 2",Time (min),Temperature ($^\circ$C),0,30,60,0,250,1,no,"0.05,0.90",SouthEast,,1,FM_SNL/FMSNL_2_git.txt,linear,SCRIPT_FIGURES/FM_SNL/FM_SNL_02_Ceiling_Jet,Ceiling Jet Temperature,max,0,FM/SNL,g^,g
Expand Down
2 changes: 1 addition & 1 deletion Validation/DelCo_Trainers/Test_24.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
&VENT TYPE = 'WALL' ID = 'Second Floor South Door A11' COMP_IDS = 'Floor 2 Hallway' 'OUTSIDE' TOP = 2, BOTTOM = 0, WIDTH = 0.9
CRITERION = 'TIME' T = 0, 452, 453, 502, 503 F = 1, 1, 0, 0, 1 FACE = 'LEFT' OFFSET = 0.15 /
&VENT TYPE = 'WALL' ID = 'Second Floor West Double Door A13' COMP_IDS = 'Floor 2 North Room Front' 'OUTSIDE' TOP = 2, BOTTOM = 0, WIDTH = 0.9
CRITERION = 'TIME' T = 0, 130, 131 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 3.1 /
CRITERION = 'TIME' T = 0, 383, 384 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 3.1 /
&VENT TYPE = 'WALL' ID = 'Second Floor East Double Door A14' COMP_IDS = 'Floor 2 North Room Front' 'OUTSIDE' TOP = 2, BOTTOM = 0, WIDTH = 0.9
CRITERION = 'TIME' T = 0, 877, 878 F = 0, 0, 1 FACE = 'RIGHT' OFFSET = 2.2 /
&VENT TYPE = 'WALL' ID = 'Floor 2 Stairwell Door' COMP_IDS = 'Stairwell', 'Floor 2 North Room Front' TOP = 4.4, BOTTOM = 2.4, WIDTH = 0.9
Expand Down
Loading

0 comments on commit e3ab6e6

Please sign in to comment.