From 062c9b6fe35a58e262f320f9beb296da3156c810 Mon Sep 17 00:00:00 2001
From: Richard Peacock <rpeacoc@gmail.com>
Date: Tue, 5 May 2020 12:00:01 -0400
Subject: [PATCH 1/4] V&V: Correct fire height for DewlCo Trainer tests

---
 Validation/DelCo_Trainers/Test_02.in | 30 +++++------
 Validation/DelCo_Trainers/Test_03.in | 30 +++++------
 Validation/DelCo_Trainers/Test_04.in | 30 +++++------
 Validation/DelCo_Trainers/Test_05.in | 78 ++++++++++++++--------------
 Validation/DelCo_Trainers/Test_06.in | 76 +++++++++++++--------------
 Validation/DelCo_Trainers/Test_22.in | 22 ++++----
 6 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/Validation/DelCo_Trainers/Test_02.in b/Validation/DelCo_Trainers/Test_02.in
index f08e90fce..02ee4a058 100644
--- a/Validation/DelCo_Trainers/Test_02.in
+++ b/Validation/DelCo_Trainers/Test_02.in
@@ -1,4 +1,4 @@
-&HEAD VERSION = 7500, TITLE = 'CFAST Simulation' /
+&HEAD VERSION = 7600, TITLE = 'CFAST Simulation' /
  
 !! Scenario Configuration 
 &TIME SIMULATION = 1800 PRINT = 60 SMOKEVIEW = 15 SPREADSHEET = 15 / 
@@ -51,24 +51,24 @@
 &FIRE ID = 'Center Burner'  COMP_ID = 'Comp 1', FIRE_ID = 'Propane Fire 3'  LOCATION = 0.9, 4 / 
 &CHEM ID = 'Propane Fire 1' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 1' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 5, 441.5558, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 961, 441.5558, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 960, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 5, 441.5558, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 961, 441.5558, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 960, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 2' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 2' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 181, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 186, 441.4498, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 840, 441.4498, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 841, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 181, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 186, 441.4498, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 840, 441.4498, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 841, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 3' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 3' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 261, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 366, 100.4, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 720, 100.4, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 721, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 261, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 366, 100.4, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 720, 100.4, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 721, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
 &DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
diff --git a/Validation/DelCo_Trainers/Test_03.in b/Validation/DelCo_Trainers/Test_03.in
index 11ae21f47..0280c0371 100644
--- a/Validation/DelCo_Trainers/Test_03.in
+++ b/Validation/DelCo_Trainers/Test_03.in
@@ -1,4 +1,4 @@
-&HEAD VERSION = 7500, TITLE = 'CFAST Simulation' /
+&HEAD VERSION = 7600, TITLE = 'CFAST Simulation' /
  
 !! Scenario Configuration 
 &TIME SIMULATION = 1800 PRINT = 60 SMOKEVIEW = 15 SPREADSHEET = 15 / 
@@ -51,24 +51,24 @@
 &FIRE ID = 'Center Burner'  COMP_ID = 'Comp 1', FIRE_ID = 'Propane Fire 3'  LOCATION = 0.9, 4 / 
 &CHEM ID = 'Propane Fire 1' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 1' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 5, 521.8, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1018, 521.8, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1019, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 5, 521.8, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1018, 521.8, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1019, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 2' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 2' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 181, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 186, 411.4498, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 898, 411.4, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 899, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 181, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 186, 411.4498, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 898, 411.4, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 899, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 3' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 3' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 361, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 366, 170.6, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 778, 170.6, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 361, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 366, 170.6, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 778, 170.6, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
 &DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
diff --git a/Validation/DelCo_Trainers/Test_04.in b/Validation/DelCo_Trainers/Test_04.in
index 7b5e42fc3..7d0398d01 100644
--- a/Validation/DelCo_Trainers/Test_04.in
+++ b/Validation/DelCo_Trainers/Test_04.in
@@ -1,4 +1,4 @@
-&HEAD VERSION = 7500, TITLE = 'CFAST Simulation' /
+&HEAD VERSION = 7600, TITLE = 'CFAST Simulation' /
  
 !! Scenario Configuration 
 &TIME SIMULATION = 1800 PRINT = 60 SMOKEVIEW = 15 SPREADSHEET = 15 / 
