diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p5cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p5cm.fds
index 66638b7be0..46fa4c53a5 100644
--- a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p5cm.fds
+++ b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_0p5cm.fds
@@ -70,18 +70,18 @@
 &DEVC XB=-0.2,0.2,-0.2,0.2,-0.04,0.01, SURF_ID='POOL', QUANTITY='WALL TEMPERATURE', SPATIAL_STATISTIC='MAX',  ID='T_SURF_MAX'/
 &DEVC XB=-0.2,0.2,-0.2,0.2,-0.04,0.01, SURF_ID='POOL', QUANTITY='WALL TEMPERATURE', SPATIAL_STATISTIC='SURFACE AREA',  ID='POOL_AREA'/
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wp2',  POINTS=21, HIDE_COORDINATES=.TRUE. /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wp4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
@@ -111,18 +111,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp50', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp60', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wrms2',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wrms4',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
@@ -152,18 +152,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms50', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
@@ -178,18 +178,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='THERMOCOUPLE', PROP_ID='TC', ID='T_CL', POINTS=30, Z_ID='z', COORD_FACTOR=100., XYZ_UNITS='cm', CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='VOLUME FRACTION', SPEC_ID='OXYGEN', ID='X_O2', POINTS=30, HIDE_COORDINATES=.TRUE. /
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_1cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_1cm.fds
index 99cb6113b8..360e60ac22 100644
--- a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_1cm.fds
+++ b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_1cm.fds
@@ -70,18 +70,18 @@
 &DEVC XB=-0.2,0.2,-0.2,0.2,-0.04,0.01, SURF_ID='POOL', QUANTITY='WALL TEMPERATURE', SPATIAL_STATISTIC='MAX',  ID='T_SURF_MAX'/
 &DEVC XB=-0.2,0.2,-0.2,0.2,-0.04,0.01, SURF_ID='POOL', QUANTITY='WALL TEMPERATURE', SPATIAL_STATISTIC='SURFACE AREA',  ID='POOL_AREA'/
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wp2',  POINTS=21, HIDE_COORDINATES=.TRUE. /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wp4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
@@ -111,18 +111,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp50', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp60', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wrms2',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wrms4',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
@@ -152,18 +152,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms50', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
@@ -178,18 +178,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='THERMOCOUPLE', PROP_ID='TC', ID='T_CL', POINTS=30, Z_ID='z', COORD_FACTOR=100., XYZ_UNITS='cm', CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='VOLUME FRACTION', SPEC_ID='OXYGEN', ID='X_O2', POINTS=30, HIDE_COORDINATES=.TRUE. /
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_2cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_2cm.fds
index a6a7cada94..47cbaa8e28 100644
--- a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_2cm.fds
+++ b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Predicted_2cm.fds
@@ -70,18 +70,18 @@
 &DEVC XB=-0.2,0.2,-0.2,0.2,-0.04,0.01, SURF_ID='POOL', QUANTITY='WALL TEMPERATURE', SPATIAL_STATISTIC='MAX',  ID='T_SURF_MAX'/
 &DEVC XB=-0.2,0.2,-0.2,0.2,-0.04,0.01, SURF_ID='POOL', QUANTITY='WALL TEMPERATURE', SPATIAL_STATISTIC='SURFACE AREA',  ID='POOL_AREA'/
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wp2',  POINTS=21, HIDE_COORDINATES=.TRUE. /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wp4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
@@ -111,18 +111,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp50', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp60', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wrms2',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wrms4',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
@@ -152,18 +152,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms50', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
@@ -178,18 +178,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='THERMOCOUPLE', PROP_ID='TC', ID='T_CL', POINTS=30, Z_ID='z', COORD_FACTOR=100., XYZ_UNITS='cm', CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='VOLUME FRACTION', SPEC_ID='OXYGEN', ID='X_O2', POINTS=30, HIDE_COORDINATES=.TRUE. /
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p5cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p5cm.fds
index 29c36158e0..d0ebdd200c 100644
--- a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p5cm.fds
+++ b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_0p5cm.fds
@@ -40,18 +40,18 @@
 
 &PROP ID='TC', DIAMETER=0.0001 /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wp2',  POINTS=21, HIDE_COORDINATES=.TRUE. /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wp4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
