diff --git a/Utilities/Python/scripts/fds_moody_chart.py b/Utilities/Python/scripts/fds_moody_chart.py
index 5036514dbde..691db304093 100644
--- a/Utilities/Python/scripts/fds_moody_chart.py
+++ b/Utilities/Python/scripts/fds_moody_chart.py
@@ -308,32 +308,38 @@ def friction_factor_calc(dpdx, H, filename, *args):
 vmethod = ['_stm']
 
 for im in range(1):
-    
+
     mth = vmethod[im]
-    
+
     # plot convergence for Poiseuille flow aligned case theta=0 (mu = 0.025)
 
     f = np.zeros(4)
     Re = np.zeros(4)
     f2 = np.zeros(4)
     Re2 = np.zeros(4)
-    
+
     f[0], Re[0] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N10a_theta0' + mth + '_devc.csv')
     f[1], Re[1] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N20a_theta0' + mth + '_devc.csv')
     f[2], Re[2] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N40a_theta0' + mth + '_devc.csv')
     f[3], Re[3] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N80a_theta0' + mth + '_devc.csv')
-    
+
     f2[0], Re2[0] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N10nah_theta0' + mth + '_devc.csv')
     f2[1], Re2[1] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N20nah_theta0' + mth + '_devc.csv')
     f2[2], Re2[2] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N40nah_theta0' + mth + '_devc.csv')
     f2[3], Re2[3] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N80nah_theta0' + mth + '_devc.csv')
-    
+
     dz = L / N
     error = np.abs(f - 24.0 / Re)
     error2 = np.abs(f2 - 24.0 / Re2)