@@ -51,24 +51,24 @@
 &FIRE ID = 'Center Burner'  COMP_ID = 'Comp 1', FIRE_ID = 'Propane Fire 3'  LOCATION = 0.9, 4 / 
 &CHEM ID = 'Propane Fire 1' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 1' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 5, 551.9, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1019, 551.9, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1020, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 5, 551.9, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1019, 551.9, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1020, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 2' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 2' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 179, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 184, 421.5, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 897, 421.5, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 898, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 179, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 184, 421.5, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 897, 421.5, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 898, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 3' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 3' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 360, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 361, 160.6, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 778, 160.6, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 360, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 361, 160.6, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 778, 160.6, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
 &DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
diff --git a/Validation/DelCo_Trainers/Test_05.in b/Validation/DelCo_Trainers/Test_05.in
index 52fbf654c..ca7d499ae 100644
--- a/Validation/DelCo_Trainers/Test_05.in
+++ b/Validation/DelCo_Trainers/Test_05.in
@@ -51,49 +51,49 @@
 &FIRE ID = 'Center Burner'  COMP_ID = 'Comp 1', FIRE_ID = 'Propane Fire 3'  LOCATION = 0.9, 4 / 
 &CHEM ID = 'Propane Fire 1' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 1' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 5, 396.6667, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 576, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 577, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1225, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1230, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1840, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1841, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 2425, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 2450, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 2997, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 2998, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 3200, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 5, 396.6667, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 576, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 577, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1225, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1230, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1840, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1841, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 2425, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 2450, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 2997, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 2998, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 3200, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 2' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 2' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 5, 396.6667, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 576, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 577, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1225, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1230, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1840, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1841, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 2425, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 2450, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 2997, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 2998, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 3200, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 5, 396.6667, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 576, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 577, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1225, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1230, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1840, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1841, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 2425, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 2450, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 2997, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 2998, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 3200, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 3' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 3' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 5, 396.6667, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 576, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 577, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1225, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1230, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1840, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1841, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 2425, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 2450, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 2997, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 2998, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 3200, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 5, 396.6667, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 576, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 577, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1225, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1230, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1840, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1841, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 2425, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 2450, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 2997, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 2998, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 3200, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
 &DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
diff --git a/Validation/DelCo_Trainers/Test_06.in b/Validation/DelCo_Trainers/Test_06.in
index 0078ae4d2..6c6ee740c 100644
--- a/Validation/DelCo_Trainers/Test_06.in
+++ b/Validation/DelCo_Trainers/Test_06.in
@@ -51,49 +51,49 @@
 &FIRE ID = 'Center Burner'  COMP_ID = 'Comp 1', FIRE_ID = 'Propane Fire 3'  LOCATION = 0.9, 4 / 
 &CHEM ID = 'Propane Fire 1' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 1' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 5, 396.6667, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 327, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 328, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 565, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 566, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 868, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 869, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1075, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1076, 393.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1387, 393.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1388, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 1680, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 5, 396.6667, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 327, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 328, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 565, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 566, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 868, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 869, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1075, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1076, 393.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1387, 393.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1388, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 1680, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 2' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 2' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
 &TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 5, 396.6667, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 327, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 328, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 565, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 566, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 868, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 869, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1075, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1076, 393.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1387, 393.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1388, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 1680, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 5, 396.6667, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 327, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 328, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 565, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 566, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 868, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 869, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1075, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1076, 393.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1387, 393.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1388, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 1680, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 3' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 3' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 5, 396.6667, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 327, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 328, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 565, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 566, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 868, 396.7, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 869, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1075, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1076, 393.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1387, 393.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1388, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 1680, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 5, 396.6667, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 327, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 328, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 565, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 566, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 868, 396.7, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 869, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1075, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1076, 393.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1387, 393.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1388, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 1680, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
 &DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