@@ -81,18 +81,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp50', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp60', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wrms2',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wrms4',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
@@ -122,18 +122,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms50', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
@@ -148,18 +148,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='THERMOCOUPLE', PROP_ID='TC', ID='T_CL', POINTS=30, Z_ID='z', COORD_FACTOR=100., XYZ_UNITS='cm', CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='VOLUME FRACTION', SPEC_ID='OXYGEN', ID='X_O2', POINTS=30, HIDE_COORDINATES=.TRUE. /
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_1cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_1cm.fds
index 8d16ecdf78..37bde736af 100644
--- a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_1cm.fds
+++ b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_1cm.fds
@@ -40,18 +40,18 @@
 
 &PROP ID='TC', DIAMETER=0.0001 /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wp2',  POINTS=21, HIDE_COORDINATES=.TRUE. /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wp4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
@@ -81,18 +81,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp50', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp60', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wrms2',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wrms4',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
@@ -122,18 +122,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms50', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
@@ -148,18 +148,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='THERMOCOUPLE', PROP_ID='TC', ID='T_CL', POINTS=30, Z_ID='z', COORD_FACTOR=100., XYZ_UNITS='cm', CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='VOLUME FRACTION', SPEC_ID='OXYGEN', ID='X_O2', POINTS=30, HIDE_COORDINATES=.TRUE. /
diff --git a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_2cm.fds b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_2cm.fds
index 87aff61f4a..b230ddc904 100644
--- a/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_2cm.fds
+++ b/Validation/Waterloo_Methanol/FDS_Input_Files/Waterloo_Methanol_Prescribed_2cm.fds
@@ -40,18 +40,18 @@
 
 &PROP ID='TC', DIAMETER=0.0001 /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Up2',  POINTS=21, X_ID='r', COORD_FACTOR=100., XYZ_UNITS='cm' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Up4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Up6',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Up8',  POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Up10', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Up12', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Up14', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Up16', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Up18', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Up20', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Up30', POINTS=21, HIDE_COORDINATES=.TRUE. /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Up60', POINTS=21, HIDE_COORDINATES=.TRUE. /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wp2',  POINTS=21, HIDE_COORDINATES=.TRUE. /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wp4',  POINTS=21, HIDE_COORDINATES=.TRUE. /
@@ -81,18 +81,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp50', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Tp60', POINTS=21, HIDE_COORDINATES=.TRUE., CONVERSION_ADDEND=273.15, UNITS='K' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', ID='Urms2',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', ID='Urms4',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', ID='Urms6',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', ID='Urms8',  POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', ID='Urms10', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', ID='Urms12', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', ID='Urms14', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', ID='Urms16', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', ID='Urms18', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', ID='Urms20', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', ID='Urms30', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', ID='Urms60', POINTS=21, HIDE_COORDINATES=.TRUE.,  STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='W-VELOCITY', ID='Wrms2',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='W-VELOCITY', ID='Wrms4',  POINTS=21, HIDE_COORDINATES=.TRUE. , STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
@@ -122,18 +122,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.50,0.50, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms50', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='THERMOCOUPLE',PROP_ID='TC', ID='Trms60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='RMS' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='RADIAL VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='U-VELOCITY', ID='UW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
@@ -148,18 +148,18 @@
 &DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 &DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='CELL W', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TW60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
-&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
-&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='RADIAL VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.02,0.02, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU2',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.04,0.04, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU4',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.06,0.06, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU6',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.08,0.08, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU8',  POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.10,0.10, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU10', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.12,0.12, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU12', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.14,0.14, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU14', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.16,0.16, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU16', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.18,0.18, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU18', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.20,0.20, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU20', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.30,0.30, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU30', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
+&DEVC XB=-0.04,0.16,0.0,0.0,0.60,0.60, QUANTITY='U-VELOCITY', QUANTITY2='THERMOCOUPLE',PROP_ID='TC', ID='TU60', POINTS=21, HIDE_COORDINATES=.TRUE., STATISTICS_START=10, TEMPORAL_STATISTIC='COV' /
 
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='THERMOCOUPLE', PROP_ID='TC', ID='T_CL', POINTS=30, Z_ID='z', COORD_FACTOR=100., XYZ_UNITS='cm', CONVERSION_ADDEND=273.15, UNITS='K' /
 &DEVC XB= 0.001,0.001,0.001,0.001,0.01,0.59, QUANTITY='VOLUME FRACTION', SPEC_ID='OXYGEN', ID='X_O2', POINTS=30, HIDE_COORDINATES=.TRUE. /