-    
+
+    if error[len(error)-1] > 1.e-4:
+         print('Python Warning: Error in geom_poiseuille_N80a_theta0 is out of tolerance. e_f = ',error[len(error)-1])
+
+    if error2[len(error2)-1] > 1.e-4:
+         print('Python Warning: Error in geom_poiseuille_N80nah_theta0 is out of tolerance. e_f = ',error2[len(error2)-1])
+
     fig = fdsplotlib.plot_to_fig(x_data=dz, y_data=error, marker_style='b*-', data_label='FDS, $h=0$',
-                                 x_min=0.01, x_max=0.2, y_min=5e-5, y_max=0.01,
+                                 x_min=0.01, x_max=0.2, y_min=1e-5, y_max=0.01,
                                  plot_type='loglog',
                                  revision_label=version_string,
                                  x_label=r'Grid Spacing, $\delta z$ (m)',
@@ -342,29 +348,32 @@ def friction_factor_calc(dpdx, H, filename, *args):
     fdsplotlib.plot_to_fig(x_data=dz, y_data=error2,   figure_handle=fig, marker_style='rx-', data_label=r'$h=\delta z/3$')
     fdsplotlib.plot_to_fig(x_data=dz, y_data=0.12*dz,  figure_handle=fig, marker_style='k--', data_label=r'$O(\delta z)$')
     fdsplotlib.plot_to_fig(x_data=dz, y_data=0.4*dz**2,figure_handle=fig, marker_style='k-' , data_label=r'$O(\delta z^2)$')
-    
+
     output_file = pltdir + 'geom_poiseuille_convergence_theta0a' + mth + '.pdf'
     plt.savefig(output_file, format='pdf')
     plt.close()
-    
+
     # plot convergence for Poiseuille flow not aligned case theta=0 (mu = 0.025)
-    
+
     f = np.zeros(4)
     Re = np.zeros(4)
     f2 = None
     Re2 = None
     H = []
-    
+
     f[0], Re[0] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N10na_theta0' + mth + '_devc.csv')
     f[1], Re[1] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N20na_theta0' + mth + '_devc.csv')
     f[2], Re[2] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N40na_theta0' + mth + '_devc.csv')
     f[3], Re[3] = friction_factor_calc(dpdx, L, outdir + 'geom_poiseuille_N80na_theta0' + mth + '_devc.csv')
-    
+
     dz = L / N
     error = np.abs(f - 24.0 / Re)
-    
+
+    if error[len(error)-1] > 1.e-4:
+         print('Python Warning: Error in geom_poiseuille_N80na_theta0 is out of tolerance. e_f = ',error[len(error)-1])
+
     fig = fdsplotlib.plot_to_fig(x_data=dz, y_data=error, marker_style='b*-', data_label=r'FDS, $h=\delta z_{10}/11$',
-                                 x_min=0.01, x_max=0.2, y_min=5e-5, y_max=0.01,
+                                 x_min=0.01, x_max=0.2, y_min=1e-5, y_max=0.01,
                                  plot_type='loglog',
                                  revision_label=version_string,
                                  x_label=r'Grid Spacing, $\delta z$ (m)',
@@ -372,7 +381,7 @@ def friction_factor_calc(dpdx, H, filename, *args):
 
     fdsplotlib.plot_to_fig(x_data=dz, y_data=0.05*dz,  figure_handle=fig, marker_style='k--', data_label=r'$O(\delta z)$')
     fdsplotlib.plot_to_fig(x_data=dz, y_data=0.4*dz**2,figure_handle=fig, marker_style='k-' , data_label=r'$O(\delta z^2)$')
-    
+
     output_file = pltdir + 'geom_poiseuille_convergence_theta0na' + mth + '.pdf'
     plt.savefig(output_file, format='pdf')
     plt.close()
@@ -405,7 +414,7 @@ def friction_factor_calc(dpdx, H, filename, *args):
 L = [1600, 1600, 1600, 1600, 1600]    # tunnel length (m)
 pmin = [-1, 0, -20, 0, -10]
 pmax = [6, 18, 120, 460, 60]
- 
+
 f_save = np.zeros(len(cases))
 f_fds_save = np.zeros((len(res), len(cases)))
 
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N10a_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N10a_theta0_stm.fds
index 4bc461d5af1..22be26655d2 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N10a_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N10a_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N10a_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh aligned case.' /
 
 # 10 cells in channel height (from 0 to 1):
-&MESH IJK=4,1,12, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,12, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N10na_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N10na_theta0_stm.fds
index 35b4fe13f52..5430d7bf366 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N10na_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N10na_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N10na_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 10 cells in channel height (from 0 to 1): Domain shifted up by 1/11*DZ10:
-&MESH IJK=4,1,12, XB=3,7,-.5,.5,-0.109090909090909,1.090909090909091 /
+&MESH IJK=4,1,12, XB=4.5,5.5,-.125,.125,-0.109090909090909,1.090909090909091 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N10nah_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N10nah_theta0_stm.fds
index e044a45ee35..0754d7085e9 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N10nah_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N10nah_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N10nah_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 10 cells in channel height (from 0 to 1): GEOMs shifted up by 1/3*DZ10:
-&MESH IJK=4,1,12, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,12, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.033333333333333,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N20a_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N20a_theta0_stm.fds
index 62d37dbcabf..e97ae741f6a 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N20a_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N20a_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N20a_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh aligned case.' /
 
 # 20 cells in channel height (from 0 to 1):
-&MESH IJK=4,1,24, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,24, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N20na_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N20na_theta0_stm.fds
index 4266afcafd9..9d9acdf82fc 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N20na_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N20na_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N20na_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 20 cells in channel height (from 0 to 1): Domain shifted up by 1/11*DZ10:
-&MESH IJK=4,1,24, XB=3,7,-.5,.5,-0.109090909090909,1.090909090909091 /
+&MESH IJK=4,1,24, XB=4.5,5.5,-.125,.125,-0.109090909090909,1.090909090909091 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N20nah_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N20nah_theta0_stm.fds
index 6823725e01a..2eedab87765 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N20nah_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N20nah_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N20nah_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 20 cells in channel height (from 0 to 1): GEOMs shifted up by 1/3*DZ20:
-&MESH IJK=4,1,24, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,24, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.016666666666667,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N40a_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N40a_theta0_stm.fds
index 5d3fbc2eab3..502d15c6959 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N40a_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N40a_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N40a_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh aligned case.' /
 
 # 40 cells in channel height (from 0 to 1):
-&MESH IJK=4,1,48, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,48, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N40na_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N40na_theta0_stm.fds
index c84de4982c3..bb05dfb036a 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N40na_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N40na_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N40na_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 40 cells in channel height (from 0 to 1): Domain shifted up by 1/11*DZ10:
-&MESH IJK=4,1,48, XB=3,7,-.5,.5,-0.109090909090909,1.090909090909091 /
+&MESH IJK=4,1,48, XB=4.5,5.5,-.125,.125,-0.109090909090909,1.090909090909091 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N40nah_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N40nah_theta0_stm.fds
index fad09155cf6..52bf25db4af 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N40nah_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N40nah_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N40nah_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 40 cells in channel height (from 0 to 1): GEOMs shifted up by 1/3*DZ40:
-&MESH IJK=4,1,48, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,48, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.008333333333333,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N80a_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N80a_theta0_stm.fds
index c06bd2f02b5..a7279539658 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N80a_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N80a_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N80a_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh aligned case.' /
 
 # 80 cells in channel height (from 0 to 1):
-&MESH IJK=4,1,96, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,96, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, 0.0,1.0, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N80na_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N80na_theta0_stm.fds
index f08dddf0fac..01e96d5fada 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N80na_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N80na_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N80na_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 80 cells in channel height (from 0 to 1): Domain shifted up by 1/11*DZ10:
-&MESH IJK=4,1,96, XB=3,7,-.5,.5,-0.109090909090909,1.090909090909091 /
+&MESH IJK=4,1,96, XB=4.5,5.5,-.125,.125,-0.109090909090909,1.090909090909091 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.0,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.109090909090909,1.090909090909091, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /
diff --git a/Verification/Complex_Geometry/geom_poiseuille_N80nah_theta0_stm.fds b/Verification/Complex_Geometry/geom_poiseuille_N80nah_theta0_stm.fds
index 81326a54544..20f5463e14e 100644
--- a/Verification/Complex_Geometry/geom_poiseuille_N80nah_theta0_stm.fds
+++ b/Verification/Complex_Geometry/geom_poiseuille_N80nah_theta0_stm.fds
@@ -1,12 +1,12 @@
 &HEAD CHID='geom_poiseuille_N80nah_theta0_stm', TITLE='Poiseuille flow in 2D, GEOM channel at 0 degree slope respect to mesh. Mesh not aligned case.' /
 
 # 80 cells in channel height (from 0 to 1): GEOMs shifted up by 1/3*DZ80:
-&MESH IJK=4,1,96, XB=3,7,-.5,.5,-0.1,1.1 /
+&MESH IJK=4,1,96, XB=4.5,5.5,-.125,.125,-0.1,1.1 /
 
-&TIME T_END=70.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
-&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4 /
+&TIME T_END=60.0 / needs to be roughtly (.5*H)^2/VISCOSITY (here H=1)
+&DUMP NFRAMES=100, SIG_FIGS=6, SIG_FIGS_EXP=4, DIAGNOSTICS_INTERVAL=1000 /
 
-&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0. /
+&MISC SIMULATION_MODE='DNS', NOISE=.FALSE., CCVOL_LINK=0., VN_MIN=0.8, VN_MAX=0.9 /
 
 &WIND STRATIFICATION=.FALSE., FORCE_VECTOR(1)=1 /
 
@@ -19,11 +19,7 @@
 &GEOM XB=-1,11,-.5,.5, 1.004166666666667,1.2/
 
 &SLCF PBY=0, QUANTITY='VELOCITY', VECTOR=.TRUE. /
-&SLCF PBY=0, QUANTITY='H',         CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='DENSITY',   CELL_CENTERED=.TRUE. /
-&SLCF PBY=0, QUANTITY='VISCOSITY', CELL_CENTERED=.TRUE. /
-
-&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL' /
+&DEVC XB=5.0,5.0, -0.5,0.5, -0.1,1.1, QUANTITY='U-VELOCITY', SPATIAL_STATISTIC='AREA INTEGRAL', CONVERSION_FACTOR=4. /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='U-VELOCITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='VISCOSITY' /
 &DEVC XYZ=5.0,0.0,0.5, QUANTITY='DENSITY' /