diff --git a/Validation/DelCo_Trainers/Test_22.in b/Validation/DelCo_Trainers/Test_22.in
index 17ac0eb87..a747af423 100644
--- a/Validation/DelCo_Trainers/Test_22.in
+++ b/Validation/DelCo_Trainers/Test_22.in
@@ -97,22 +97,22 @@
 &FIRE ID = 'Center Burner'  COMP_ID = 'Floor 1', FIRE_ID = 'Propane Fire 3'  LOCATION = 0.9, 4 / 
 &CHEM ID = 'Propane Fire 1' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 1' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 5, 413.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 829, 413.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 1', DATA = 830, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 5, 413.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 829, 413.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 1', DATA = 830, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 2' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 2' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 5, 413.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 2', DATA = 829, 413.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 5, 413.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 2', DATA = 829, 413.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
 &TABL ID = 'Propane Fire 2', DATA = 830, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
 &CHEM ID = 'Propane Fire 3' CARBON = 3 CHLORINE = 0 HYDROGEN = 8 NITROGEN = 0 OXYGEN = 0 HEAT_OF_COMBUSTION = 46460 RADIATIVE_FRACTION = 0.3 / 
 &TABL ID = 'Propane Fire 3' LABELS = 'TIME', 'HRR' , 'HEIGHT' , 'AREA' , 'CO_YIELD' , 'SOOT_YIELD' , 'HCN_YIELD' , 'HCL_YIELD' , 'TRACE_YIELD'  /
-&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 5, 413.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 829, 413.3333, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
-&TABL ID = 'Propane Fire 3', DATA = 830, 0, 0.6, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 0, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 5, 413.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 829, 413.3333, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
+&TABL ID = 'Propane Fire 3', DATA = 830, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
 &DEVC ID = 'A1' COMP_ID = 'Floor 1 Vestibule' LOCATION = 0.4, 0.4, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /

From d1c361f79d28c8127b4c66ca44e90fc0b77991e1 Mon Sep 17 00:00:00 2001
From: Richard Peacock <rpeacoc@gmail.com>
Date: Tue, 5 May 2020 15:26:06 -0400
Subject: [PATCH 2/4] V&V: Update DelCo Trainers V&V

---
 Manuals/Validation_Guide/Appendix_Graphs.tex  | 109 +++++++++---------
 .../CFAST_validation_dataplot_inputs.csv      |  20 ++--
 Validation/DelCo_Trainers/Test_02.in          |   6 +-
 Validation/DelCo_Trainers/Test_03.in          |   8 +-
 Validation/DelCo_Trainers/Test_04.in          |   8 +-
 Validation/DelCo_Trainers/Test_05.in          |   5 +
 Validation/DelCo_Trainers/Test_06.in          |   6 +-
 7 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/Manuals/Validation_Guide/Appendix_Graphs.tex b/Manuals/Validation_Guide/Appendix_Graphs.tex
index 0dff9d7b9..ff0b2c3f4 100644
--- a/Manuals/Validation_Guide/Appendix_Graphs.tex
+++ b/Manuals/Validation_Guide/Appendix_Graphs.tex
@@ -103,34 +103,35 @@ \section{DelCo Trainers}
 \label{DelCo_HGL_2}
 \end{figure}
 
-%\begin{figure}[p]
-%\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_HGL_Temp_Room_1} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_HGL_Temp_Room_2} \\
-%\multicolumn{2}{c}{\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_HGL_Temp_Room_3}} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_HGL_Temp_Room_1} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_HGL_Temp_Room_2} \\
-%\multicolumn{2}{c}{\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_HGL_Temp_Room_3}}
-%\end{tabular*}
-%\caption[DelCo Trainers, HGL Temperature, Tests 5 and 6]
-%{DelCo Trainers, HGL Temperature, Tests 5 and 6.}
-%\label{DelCo_HGL_3}
-%\end{figure}
+\begin{figure}[p]
+\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_HGL_Temp_Room_1} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_HGL_Temp_Room_2} \\
+\multicolumn{2}{c}{\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_HGL_Temp_Room_3}} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_HGL_Temp_Room_1} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_HGL_Temp_Room_2} \\
+\multicolumn{2}{c}{\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_HGL_Temp_Room_3}}
+\end{tabular*}
+\caption[DelCo Trainers, HGL Temperature, Tests 5 and 6]
+{DelCo Trainers, HGL Temperature, Tests 5 and 6.}
+\label{DelCo_HGL_3}
+\end{figure}
 
-%\begin{figure}[p]
-%\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_HGL_Temp_Floor_1} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_HGL_Temp_Floor_2} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_HGL_Temp_Floor_1} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_HGL_Temp_Floor_2} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_1} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_2} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_1} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_2}
-%\end{tabular*}
-%\caption[DelCo Trainers, HGL Temperature, Tests 22-25]
-%{DelCo Trainers, HGL Temperature, Tests 22-25.}
-%\label{DelCo_HGL_4}
+\begin{figure}[p]
+\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_HGL_Temp_Floor_1} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_HGL_Temp_Floor_2} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_HGL_Temp_Floor_1} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_HGL_Temp_Floor_2} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_1} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_HGL_Temp_Floor_2} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_1} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_HGL_Temp_Floor_2}
+\end{tabular*}
+\caption[DelCo Trainers, HGL Temperature, Tests 22-25]
+{DelCo Trainers, HGL Temperature, Tests 22-25.}
+\label{DelCo_HGL_4}
+\end{figure}
 
 \FloatBarrier
 
@@ -150,35 +151,35 @@ \section{DelCo Trainers}
 \label{DelCo_Ceiling_Jet_1}
 \end{figure}
 
-%\newpage
+\newpage
 
-%\begin{figure}[p]
-%\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_A1_A3_A5_Ceiling_Jet} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_A2_A4_Ceiling_Jet} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_A1_A3_A5_Ceiling_Jet} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_A2_A4_Ceiling_Jet}
-%\end{tabular*}
-%\caption[DelCo Trainers, ceiling jet temperature, Tests 5 and 6]
-%{DelCo Trainers, ceiling jet temperature, Tests 5 and 6.}
-%\label{DelCo_Ceiling_Jet_2}
-%\end{figure}
+\begin{figure}[p]
+\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_A1_A3_A5_Ceiling_Jet} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_05_A2_A4_Ceiling_Jet} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_A1_A3_A5_Ceiling_Jet} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_06_A2_A4_Ceiling_Jet}
+\end{tabular*}
+\caption[DelCo Trainers, ceiling jet temperature, Tests 5 and 6]
+{DelCo Trainers, ceiling jet temperature, Tests 5 and 6.}
+\label{DelCo_Ceiling_Jet_2}
+\end{figure}
 
-%\begin{figure}[p]
-%\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_A1_A2_A3_Ceiling_Jet} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_A7_A8_A9_Ceiling_Jet} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_A1_A2_A3_Ceiling_Jet} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_A7_A8_A9_Ceiling_Jet} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_A1_A2_A3_Ceiling_Jet} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_A7_A8_A9_Ceiling_Jet} \\
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_A1_A2_A3_Ceiling_Jet} &
-%\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_A7_A8_A9_Ceiling_Jet}
-%\end{tabular*}
-%\caption[DelCo Trainers, ceiling jet temperature, Tests 22-25]
-%{DelCo Trainers, ceiling jet temperature, Tests 22-25.}
-%\label{DelCo_Ceiling_Jet_3}
-%\end{figure}
+\begin{figure}[p]
+\begin{tabular*}{\textwidth}{l@{\extracolsep{\fill}}r}
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_A1_A2_A3_Ceiling_Jet} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_22_A7_A8_A9_Ceiling_Jet} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_A1_A2_A3_Ceiling_Jet} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_23_A7_A8_A9_Ceiling_Jet} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_A1_A2_A3_Ceiling_Jet} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_24_A7_A8_A9_Ceiling_Jet} \\
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_A1_A2_A3_Ceiling_Jet} &
+\includegraphics[height=2.15in]{SCRIPT_FIGURES/DelCo_Trainers/Test_25_A7_A8_A9_Ceiling_Jet}
+\end{tabular*}
+\caption[DelCo Trainers, ceiling jet temperature, Tests 22-25]
+{DelCo Trainers, ceiling jet temperature, Tests 22-25.}
+\label{DelCo_Ceiling_Jet_3}
+\end{figure}
 
 \FloatBarrier
 
diff --git a/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv b/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
index e63d9518c..fe2f64899 100644
--- a/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
+++ b/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
@@ -652,16 +652,16 @@ d,d,ATF Corridors,ATF_Corridors/ATF_Corridors_250kW_avg.csv,1,2,Time,TC_A10|TC_B
 d,d,ATF Corridors,ATF_Corridors/ATF_Corridors_485kW_avg.csv,1,2,Time,TC_A10|TC_B10|TC_C10,Exp (TC\_A10)|Exp (TC\_B10)|Exp (TC\_C10),k-|r-|g-,0,10000,,0,10000,20,ATF_Corridors/ATF_Corridors_500_kW_devices.csv,1,5,Time,TRGGAST_5|TRGGAST_6|TRGGAST_7,CFAST (Targ 5)|CFAST (Targ 6)|CFAST (Targ 7),k--|r--|g--,0,10000,,0,10000,20,"ATF Corridors, 500 kW, Ceiling Jet",Time (min),Temperature ($^\circ$C),0,20,60,0,500,1,no,0.05 0.90,East,,1,ATF_Corridors/ATF_Corridors_500_kW_git.txt,linear,SCRIPT_FIGURES/ATF_Corridors/ATF_Corridors_Jet_Temp_500_kW,Ceiling Jet Temperature,max,0,ATF Corridors,ro,r
 d,d,ATF Corridors,ATF_Corridors/ATF_Corridors_Pulse_avg.csv,1,2,Time,TC_A10|TC_B10|TC_C10,Exp (TC\_A10)|Exp (TC\_B10)|Exp (TC\_C10),k-|r-|g-,0,10000,,0,10000,20,ATF_Corridors/ATF_Corridors_Mix_kW_devices.csv,1,5,Time,TRGGAST_5|TRGGAST_6|TRGGAST_7,CFAST (Targ 5)|CFAST (Targ 6)|CFAST (Targ 7),k--|r--|g--,0,10000,,0,10000,20,"ATF Corridors, Pulse, Ceiling Jet",Time (min),Temperature ($^\circ$C),0,20,60,0,500,1,no,0.05 0.90,East,,1,ATF_Corridors/ATF_Corridors_Mix_kW_git.txt,linear,SCRIPT_FIGURES/ATF_Corridors/ATF_Corridors_Jet_Temp_Mix_kW,Ceiling Jet Temperature,max,0,ATF Corridors,ro,r
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-d,,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_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 2, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_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 3, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_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 4, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-s,,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_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 5, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,60,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-s,,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_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 6, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5,CFAST (Targ 4)|CFAST (Targ 5),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 2, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5,CFAST (Targ 4)|CFAST (Targ 5),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 3, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5,CFAST (Targ 4)|CFAST (Targ 5),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 4, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5,CFAST (Targ 4)|CFAST (Targ 5),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 5, A2, A4",Time (min),Temperature ($^\circ$C),0,60,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_devices.csv,1,5,Time,TRGGAST_4|TRGGAST_5,CFAST (Targ 4)|CFAST (Targ 5),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 6, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 2, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 3, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 4, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+s,,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 5, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,60,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+s,,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 6, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 2, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 3, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 4, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 5, A2, A4",Time (min),Temperature ($^\circ$C),0,60,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 6, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
 d,,DelCo Trainers,DelCo_Trainers/Test_22.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_22_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 22, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_22_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_22_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
 d,,DelCo Trainers,DelCo_Trainers/Test_22.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_22_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 22, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_22_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_22_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
 d,,DelCo Trainers,DelCo_Trainers/Test_23.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_23_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 23, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_23_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_23_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
diff --git a/Validation/DelCo_Trainers/Test_02.in b/Validation/DelCo_Trainers/Test_02.in
index 02ee4a058..e4687b3a6 100644
--- a/Validation/DelCo_Trainers/Test_02.in
+++ b/Validation/DelCo_Trainers/Test_02.in
@@ -71,10 +71,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 721, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_3' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.79 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_5' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.18 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
  
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_03.in b/Validation/DelCo_Trainers/Test_03.in
index 0280c0371..f5474a725 100644
--- a/Validation/DelCo_Trainers/Test_03.in
+++ b/Validation/DelCo_Trainers/Test_03.in
@@ -71,10 +71,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_3' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.79 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_5' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.18 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
- 
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+  
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_04.in b/Validation/DelCo_Trainers/Test_04.in
index 7d0398d01..89a06cc9b 100644
--- a/Validation/DelCo_Trainers/Test_04.in
+++ b/Validation/DelCo_Trainers/Test_04.in
@@ -71,10 +71,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_3' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.79 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_5' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.18 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
- 
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+  
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_05.in b/Validation/DelCo_Trainers/Test_05.in
index ca7d499ae..2e8767203 100644
--- a/Validation/DelCo_Trainers/Test_05.in
+++ b/Validation/DelCo_Trainers/Test_05.in
@@ -101,5 +101,10 @@
 &DEVC ID = 'TC_A1_5' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.18 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+ &DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
  
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_06.in b/Validation/DelCo_Trainers/Test_06.in
index 6c6ee740c..f1d1b9a95 100644
--- a/Validation/DelCo_Trainers/Test_06.in
+++ b/Validation/DelCo_Trainers/Test_06.in
@@ -96,10 +96,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 1680, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_3' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.79 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_5' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.18 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
  
 &TAIL /

From 78402c042eddbfe6168f975a040737bdae8ea3f9 Mon Sep 17 00:00:00 2001
From: Richard Peacock <rpeacoc@gmail.com>
Date: Tue, 5 May 2020 19:44:00 -0400
Subject: [PATCH 3/4] V&V: Update DelCo Trainers V&V

---
 Validation/DelCo_Trainers/Test_02.in |  8 ++++----
 Validation/DelCo_Trainers/Test_03.in | 10 +++++-----
 Validation/DelCo_Trainers/Test_04.in | 10 +++++-----
 Validation/DelCo_Trainers/Test_05.in | 15 +++++----------
 Validation/DelCo_Trainers/Test_06.in | 10 +++++-----
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/Validation/DelCo_Trainers/Test_02.in b/Validation/DelCo_Trainers/Test_02.in
index e4687b3a6..0067f026c 100644
--- a/Validation/DelCo_Trainers/Test_02.in
+++ b/Validation/DelCo_Trainers/Test_02.in
@@ -71,10 +71,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 721, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2284967, 0.7870442, -0.573019 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.370397, 0, -0.9288735 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
  
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_03.in b/Validation/DelCo_Trainers/Test_03.in
index f5474a725..c8015be3d 100644
--- a/Validation/DelCo_Trainers/Test_03.in
+++ b/Validation/DelCo_Trainers/Test_03.in
@@ -71,10 +71,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2284967, 0.7870442, -0.573019 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.370397, 0, -0.9288735 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-  
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+   
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_04.in b/Validation/DelCo_Trainers/Test_04.in
index 89a06cc9b..d9645e291 100644
--- a/Validation/DelCo_Trainers/Test_04.in
+++ b/Validation/DelCo_Trainers/Test_04.in
@@ -71,10 +71,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 779, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2284967, 0.7870442, -0.573019 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.370397, 0, -0.9288735 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-  
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+   
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_05.in b/Validation/DelCo_Trainers/Test_05.in
index 2e8767203..787c3bd6b 100644
--- a/Validation/DelCo_Trainers/Test_05.in
+++ b/Validation/DelCo_Trainers/Test_05.in
@@ -96,15 +96,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 3200, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_3' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.79 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A1_5' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 1.18 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2284967, 0.7870442, -0.573019 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.370397, 0, -0.9288735 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
- &DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
- 
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+  
 &TAIL /
diff --git a/Validation/DelCo_Trainers/Test_06.in b/Validation/DelCo_Trainers/Test_06.in
index f1d1b9a95..17d852cf6 100644
--- a/Validation/DelCo_Trainers/Test_06.in
+++ b/Validation/DelCo_Trainers/Test_06.in
@@ -96,10 +96,10 @@
 &TABL ID = 'Propane Fire 3', DATA = 1680, 0, 0.14, 0.36, 0.024, 0.005, 0, 0, 0 /
  
 !! Devices
-&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2329293, 0.8540741, -0.4650822 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.4478105, 0, -0.8941284 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2485079, 0.9111955, -0.3285826 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A1_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2284967, 0.7870442, -0.573019 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A2_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.370397, 0, -0.9288735 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+&DEVC ID = 'TC_A3_1' COMP_ID = 'Comp 2' LOCATION = 1.7, 1.5, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
 &DEVC ID = 'TC_A4_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 4.6, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
-&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 1' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = -0.2594145, 0.9511864, -0.1671782 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
- 
+&DEVC ID = 'TC_A5_1' COMP_ID = 'Comp 3' LOCATION = 1.8, 1.3, 2.397 TYPE = 'PLATE' MATL_ID = 'TC'  NORMAL = 0, 0, 1 TEMPERATURE_DEPTH = 0.0005 DEPTH_UNITS = 'M' /
+  
 &TAIL /

From de8bb633955e8832d345b8be9ba224af884ef25a Mon Sep 17 00:00:00 2001
From: Richard Peacock <rpeacoc@gmail.com>
Date: Wed, 6 May 2020 09:46:58 -0400
Subject: [PATCH 4/4] V&V: Correct dataplot inputs for DelCo Trainer tests

---
 .../CFAST_validation_dataplot_inputs.csv      | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv b/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
index fe2f64899..6298eb856 100644
--- a/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
+++ b/Utilities/Matlab/CFAST_validation_dataplot_inputs.csv
@@ -651,25 +651,25 @@ d,d,ATF Corridors,ATF_Corridors/ATF_Corridors_242kW_avg.csv,1,2,Time,TC_A10|TC_B
 d,d,ATF Corridors,ATF_Corridors/ATF_Corridors_250kW_avg.csv,1,2,Time,TC_A10|TC_B10|TC_C10,Exp (TC\_A10)|Exp (TC\_B10)|Exp (TC\_C10),k-|r-|g-,0,10000,,0,10000,20,ATF_Corridors/ATF_Corridors_250_kW_devices.csv,1,5,Time,TRGGAST_5|TRGGAST_6|TRGGAST_7,CFAST (Targ 5)|CFAST (Targ 6)|CFAST (Targ 7),k--|r--|g--,0,10000,,0,10000,20,"ATF Corridors, 250 kW, Ceiling Jet",Time (min),Temperature ($^\circ$C),0,20,60,0,500,1,no,0.05 0.90,East,,1,ATF_Corridors/ATF_Corridors_250_kW_git.txt,linear,SCRIPT_FIGURES/ATF_Corridors/ATF_Corridors_Jet_Temp_250_kW,Ceiling Jet Temperature,max,0,ATF Corridors,ro,r
 d,d,ATF Corridors,ATF_Corridors/ATF_Corridors_485kW_avg.csv,1,2,Time,TC_A10|TC_B10|TC_C10,Exp (TC\_A10)|Exp (TC\_B10)|Exp (TC\_C10),k-|r-|g-,0,10000,,0,10000,20,ATF_Corridors/ATF_Corridors_500_kW_devices.csv,1,5,Time,TRGGAST_5|TRGGAST_6|TRGGAST_7,CFAST (Targ 5)|CFAST (Targ 6)|CFAST (Targ 7),k--|r--|g--,0,10000,,0,10000,20,"ATF Corridors, 500 kW, Ceiling Jet",Time (min),Temperature ($^\circ$C),0,20,60,0,500,1,no,0.05 0.90,East,,1,ATF_Corridors/ATF_Corridors_500_kW_git.txt,linear,SCRIPT_FIGURES/ATF_Corridors/ATF_Corridors_Jet_Temp_500_kW,Ceiling Jet Temperature,max,0,ATF Corridors,ro,r
 d,d,ATF Corridors,ATF_Corridors/ATF_Corridors_Pulse_avg.csv,1,2,Time,TC_A10|TC_B10|TC_C10,Exp (TC\_A10)|Exp (TC\_B10)|Exp (TC\_C10),k-|r-|g-,0,10000,,0,10000,20,ATF_Corridors/ATF_Corridors_Mix_kW_devices.csv,1,5,Time,TRGGAST_5|TRGGAST_6|TRGGAST_7,CFAST (Targ 5)|CFAST (Targ 6)|CFAST (Targ 7),k--|r--|g--,0,10000,,0,10000,20,"ATF Corridors, Pulse, Ceiling Jet",Time (min),Temperature ($^\circ$C),0,20,60,0,500,1,no,0.05 0.90,East,,1,ATF_Corridors/ATF_Corridors_Mix_kW_git.txt,linear,SCRIPT_FIGURES/ATF_Corridors/ATF_Corridors_Jet_Temp_Mix_kW,Ceiling Jet Temperature,max,0,ATF Corridors,ro,r
-s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-d,,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 2, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 3, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 4, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-s,,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 5, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,60,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-s,,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 6, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 2, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 3, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 4, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 5, A2, A4",Time (min),Temperature ($^\circ$C),0,60,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 6, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_22.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_22_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 22, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_22_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_22_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_22.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_22_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 22, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_22_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_22_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-d,,DelCo Trainers,DelCo_Trainers/Test_23.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_23_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 23, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_23_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_23_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
-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
-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,s,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 2, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 3, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 4, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 5, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,60,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A1_1|TC_A3_1|TC_A5_1,Exp (TC\_A1\_1)|Exp (TC\_A3\_1)|Exp (TC\_A5\_1),k-|r-|g-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_devices.csv,1,5,Time,TRGGAST_1|TRGGAST_3|TRGGAST_5,CFAST (Targ 1)|CFAST (Targ 3)|CFAST (Targ 5),k--|r--|g--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 6, A1, A3, A5",Time (min),Temperature ($^\circ$C),0,30,60,0,800,1,no,0.05 0.90,SouthEast,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A1_A3_A5_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_2.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_02_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 2, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_02_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_02_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_3.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_03_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 3, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_03_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_03_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_4.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_04_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 4, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,East,,1,DelCo_Trainers/Test_04_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_04_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_5.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_05_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 5, A2, A4",Time (min),Temperature ($^\circ$C),0,60,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_05_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_05_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_6.csv,1,3,Time,TC_A2_1|TC_A4_1,Exp (TC\_A2\_1)|Exp (TC\_A4\_1),k-|r-,0,10000,,0,10000,32,DelCo_Trainers/Test_06_devices.csv,1,5,Time,TRGGAST_2|TRGGAST_4,CFAST (Targ 2)|CFAST (Targ 4),k--|r--,0,10000,,0,10000,32,"Ceiling Jet, DelCo Trainers, Test 6, A2, A4",Time (min),Temperature ($^\circ$C),0,30,60,0,1000,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_06_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_06_A2_A4_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_22.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_22_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 22, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_22_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_22_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_22.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_22_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 22, A7, A8, A9",Time (min),Temperature ($^\circ$C),0,20,60,0,300,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_22_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_22_A7_A8_A9_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,DelCo Trainers,DelCo_Trainers/Test_23.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_23_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 23, A1, A2, A3",Time (min),Temperature ($^\circ$C),0,20,60,0,600,1,no,0.05 0.90,South,,1,DelCo_Trainers/Test_23_git.txt,linear,SCRIPT_FIGURES/DelCo_Trainers/Test_23_A1_A2_A3_Ceiling_Jet,Ceiling Jet Temperature,max,0,DelCo Trainers,go,g
+d,s,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,s,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,s,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
+d,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
+d,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
 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