diff --git a/Docs/sphinx_doc/BestPractices.rst b/Docs/sphinx_doc/BestPractices.rst
index 8c80505e4..ce487b5a6 100644
--- a/Docs/sphinx_doc/BestPractices.rst
+++ b/Docs/sphinx_doc/BestPractices.rst
@@ -45,41 +45,61 @@ Large-Eddy Simulations
 * Time Integration
 
   - Split timestepping offers some computational cost savings but still does
-    not allow you to run with an incompressible/anelastic time-step size.
-  - The acoustic CFL should be less than 0.5, with 4--6 fast timesteps
-    (substeps) according to WRF best practices.
+    not allow you to run with an incompressible/anelastic time-step size in
+    general.
+  - The acoustic CFL should conservatively be less than or equal to 0.5, with
+    4--6 fast timesteps (substeps) according to WRF best practices. If not
+    explicitly specified (through ``erf.fixed_mri_dt_ratio`` or
+    ``erf.fixed_fast_dt``, the number of substeps in ERF is chosen based on the
+    same algorithm as WRF. If the user follows the recommendation that
+    dt [s] ~ 6 dx [km],
+    then 4 substeps will be used, giving an effective CFL of approximately 0.5.
+    This meets the stability criteria from Wicker & Skamarock 2002 that, for a
+    5th-order scheme, the CFL be less than 1.42/sqrt(3) = 0.820.
 
     .. code-block:: python
 
        erf.fixed_dt           = 0.06  # slow timestep
 
        # These are equivalent and result in a fixed fast timestep size
-       #   if dx=10, speed of sound ~ 350 m/s
-       erf.fixed_fast_dt      = 0.01  # ==> CFL~0.35
-       #erf.fixed_mri_dt_ratio = 6
-
-       # Alternatively, let ERF chose the fast timestep
-       #erf.cfl                = 0.5
-
-  - We note that ERF LESs with up to 10 fast timesteps have successfully been
+       #   if dx=10, speed of sound ~ 300 m/s
+       erf.fixed_mri_dt_ratio = 4
+       #   or
+       #erf.fixed_fast_dt      = 0.015  # ==> CFL~0.45
+       #   or, let ERF chose the fast timestep
+       #erf.substepping_cfl    = 0.5
+
+  - Following the WRF guidelines for dt is conservative. More aggressive time
+    integration--i.e., larger time steps with more substeps--is possible. We
+    note that ERF LESs with 10 or more fast timesteps have successfully been
     run but your mileage may vary.
 
 
 Single-Column Model
 -------------------
 
-* Currently, ERF does not have the ability to run a true single-column model
-  (SCM). The grid size in the lateral directions must have a minimum number of
-  cells. This will give comparable results, e.g.:
+* An SCM is set up with a single cell in the lateral directions:
 
   .. code-block:: python
 
      geometry.prob_extent = 400  400  400
-     amr.n_cell           =   2    2   64
+     amr.n_cell           =   1    1   64
      geometry.is_periodic =   1    1    0
 
-  When set up this way, the solution is not sensitive to horizontal problem
-  extent.
-
 * An SCM was successfully run with third-order advection in the horizontal and
   vertical.
+
+
+2-D Cases
+---------
+
+* A 2-D planar domain can be configured as follows:
+
+  .. code-block:: python
+
+     geometry.prob_extent = 10000  100  1000
+     amr.n_cell           =   100    1    20
+     geometry.is_periodic =     0    0     0
+
+     ylo.type = "SlipWall"
+     yhi.type = "SlipWall"
diff --git a/Docs/sphinx_doc/Inputs.rst b/Docs/sphinx_doc/Inputs.rst
index abf362ad9..c302c456b 100644
--- a/Docs/sphinx_doc/Inputs.rst
+++ b/Docs/sphinx_doc/Inputs.rst
@@ -906,7 +906,7 @@ List of Parameters
 |                                  | viscosity and      | "Constant", or      |              |
 |                                  | diffusivity?       | "ConstantAlpha"     |              |
 +----------------------------------+--------------------+---------------------+--------------+
-| **erf.dynamicViscosity**         | Viscous coeff. if  | Real                | 0.0          |
+| **erf.dynamic_viscosity**        | Viscous coeff. if  | Real                | 0.0          |
 |                                  | DNS                |                     |              |
 +----------------------------------+--------------------+---------------------+--------------+
 | **erf.Cs**                       | Constant           | Real                | 0.0          |
@@ -918,13 +918,11 @@ List of Parameters
 | **erf.Sc_t**                     | Turbulent Schmidt  | Real                | 1.0          |
 |                                  | Number             |                     |              |
 +----------------------------------+--------------------+---------------------+--------------+
-| **erf.use_NumDiff**              | Use 6th order      | "true",             | "false"      |
-|                                  | numerical diffusion| "false"             |              |
-|                                  |                    |                     |              |
-+----------------------------------+--------------------+---------------------+--------------+
-| **erf.NumDiffCoeff**             | Coefficient for    | Real                | 0.0          |
-|                                  | 6th order          | [0.0,  1.0]         |              |
-|                                  | numerical diffusion|                     |              |
+| **erf.num_diff_coeff**           | Coefficient for    | Real                | 0.0          |
+|                                  | 6th-order          | [0.0,  1.0]         |              |
+|                                  | numerical          |                     |              |
+|                                  | diffusion, set to 0|                     |              |
+|                                  | to disable         |                     |              |
 +----------------------------------+--------------------+---------------------+--------------+
 
 Note: in the equations for the evolution of momentum, potential temperature and advected scalars, the
diff --git a/Docs/sphinx_doc/Plotfiles.rst b/Docs/sphinx_doc/Plotfiles.rst
index 322e813a9..8ed70f2af 100644
--- a/Docs/sphinx_doc/Plotfiles.rst
+++ b/Docs/sphinx_doc/Plotfiles.rst
@@ -187,19 +187,13 @@ Output Options
 |                             |                  |
 |                             |                  |
 +-----------------------------+------------------+
-| **KE**                      | Kinetic energy   |
-|                             |                  |
-|                             |                  |
-+-----------------------------+------------------+
-| **QKE**                     | Turbulent        |
+| **KE**                      | SGS turbulent    |
 |                             | kinetic energy   |
-|                             | * 2              |
-+-----------------------------+------------------+
-| **rhoKE**                   | Density * KE     |
-|                             |                  |
+|                             | (from Deardorff  |
+|                             |  or MYNN)        |
 |                             |                  |
 +-----------------------------+------------------+
-| **rhoQKE**                  | Density * QKE    |
+| **rhoKE**                   | Density * KE     |
 |                             |                  |
 |                             |                  |
 +-----------------------------+------------------+
@@ -263,6 +257,9 @@ Output Options
 |                             | mass points      |
 |                             |                  |
 +-----------------------------+------------------+
+| **nut**                     | Eddy viscosity,  |
+|                             | nu_t             |
++-----------------------------+------------------+
 | **Kmv**                     | Vertical         |
 |                             | Eddy Diffusivity |
 |                             | of Momentum      |
@@ -270,6 +267,12 @@ Output Options
 | **Kmh**                     | Horizontal       |
 |                             | Eddy Diffusivity |
 |                             | of Momentum      |
+|                             | (Note: For LES,  |
+|                             | this is the      |
+|                             | _dynamic_ eddy   |
+|                             | viscosity, mu_t  |
+|                             | = rho * nu_t     |
+|                             | and Kmh==Kmv)    |
 +-----------------------------+------------------+
 | **Khv**                     | Vertical         |
 |                             | Eddy Diffusivity |
diff --git a/Exec/ABL/ERF_Prob.H b/Exec/ABL/ERF_Prob.H
index 30d904589..4e005f280 100644
--- a/Exec/ABL/ERF_Prob.H
+++ b/Exec/ABL/ERF_Prob.H
@@ -11,7 +11,8 @@ struct ProbParm : ProbParmDefaults {
   amrex::Real rho_0 = 0.0;
   amrex::Real T_0   = 0.0;
   amrex::Real A_0   = 1.0;
-  amrex::Real KE_0  = 0.1;
+  amrex::Real KE_0  = 0.1;  // initialize to calculated rho_hse times input KE
+  amrex::Real rhoKE_0 = -1; // alternatively, initialize to specified (rho*KE)
 
   amrex::Real KE_decay_height = -1;
   amrex::Real KE_decay_order  =  1;
diff --git a/Exec/ABL/ERF_Prob.cpp b/Exec/ABL/ERF_Prob.cpp
index d55164d73..5b6bc94f9 100644
--- a/Exec/ABL/ERF_Prob.cpp
+++ b/Exec/ABL/ERF_Prob.cpp
@@ -17,6 +17,7 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi)
   pp.query("T_0", parms.T_0);
   pp.query("A_0", parms.A_0);
   pp.query("KE_0", parms.KE_0);
+  pp.query("rhoKE_0", parms.rhoKE_0);
   pp.query("KE_decay_height", parms.KE_decay_height);
   pp.query("KE_decay_order", parms.KE_decay_order);
 
@@ -126,7 +127,11 @@ Problem::init_custom_pert(
     // Set an initial value for SGS KE
     if (state_pert.nComp() > RhoKE_comp) {
         // Deardorff
-        state_pert(i, j, k, RhoKE_comp) = r_hse(i,j,k) * parms_d.KE_0;
+        if (parms_d.rhoKE_0 > 0) {
+            state_pert(i, j, k, RhoKE_comp) = parms_d.rhoKE_0;
+        } else {
+            state_pert(i, j, k, RhoKE_comp) = r_hse(i,j,k) * parms_d.KE_0;
+        }
         if (parms_d.KE_decay_height > 0) {
             // scale initial SGS kinetic energy with height
             state_pert(i, j, k, RhoKE_comp) *= max(
diff --git a/Exec/ABL/inputs.read b/Exec/ABL/inputs.read
index f56b3157d..8e00b9380 100644
--- a/Exec/ABL/inputs.read
+++ b/Exec/ABL/inputs.read
@@ -45,8 +45,6 @@ erf.plot_int_1      = 100       # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs.write b/Exec/ABL/inputs.write
index a449e3aa6..e70f5bf38 100644
--- a/Exec/ABL/inputs.write
+++ b/Exec/ABL/inputs.write
@@ -38,8 +38,6 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_DataSampler b/Exec/ABL/inputs_DataSampler
index ac46484c4..86d2b129b 100644
--- a/Exec/ABL/inputs_DataSampler
+++ b/Exec/ABL/inputs_DataSampler
@@ -48,8 +48,6 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_GABLS1_deardorff b/Exec/ABL/inputs_GABLS1_deardorff
index 1706bee02..3e32c1aec 100644
--- a/Exec/ABL/inputs_GABLS1_deardorff
+++ b/Exec/ABL/inputs_GABLS1_deardorff
@@ -76,7 +76,6 @@ erf.les_type = "Deardorff"
 erf.Ck       = 0.1  # Coefficient in Moeng1984, Eqn. 19
 erf.Ce       = 0.7  # Note: Ce_lcoeff = C_e - 1.9*C_k
 erf.Ce_wall  = 3.9  # To account for "wall effects"
-erf.sigma_k  = 0.5  # TKE diffusion coeff = 2*Km = Km * inv_sigma_k, Moeng1984, Eqn. 15
 
 erf.rayleigh_damp_U = false
 erf.rayleigh_damp_V = false
diff --git a/Exec/ABL/inputs_canopy b/Exec/ABL/inputs_canopy
index 01bf340c8..a339f35cf 100644
--- a/Exec/ABL/inputs_canopy
+++ b/Exec/ABL/inputs_canopy
@@ -36,8 +36,6 @@ erf.plot_int_1      = 50        # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_deardorff b/Exec/ABL/inputs_deardorff
index 233f76208..23d37f3fc 100644
--- a/Exec/ABL/inputs_deardorff
+++ b/Exec/ABL/inputs_deardorff
@@ -35,30 +35,27 @@ erf.plot_int_1        = 10        # number of timesteps between plotfiles
 erf.plot_vars_1       = density rhoKE rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
 erf.les_type = "Deardorff"
-erf.Ck       = 0.1
-erf.sigma_k  = 1.0
-erf.Ce       = 0.1
+erf.Ck       = 0.1  # Coefficient in Moeng1984, Eqn. 19
+erf.Ce       = 0.7  # Note: Ce_lcoeff = C_e - 1.9*C_k
+erf.Ce_wall  = 3.9  # To account for "wall effects"
 
 erf.init_type = "uniform"
-erf.KE_0 = 0.1 # for Deardorff
 
-# PROBLEM PARAMETERS
+# PROBLEM PARAMETERS -- set these for uniform init only
 prob.rho_0 = 1.0
-prob.A_0 = 1.0
-
-prob.U_0 = 10.0
-prob.V_0 = 0.0
-prob.W_0 = 0.0
-prob.T_0 = 300.0
+prob.A_0   = 1.0 # advected scalar
+prob.U_0   = 10.0
+prob.V_0   = 0.0
+prob.W_0   = 0.0
+prob.T_0   = 300.0
+prob.KE_0  = 0.1
 
 # Higher values of perturbations lead to instability
 # Instability seems to be coming from BC
 prob.U_0_Pert_Mag = 0.08
-prob.V_0_Pert_Mag = 0.08 #
+prob.V_0_Pert_Mag = 0.08
 prob.W_0_Pert_Mag = 0.0
diff --git a/Exec/ABL/inputs_deardorff_msf b/Exec/ABL/inputs_deardorff_msf
index 45c41b2fd..1ec1196f4 100644
--- a/Exec/ABL/inputs_deardorff_msf
+++ b/Exec/ABL/inputs_deardorff_msf
@@ -38,31 +38,27 @@ erf.plot_int_1        = 1        # number of timesteps between plotfiles
 erf.plot_vars_1       = density rhoKE rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 1.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "Constant"
+erf.molec_diff_type = "None"
 erf.les_type = "Deardorff"
-erf.rho0_trans = 1.0 
-erf.dynamicViscosity = 75.0 
-erf.Ck       = 0.1
-erf.sigma_k  = 1.0
-erf.Ce       = 0.1
+erf.Ck       = 0.1  # Coefficient in Moeng1984, Eqn. 19
+erf.Ce       = 0.7  # Note: Ce_lcoeff = C_e - 1.9*C_k
+erf.Ce_wall  = 3.9  # To account for "wall effects"
 
 erf.init_type = "uniform"
-erf.KE_0 = 0.1 # for Deardorff
 
-# PROBLEM PARAMETERS
+# PROBLEM PARAMETERS -- set these for uniform init only
 prob.rho_0 = 1.0
-prob.A_0 = 1.0
-
-prob.U_0 = 10.0
-prob.V_0 = 0.0
-prob.W_0 = 0.0
+prob.A_0   = 1.0 # advected scalar
+prob.U_0   = 10.0
+prob.V_0   = 0.0
+prob.W_0   = 0.0
+prob.T_0   = 300.0
+prob.KE_0  = 0.1
 
 # Higher values of perturbations lead to instability
 # Instability seems to be coming from BC
 prob.U_0_Pert_Mag = 0.08
-prob.V_0_Pert_Mag = 0.08 #
+prob.V_0_Pert_Mag = 0.08
 prob.W_0_Pert_Mag = 0.0
diff --git a/Exec/ABL/inputs_deardorff_no_msf b/Exec/ABL/inputs_deardorff_no_msf
index 1df07410c..456182744 100644
--- a/Exec/ABL/inputs_deardorff_no_msf
+++ b/Exec/ABL/inputs_deardorff_no_msf
@@ -37,31 +37,27 @@ erf.plot_int_1        = 1         # number of timesteps between plotfiles
 erf.plot_vars_1       = density rhoKE rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 1.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "Constant"
+erf.molec_diff_type = "None"
 erf.les_type = "Deardorff"
-erf.rho0_trans = 1.0 
-erf.dynamicViscosity = 75.0 
-erf.Ck       = 0.1
-erf.sigma_k  = 1.0
-erf.Ce       = 0.1
+erf.Ck       = 0.1  # Coefficient in Moeng1984, Eqn. 19
+erf.Ce       = 0.7  # Note: Ce_lcoeff = C_e - 1.9*C_k
+erf.Ce_wall  = 3.9  # To account for "wall effects"
 
 erf.init_type = "uniform"
-erf.KE_0 = 0.1 # for Deardorff
 
-# PROBLEM PARAMETERS
+# PROBLEM PARAMETERS -- set these for uniform init only
 prob.rho_0 = 1.0
-prob.A_0 = 1.0
-
-prob.U_0 = 10.0
-prob.V_0 = 0.0
-prob.W_0 = 0.0
+prob.A_0   = 1.0 # advected scalar
+prob.U_0   = 10.0
+prob.V_0   = 0.0
+prob.W_0   = 0.0
+prob.T_0   = 300.0
+prob.KE_0  = 0.1
 
 # Higher values of perturbations lead to instability
 # Instability seems to be coming from BC
 prob.U_0_Pert_Mag = 0.08
-prob.V_0_Pert_Mag = 0.08 #
+prob.V_0_Pert_Mag = 0.08
 prob.W_0_Pert_Mag = 0.0
diff --git a/Exec/ABL/inputs_most b/Exec/ABL/inputs_most
index 930c35411..5a25428df 100644
--- a/Exec/ABL/inputs_most
+++ b/Exec/ABL/inputs_most
@@ -39,8 +39,6 @@ erf.plot_int_1      = 10        # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_most_bomex b/Exec/ABL/inputs_most_bomex
index 7fac147d8..57a0cff9f 100644
--- a/Exec/ABL/inputs_most_bomex
+++ b/Exec/ABL/inputs_most_bomex
@@ -43,8 +43,6 @@ erf.plot_int_1      = 10        # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta qv qc qp
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_most_pbl b/Exec/ABL/inputs_most_pbl
index 151c1e8fe..c46ef5854 100644
--- a/Exec/ABL/inputs_most_pbl
+++ b/Exec/ABL/inputs_most_pbl
@@ -42,8 +42,6 @@ erf.plot_int_1      = 100       # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_numdiff b/Exec/ABL/inputs_numdiff
index 157ba78f2..e59b0ac37 100644
--- a/Exec/ABL/inputs_numdiff
+++ b/Exec/ABL/inputs_numdiff
@@ -35,33 +35,29 @@ erf.plot_int_1        = 1        # number of timesteps between plotfiles
 erf.plot_vars_1       = density rhoKE rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
 erf.les_type = "Deardorff"
-erf.Ck       = 0.1
-erf.sigma_k  = 1.0
-erf.Ce       = 0.1
+erf.Ck       = 0.1  # Coefficient in Moeng1984, Eqn. 19
+erf.Ce       = 0.7  # Note: Ce_lcoeff = C_e - 1.9*C_k
+erf.Ce_wall  = 3.9  # To account for "wall effects"
 
-erf.use_NumDiff  = true
-erf.NumDiffCoeff = 0.5
+erf.num_diff_coeff = 0.5
 
 erf.init_type = "uniform"
-erf.KE_0 = 0.1 # for Deardorff
 
-# PROBLEM PARAMETERS
+# PROBLEM PARAMETERS -- set these for uniform init only
 prob.rho_0 = 1.0
-prob.A_0   = 1.0
-
-prob.U_0 = 10.0
-prob.V_0 = 0.0
-prob.W_0 = 0.0
-prob.T_0 = 300.0
+prob.A_0   = 1.0 # advected scalar
+prob.U_0   = 10.0
+prob.V_0   = 0.0
+prob.W_0   = 0.0
+prob.T_0   = 300.0
+prob.KE_0  = 0.1
 
 # Higher values of perturbations lead to instability
 # Instability seems to be coming from BC
 prob.U_0_Pert_Mag = 0.08
-prob.V_0_Pert_Mag = 0.08 
+prob.V_0_Pert_Mag = 0.08
 prob.W_0_Pert_Mag = 0.0
diff --git a/Exec/ABL/inputs_omp b/Exec/ABL/inputs_omp
index 99b1c8a04..7fb3cfe1d 100644
--- a/Exec/ABL/inputs_omp
+++ b/Exec/ABL/inputs_omp
@@ -43,13 +43,10 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "Constant"
-erf.dynamicViscosity = 1.0
-    
 erf.les_type = "None"
-erf.Ck       = 0.1
-erf.sigma_k  = 1.0
-erf.Ce       = 0.1
+
+erf.molec_diff_type = "Constant"
+erf.dynamic_viscosity = 1.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/ABL/inputs_sample b/Exec/ABL/inputs_sample
index bc5659681..b3d05eae5 100644
--- a/Exec/ABL/inputs_sample
+++ b/Exec/ABL/inputs_sample
@@ -43,8 +43,6 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_smagorinsky b/Exec/ABL/inputs_smagorinsky
index e9d8122ba..ca5d96661 100644
--- a/Exec/ABL/inputs_smagorinsky
+++ b/Exec/ABL/inputs_smagorinsky
@@ -35,8 +35,6 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/ABL/inputs_smagorinsky_msf b/Exec/ABL/inputs_smagorinsky_msf
index 28064400d..5ac87fa36 100644
--- a/Exec/ABL/inputs_smagorinsky_msf
+++ b/Exec/ABL/inputs_smagorinsky_msf
@@ -42,11 +42,12 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "Constant"
-erf.dynamicViscosity = 1.0
 erf.les_type        = "Smagorinsky"
 erf.Cs              = 0.1
 
+erf.molec_diff_type = "Constant"
+erf.dynamic_viscosity = 1.0
+
 erf.init_type = "uniform"
 
 # PROBLEM PARAMETERS
diff --git a/Exec/ABL/inputs_smagorinsky_no_msf b/Exec/ABL/inputs_smagorinsky_no_msf
index fffe9717b..db272e42d 100644
--- a/Exec/ABL/inputs_smagorinsky_no_msf
+++ b/Exec/ABL/inputs_smagorinsky_no_msf
@@ -41,11 +41,12 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "Constant"
-erf.dynamicViscosity = 1.0
 erf.les_type        = "Smagorinsky"
 erf.Cs              = 0.1
 
+erf.molec_diff_type = "Constant"
+erf.dynamic_viscosity = 1.0
+
 erf.init_type = "uniform"
 
 # PROBLEM PARAMETERS
diff --git a/Exec/ABL/inputs_vel_avg b/Exec/ABL/inputs_vel_avg
index 9b114b86d..39ab85970 100644
--- a/Exec/ABL/inputs_vel_avg
+++ b/Exec/ABL/inputs_vel_avg
@@ -36,30 +36,27 @@ erf.plot_int_1        = 10        # number of timesteps between plotfiles
 erf.plot_vars_1       = density rhoKE rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta u_t_avg v_t_avg w_t_avg umag_t_avg
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
 erf.les_type = "Deardorff"
-erf.Ck       = 0.1
-erf.sigma_k  = 1.0
-erf.Ce       = 0.1
+erf.Ck       = 0.1  # Coefficient in Moeng1984, Eqn. 19
+erf.Ce       = 0.7  # Note: Ce_lcoeff = C_e - 1.9*C_k
+erf.Ce_wall  = 3.9  # To account for "wall effects"
 
 erf.init_type = "uniform"
-erf.KE_0 = 0.1 # for Deardorff
 
-# PROBLEM PARAMETERS
+# PROBLEM PARAMETERS -- set these for uniform init only
 prob.rho_0 = 1.0
-prob.A_0 = 1.0
-
-prob.U_0 = 10.0
-prob.V_0 = 0.0
-prob.W_0 = 0.0
-prob.T_0 = 300.0
+prob.A_0   = 1.0 # advected scalar
+prob.U_0   = 10.0
+prob.V_0   = 0.0
+prob.W_0   = 0.0
+prob.T_0   = 300.0
+prob.KE_0  = 0.1
 
 # Higher values of perturbations lead to instability
 # Instability seems to be coming from BC
 prob.U_0_Pert_Mag = 0.08
-prob.V_0_Pert_Mag = 0.08 #
+prob.V_0_Pert_Mag = 0.08
 prob.W_0_Pert_Mag = 0.0
diff --git a/Exec/DevTests/ABL_with_WW3/inputs_mpmd b/Exec/DevTests/ABL_with_WW3/inputs_mpmd
index 78e6e6650..26c3c7b46 100644
--- a/Exec/DevTests/ABL_with_WW3/inputs_mpmd
+++ b/Exec/DevTests/ABL_with_WW3/inputs_mpmd
@@ -35,8 +35,6 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
 erf.molec_diff_type = "None"
diff --git a/Exec/DevTests/EB_Test/inputs b/Exec/DevTests/EB_Test/inputs
index 75e3e23f7..99ed8fa5e 100644
--- a/Exec/DevTests/EB_Test/inputs
+++ b/Exec/DevTests/EB_Test/inputs
@@ -61,7 +61,6 @@ erf.les_type = "None"
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.alpha_T = 0.0
 erf.alpha_C = 0.0
diff --git a/Exec/DevTests/LandSurfaceModel/inputs b/Exec/DevTests/LandSurfaceModel/inputs
index 0f0edb4c8..3071486a9 100644
--- a/Exec/DevTests/LandSurfaceModel/inputs
+++ b/Exec/DevTests/LandSurfaceModel/inputs
@@ -47,15 +47,12 @@ erf.plot_vars_1     = density rhotheta rhoadv_0 x_velocity y_velocity z_velocity
 erf.plot_lsm = true
 
 # SOLVER CHOICE
-erf.alpha_T = 1.0
-erf.alpha_C = 1.0
 erf.use_gravity = true
 
 erf.molec_diff_type = "None"
 erf.les_type        = "Smagorinsky"
 erf.Cs              = 0.1
 #erf.pbl_type        = "MYNN2.5"
-#erf.KE_0           = 0.5
      
 erf.terrain_type = Static
 erf.terrain_smoothing = 2
diff --git a/Exec/DevTests/MetGrid/inputs b/Exec/DevTests/MetGrid/inputs
index e9ceff45d..c0e1ebc86 100644
--- a/Exec/DevTests/MetGrid/inputs
+++ b/Exec/DevTests/MetGrid/inputs
@@ -47,8 +47,6 @@ erf.plot_int_1      = 10          # number of timesteps between plotfiles
 erf.plot_vars_1     = density dens_hse rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta z_phys mapfac pres_hse pert_pres 
 
 # SOLVER CHOICE
-erf.alpha_T = 1.0
-erf.alpha_C = 1.0
 erf.use_gravity = true
 
 erf.molec_diff_type = "None"
diff --git a/Exec/DevTests/MetGrid/inputs_flowmas_metgrid b/Exec/DevTests/MetGrid/inputs_flowmas_metgrid
index cfef82545..ffbb9f27e 100644
--- a/Exec/DevTests/MetGrid/inputs_flowmas_metgrid
+++ b/Exec/DevTests/MetGrid/inputs_flowmas_metgrid
@@ -43,8 +43,6 @@ erf.plot_int_1      = 25          # number of timesteps between plotfiles
 erf.plot_vars_1     = density dens_hse rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta z_phys mapfac pres_hse dens_hse pert_pres pert_dens rhoQ1 rhoQ2 rhoQ3 qv qc
 
 # SOLVER CHOICE
-erf.alpha_T = 1.0
-erf.alpha_C = 1.0
 erf.use_gravity = true
 
 erf.molec_diff_type = "None"
diff --git a/Exec/DevTests/MetGrid/inputs_flowmas_metgrid_NoZlev b/Exec/DevTests/MetGrid/inputs_flowmas_metgrid_NoZlev
index 0e0f6ed8a..9fc1aa4e7 100644
--- a/Exec/DevTests/MetGrid/inputs_flowmas_metgrid_NoZlev
+++ b/Exec/DevTests/MetGrid/inputs_flowmas_metgrid_NoZlev
@@ -39,8 +39,6 @@ erf.plot_int_1      = 25          # number of timesteps between plotfiles
 erf.plot_vars_1     = density dens_hse rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta z_phys mapfac pres_hse dens_hse pert_pres pert_dens rhoQ1 rhoQ2 rhoQ3 qv qc
 
 # SOLVER CHOICE
-erf.alpha_T = 1.0
-erf.alpha_C = 1.0
 erf.use_gravity = true
 
 erf.molec_diff_type = "None"
diff --git a/Exec/DevTests/MetGrid/inputs_flowmas_wrfinput b/Exec/DevTests/MetGrid/inputs_flowmas_wrfinput
index 597c4a240..1ed9e17ce 100644
--- a/Exec/DevTests/MetGrid/inputs_flowmas_wrfinput
+++ b/Exec/DevTests/MetGrid/inputs_flowmas_wrfinput
@@ -43,8 +43,6 @@ erf.plot_int_1      = 25          # number of timesteps between plotfiles
 erf.plot_vars_1     = density dens_hse rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta z_phys mapfac pres_hse dens_hse pert_pres pert_dens rhoQ1 rhoQ2 rhoQ3 qv qc
 
 # SOLVER CHOICE
-erf.alpha_T = 1.0
-erf.alpha_C = 1.0
 erf.use_gravity = true
 
 erf.molec_diff_type = None
diff --git a/Exec/DevTests/MultiBlock/inputs_crse_periodic b/Exec/DevTests/MultiBlock/inputs_crse_periodic
index 163966991..60ea1a086 100644
--- a/Exec/DevTests/MultiBlock/inputs_crse_periodic
+++ b/Exec/DevTests/MultiBlock/inputs_crse_periodic
@@ -11,7 +11,7 @@ geometry.prob_lo     = -25600.   0.    0.
 geometry.prob_hi     =  25600. 400. 6400.
 
 amr.n_cell           =  2048   4    256   # dx=dy=dz=25 m, Straka et al 1993 / Xue et al 2000
-amr.n_cell           =   512   4     64   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           =   512   4     64   # dx=dy=dz=100 m
 
 # periodic in x to match WRF setup
 # - as an alternative, could use symmetry at x=0 and outflow at x=25600
@@ -20,8 +20,8 @@ zlo.type = "SlipWall"
 zhi.type = "SlipWall"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 1.0      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.25     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 1.0      # fixed time step [s]
+erf.fixed_fast_dt  = 0.25     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -45,13 +45,13 @@ erf.use_gravity = true
 erf.use_coriolis = false
 
 erf.les_type         = "None"
+
 #
 # diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
 
 # PROBLEM PARAMETERS (optional)
 prob.T_0 = 300.0
diff --git a/Exec/DevTests/MultiBlock/inputs_erf1 b/Exec/DevTests/MultiBlock/inputs_erf1
index 0c6d6cf85..f442b6cd5 100644
--- a/Exec/DevTests/MultiBlock/inputs_erf1
+++ b/Exec/DevTests/MultiBlock/inputs_erf1
@@ -41,10 +41,9 @@ erf1.use_coriolis         = false
 erf1.les_type             = "None"
 
 # DIFFUSION COEFF
-erf1.molec_diff_type  = "ConstantAlpha"
-erf1.rho0_trans       = 1.0 
-erf1.dynamicViscosity = 75.0 
-erf1.alpha_T          = 75.0
+erf1.molec_diff_type   = "ConstantAlpha"
+erf1.dynamic_viscosity = 75.0
+erf1.alpha_T           = 75.0
 
 # PROBLEM PARAMETERS (optional)
 prob.T_0 = 300.0
diff --git a/Exec/DevTests/MultiBlock/inputs_erf2 b/Exec/DevTests/MultiBlock/inputs_erf2
index 8646032b0..61cc692ac 100644
--- a/Exec/DevTests/MultiBlock/inputs_erf2
+++ b/Exec/DevTests/MultiBlock/inputs_erf2
@@ -41,10 +41,9 @@ erf2.use_coriolis         = false
 erf2.les_type             = "None"
 
 # DIFFUSION COEFF
-erf2.molec_diff_type  = "ConstantAlpha"
-erf2.rho0_trans       = 1.0 
-erf2.dynamicViscosity = 75.0 
-erf2.alpha_T          = 75.0
+erf2.molec_diff_type   = "ConstantAlpha"
+erf2.dynamic_viscosity = 75.0
+erf2.alpha_T           = 75.0
 
 # PROBLEM PARAMETERS (optional)
 prob.T_0 = 300.0
diff --git a/Exec/DevTests/Radiation/inputs_radiation b/Exec/DevTests/Radiation/inputs_radiation
index 12fcd8e87..3683db5d0 100644
--- a/Exec/DevTests/Radiation/inputs_radiation
+++ b/Exec/DevTests/Radiation/inputs_radiation
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 2048 1024 2048
 # PROBLEM SIZE & GEOMETRY
 geometry.prob_lo     = -25600.   0.    0.
 geometry.prob_hi     =  25600. 400. 12800.
-amr.n_cell           =  128    4    32    # dx=dy=dz=100 m
+amr.n_cell           =  128    4    32
 
 # periodic in x to match WRF setup
 # - as an alternative, could use symmetry at x=0 and outflow at x=25600
@@ -18,8 +18,8 @@ zlo.type = "SlipWall"
 zhi.type = "SlipWall"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 1.0      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.25     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 1.0      # fixed time step [s]
+erf.fixed_fast_dt  = 0.25     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -47,18 +47,15 @@ erf.use_coriolis = false
 
 erf.moisture_model = "SAM"
 erf.les_type = "Deardorff"
-erf.KE_0 = 0.1 # for Deardorff
-#erf.les_type = "None"
-#
-# diffusion coefficient from Straka, K = 75 m^2/s
-#
+
 #erf.molec_diff_type = "ConstantAlpha"
 erf.molec_diff_type = "None"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 75.0 # [m^2/s]
+#erf.dynamic_viscosity = 75.0 # [kg/(m-s)]
+#erf.alpha_T = 75.0 # [m^2/s]
 
 # PROBLEM PARAMETERS (optional)
 prob.T_0 = 300.0
 prob.U_0 = 0
+prob.KE_0 = 0.1
+
 prob.T_pert = 3
diff --git a/Exec/DevTests/TropicalCyclone/inputs b/Exec/DevTests/TropicalCyclone/inputs
index 7373205bc..68020847a 100644
--- a/Exec/DevTests/TropicalCyclone/inputs
+++ b/Exec/DevTests/TropicalCyclone/inputs
@@ -65,9 +65,8 @@ erf.pbl_type = "MYNN2.5"
 erf.advect_KE = false
 erf.les_type = "None"
 erf.molec_diff_type = "None"
-#erf.molec_diff_type  = "Constant"
-#erf.dynamicViscosity = 0.0 # 5.0
-#erf.Cs = 0.16
+#erf.molec_diff_type = "Constant"
+#erf.dynamic_viscosity = 0.0  #5.0
 
 erf.dycore_horiz_adv_type  = "Upwind_5th"
 erf.dycore_vert_adv_type   = "Upwind_3rd"
diff --git a/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_x b/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_x
index a2e7b7604..9ef36f83a 100644
--- a/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_x
+++ b/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_x
@@ -42,9 +42,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 0.1
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_y b/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_y
index 5af596575..bcc372641 100644
--- a/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_y
+++ b/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_y
@@ -42,9 +42,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 0.1
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_x b/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_x
index 2e20c2a29..21db47fcb 100644
--- a/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_x
+++ b/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_x
@@ -42,10 +42,9 @@ erf.use_gravity            = false
 erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 
-erf.les_type         = "None"
-erf.rho0_trans       = 1.0
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 0.1
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
 
 erf.use_coriolis = false
 erf.abl_driver_type = "PressureGradient"
diff --git a/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_y b/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_y
index 21f190d3d..a4ad895c7 100644
--- a/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_y
+++ b/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_y
@@ -42,10 +42,9 @@ erf.use_gravity            = false
 erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 
-erf.les_type         = "None"
-erf.rho0_trans       = 1.0
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 0.1
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
 
 erf.use_coriolis = false
 erf.abl_driver_type   = "PressureGradient"
diff --git a/Exec/DryRegTests/DensityCurrent/inputs_amr b/Exec/DryRegTests/DensityCurrent/inputs_amr
index df18c6b85..51d56c83b 100644
--- a/Exec/DryRegTests/DensityCurrent/inputs_amr
+++ b/Exec/DryRegTests/DensityCurrent/inputs_amr
@@ -58,10 +58,9 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
 
 erf.c_p = 1004.0
 
diff --git a/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain b/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain
index 20d90cdd8..7c35c2608 100644
--- a/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain
+++ b/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain
@@ -70,10 +70,9 @@ erf.les_type     = None
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
 
 erf.c_p = 1004.0
 
diff --git a/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain_zlev b/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain_zlev
index 1a339c5b6..cbbbfa0f2 100644
--- a/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain_zlev
+++ b/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain_zlev
@@ -52,10 +52,9 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
 
 erf.c_p = 1004.0
 
diff --git a/Exec/DryRegTests/DensityCurrent/inputs_refsoln b/Exec/DryRegTests/DensityCurrent/inputs_refsoln
index a2d56078e..f0b341064 100644
--- a/Exec/DryRegTests/DensityCurrent/inputs_refsoln
+++ b/Exec/DryRegTests/DensityCurrent/inputs_refsoln
@@ -50,10 +50,9 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
 
 erf.c_p = 1004.0
 
diff --git a/Exec/DryRegTests/DensityCurrent/inputs_wrf_baseline b/Exec/DryRegTests/DensityCurrent/inputs_wrf_baseline
index e9c6ae9ad..2fd64ff93 100644
--- a/Exec/DryRegTests/DensityCurrent/inputs_wrf_baseline
+++ b/Exec/DryRegTests/DensityCurrent/inputs_wrf_baseline
@@ -46,10 +46,9 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
 
 erf.c_p = 1004.0
 
diff --git a/Exec/DryRegTests/EkmanSpiral/ERF_Prob.cpp b/Exec/DryRegTests/EkmanSpiral/ERF_Prob.cpp
index ed6f108ae..c0c4fde83 100644
--- a/Exec/DryRegTests/EkmanSpiral/ERF_Prob.cpp
+++ b/Exec/DryRegTests/EkmanSpiral/ERF_Prob.cpp
@@ -72,7 +72,7 @@ Problem::init_custom_pert(
         Real coriolis_factor = 4.0 * PI / rot_time_period;
 
         Real Az;
-        pp.get("dynamicViscosity", Az); // dynamic viscosity [kg-m/s]
+        pp.get("dynamic_viscosity", Az); // dynamic viscosity [kg-m/s]
         Az = Az / parms.rho_0; // kinematic viscosity [m^2/s]
 
         Vector<Real> abl_geo_wind(3);
diff --git a/Exec/DryRegTests/EkmanSpiral/inputs_custom b/Exec/DryRegTests/EkmanSpiral/inputs_custom
index 2bf92fc18..c3411a8a5 100644
--- a/Exec/DryRegTests/EkmanSpiral/inputs_custom
+++ b/Exec/DryRegTests/EkmanSpiral/inputs_custom
@@ -41,9 +41,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 5.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 5.0
 
 erf.use_coriolis = true
 erf.abl_driver_type = "GeostrophicWind"
diff --git a/Exec/DryRegTests/EkmanSpiral/inputs_ideal b/Exec/DryRegTests/EkmanSpiral/inputs_ideal
index a2d90e5fb..5f26bdd18 100644
--- a/Exec/DryRegTests/EkmanSpiral/inputs_ideal
+++ b/Exec/DryRegTests/EkmanSpiral/inputs_ideal
@@ -41,9 +41,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = true
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 5.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 5.0
 
 erf.use_coriolis = true
 erf.abl_driver_type = "GeostrophicWind"
diff --git a/Exec/DryRegTests/EkmanSpiral/inputs_input_sounding b/Exec/DryRegTests/EkmanSpiral/inputs_input_sounding
index c7b8822ea..025b6600f 100644
--- a/Exec/DryRegTests/EkmanSpiral/inputs_input_sounding
+++ b/Exec/DryRegTests/EkmanSpiral/inputs_input_sounding
@@ -41,9 +41,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = true
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 5.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 5.0
 
 erf.use_coriolis = true
 erf.abl_driver_type = "GeostrophicWind"
diff --git a/Exec/DryRegTests/IsentropicVortex/inputs_advecting b/Exec/DryRegTests/IsentropicVortex/inputs_advecting
index f4ea247a8..0d70bb845 100644
--- a/Exec/DryRegTests/IsentropicVortex/inputs_advecting
+++ b/Exec/DryRegTests/IsentropicVortex/inputs_advecting
@@ -46,7 +46,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Exec/DryRegTests/IsentropicVortex/inputs_advecting_ml b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_ml
index b4cf1c1f6..4fbd6c820 100644
--- a/Exec/DryRegTests/IsentropicVortex/inputs_advecting_ml
+++ b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_ml
@@ -62,7 +62,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Exec/DryRegTests/IsentropicVortex/inputs_advecting_msf b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_msf
index 1e8a1ee93..bbd798d64 100644
--- a/Exec/DryRegTests/IsentropicVortex/inputs_advecting_msf
+++ b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_msf
@@ -43,9 +43,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 1.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Exec/DryRegTests/IsentropicVortex/inputs_advecting_no_msf b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_no_msf
index bb53d1641..e663c3295 100644
--- a/Exec/DryRegTests/IsentropicVortex/inputs_advecting_no_msf
+++ b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_no_msf
@@ -41,9 +41,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 1.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Exec/DryRegTests/IsentropicVortex/inputs_stationary b/Exec/DryRegTests/IsentropicVortex/inputs_stationary
index 4aff9cba7..39663dc1e 100644
--- a/Exec/DryRegTests/IsentropicVortex/inputs_stationary
+++ b/Exec/DryRegTests/IsentropicVortex/inputs_stationary
@@ -42,7 +42,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Exec/DryRegTests/IsentropicVortex/inputs_stationary_msf b/Exec/DryRegTests/IsentropicVortex/inputs_stationary_msf
index 8dc959944..7186b6ab5 100644
--- a/Exec/DryRegTests/IsentropicVortex/inputs_stationary_msf
+++ b/Exec/DryRegTests/IsentropicVortex/inputs_stationary_msf
@@ -43,9 +43,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 1.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Exec/DryRegTests/IsentropicVortex/inputs_stationary_no_msf b/Exec/DryRegTests/IsentropicVortex/inputs_stationary_no_msf
index a1f7432fd..0c4ba2a32 100644
--- a/Exec/DryRegTests/IsentropicVortex/inputs_stationary_no_msf
+++ b/Exec/DryRegTests/IsentropicVortex/inputs_stationary_no_msf
@@ -41,9 +41,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 1.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Exec/DryRegTests/ParticlesOverWoA/inputs b/Exec/DryRegTests/ParticlesOverWoA/inputs
index e6bca805e..51c1e70e8 100644
--- a/Exec/DryRegTests/ParticlesOverWoA/inputs
+++ b/Exec/DryRegTests/ParticlesOverWoA/inputs
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     = 0.   0.  0. 
 geometry.prob_hi     = 10.  1.  2.
 
-amr.n_cell           = 256  8   64   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 256  8   64
 
 geometry.is_periodic = 0 1 0
 
@@ -74,11 +74,10 @@ erf.dycore_vert_adv_type   = Centered_2nd
 erf.dryscal_horiz_adv_type = Centered_2nd
 erf.dryscal_vert_adv_type  = Centered_2nd
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO b/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO
index 8bd32f343..d3d8fcd61 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO
@@ -48,7 +48,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO_Z b/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO_Z
index 774bb4e00..536078c02 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO_Z
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO_Z
@@ -49,7 +49,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_adv_diff_uniformU b/Exec/DryRegTests/ScalarAdvDiff/inputs_adv_diff_uniformU
index c0458e886..f3d0240e5 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_adv_diff_uniformU
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_adv_diff_uniformU
@@ -40,10 +40,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow b/Exec/DryRegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow
index ded2cc687..5e594cf05 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow
@@ -48,10 +48,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU
index 7c90ce2e0..cb6047c1d 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU
@@ -41,7 +41,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_msf
index 9bf80175f..a54fbbe55 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_msf
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_msf
@@ -46,7 +46,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf
index 7ec1a8fdd..3de792c5a 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf
@@ -45,7 +45,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU
index e37e9bebe..120a5e600 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU
@@ -41,7 +41,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_msf
index 118895ae3..dbd9e530d 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_msf
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_msf
@@ -45,7 +45,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf
index 7b074a262..71813013c 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf
@@ -43,7 +43,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_gaussian b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_gaussian
index 3646000d4..9c67e953b 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_gaussian
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_gaussian
@@ -40,10 +40,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_msf
index 66b8e6ef7..ae78475be 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_msf
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_msf
@@ -42,10 +42,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 1.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_no_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_no_msf
index 73e717f4f..6e26f9bad 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_no_msf
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_no_msf
@@ -40,10 +40,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 1.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_sine b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_sine
index 92b4ba54b..1f0bbe280 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_sine
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_sine
@@ -42,10 +42,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_ml b/Exec/DryRegTests/ScalarAdvDiff/inputs_ml
index e26c3a1c9..60d6e3f85 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_ml
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_ml
@@ -39,8 +39,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
 
 erf.dycore_horiz_adv_type    = "Centered_2nd"
 erf.dycore_vert_adv_type     = "Centered_2nd"
diff --git a/Exec/DryRegTests/ScalarAdvDiff/inputs_test_rayleigh b/Exec/DryRegTests/ScalarAdvDiff/inputs_test_rayleigh
index 54dd4bbfe..4eed42cda 100644
--- a/Exec/DryRegTests/ScalarAdvDiff/inputs_test_rayleigh
+++ b/Exec/DryRegTests/ScalarAdvDiff/inputs_test_rayleigh
@@ -48,7 +48,6 @@ erf.rayleigh_damp_T = true
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Exec/DryRegTests/StokesSecondProblem/inputs b/Exec/DryRegTests/StokesSecondProblem/inputs
index 1433dc9f2..0200a51bc 100644
--- a/Exec/DryRegTests/StokesSecondProblem/inputs
+++ b/Exec/DryRegTests/StokesSecondProblem/inputs
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =  0     0.  0. 
 geometry.prob_hi     =  1.0   1. 0.5
 
-amr.n_cell           = 8  4 256   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 8  4 256
 
 geometry.is_periodic = 0 1 0
 
@@ -73,11 +73,10 @@ erf.specify_terrain_velocity = true
 #erf.all_use_WENO = true
 #erf.spatial_order_WENO = 5
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 4.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 4.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/StokesSecondProblem/inputs_stretched_z_levels b/Exec/DryRegTests/StokesSecondProblem/inputs_stretched_z_levels
index 102691ed5..a2e5b38f6 100644
--- a/Exec/DryRegTests/StokesSecondProblem/inputs_stretched_z_levels
+++ b/Exec/DryRegTests/StokesSecondProblem/inputs_stretched_z_levels
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =  0   0.  0. 
 geometry.prob_hi     =  1.0   1. 1.0
 
-amr.n_cell           = 8  4 128   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 8  4 128
 
 geometry.is_periodic = 0 1 0
 
@@ -72,11 +72,10 @@ erf.terrain_z_levels = 0 0.000237889 0.000487134 0.000748273 0.00102187 0.001308
 #erf.all_use_WENO = true
 #erf.spatial_order_WENO = 5
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 2.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 2.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/TaylorGreenVortex/inputs_advdiff b/Exec/DryRegTests/TaylorGreenVortex/inputs_advdiff
index c244dd427..26e468085 100644
--- a/Exec/DryRegTests/TaylorGreenVortex/inputs_advdiff
+++ b/Exec/DryRegTests/TaylorGreenVortex/inputs_advdiff
@@ -40,9 +40,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 6.25e-4 # 1.5e-5
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 6.25e-4  #1.5e-5
 
 # PROBLEM PARAMETERS
 prob.rho_0 = 1.0
diff --git a/Exec/DryRegTests/TaylorGreenVortex/inputs_advonly b/Exec/DryRegTests/TaylorGreenVortex/inputs_advonly
index d74df1bd4..bcc38075c 100644
--- a/Exec/DryRegTests/TaylorGreenVortex/inputs_advonly
+++ b/Exec/DryRegTests/TaylorGreenVortex/inputs_advonly
@@ -42,7 +42,6 @@ erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.rho_0 = 1.0
diff --git a/Exec/DryRegTests/TaylorGreenVortex/inputs_multilevel b/Exec/DryRegTests/TaylorGreenVortex/inputs_multilevel
index e53115628..da89f2fb3 100644
--- a/Exec/DryRegTests/TaylorGreenVortex/inputs_multilevel
+++ b/Exec/DryRegTests/TaylorGreenVortex/inputs_multilevel
@@ -40,9 +40,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 6.25e-4 # 1.5e-5
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 6.25e-4  #1.5e-5
 
 # PROBLEM PARAMETERS
 prob.rho_0 = 1.0
diff --git a/Exec/DryRegTests/Terrain2d_Cylinder/inputs b/Exec/DryRegTests/Terrain2d_Cylinder/inputs
index 409940b1b..e7a6ce956 100644
--- a/Exec/DryRegTests/Terrain2d_Cylinder/inputs
+++ b/Exec/DryRegTests/Terrain2d_Cylinder/inputs
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =  0   0.  0. 
 geometry.prob_hi     =  30.0   1. 10.0
 
-amr.n_cell           = 512  4 256   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 512  4 256
 
 geometry.is_periodic = 0 1 0
 
@@ -86,11 +86,10 @@ erf.terrain_smoothing = 0
 #erf.all_use_WENO = true
 #erf.spatial_order_WENO = 5
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/Terrain2d_Cylinder/inputs.amr b/Exec/DryRegTests/Terrain2d_Cylinder/inputs.amr
index 6a92750ea..fe6384a36 100644
--- a/Exec/DryRegTests/Terrain2d_Cylinder/inputs.amr
+++ b/Exec/DryRegTests/Terrain2d_Cylinder/inputs.amr
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =  0      0.  0. 
 geometry.prob_hi     =  30.0   1. 10.0
 
-amr.n_cell           = 256  12 128   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 256  12 128
 
 geometry.is_periodic = 0 1 0
 
@@ -86,11 +86,10 @@ erf.terrain_smoothing = 0
 #erf.all_use_WENO = true
 #erf.spatial_order_WENO = 5
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/Terrain2d_Cylinder/inputs_most_test b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_most_test
index 61a45c409..9e009243f 100644
--- a/Exec/DryRegTests/Terrain2d_Cylinder/inputs_most_test
+++ b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_most_test
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     = 0.   0.  0. 
 geometry.prob_hi     = 10.  1.  2.
 
-amr.n_cell           = 256  8   64   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 256  8   64
 
 geometry.is_periodic = 1 1 0
 
@@ -73,11 +73,9 @@ erf.Cs                   = 0.1
 erf.terrain_type = Static
 erf.terrain_smoothing = 0
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/Terrain2d_Cylinder/inputs_stretched_z_levels b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_stretched_z_levels
index 3808972fd..a47dd5c8a 100644
--- a/Exec/DryRegTests/Terrain2d_Cylinder/inputs_stretched_z_levels
+++ b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_stretched_z_levels
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =  0   0.  0. 
 geometry.prob_hi     =  30.0   1. 10.0
 
-amr.n_cell           = 512  4 64   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 512  4 64
 
 geometry.is_periodic = 0 1 0
 
@@ -86,11 +86,10 @@ erf.terrain_z_levels = 0 0.0236057 0.0486738 0.0752909 0.103548 0.133541 0.16537
 #erf.all_use_WENO = true
 #erf.spatial_order_WENO = 5
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.01 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.01 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/Terrain2d_Cylinder/inputs_verification_final b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_verification_final
index 6bdaa5966..dee63df1c 100644
--- a/Exec/DryRegTests/Terrain2d_Cylinder/inputs_verification_final
+++ b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_verification_final
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =  0   0.  0. 
 geometry.prob_hi     =  30.0   1. 10.0
 
-amr.n_cell           = 512  4  256   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 512  4  256
 
 geometry.is_periodic = 0 1 0
 
@@ -81,11 +81,10 @@ erf.terrain_smoothing = 0
 #erf.all_use_WENO = true
 #erf.spatial_order_WENO = 5
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/Terrain3d_Hemisphere/inputs b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs
index 46d6ee113..9b2f6e5cf 100644
--- a/Exec/DryRegTests/Terrain3d_Hemisphere/inputs
+++ b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     = 0.   0.  0. 
 geometry.prob_hi     = 10  10  10
 
-amr.n_cell           = 128  128   128   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 128  128   128
 
 geometry.is_periodic = 0 1 0
 
@@ -82,11 +82,10 @@ erf.box1.in_box_hi =  8. 0.75
 erf.terrain_type = Static
 erf.terrain_smoothing = 0
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.1 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.1 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/Terrain3d_Hemisphere/inputs.amr b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs.amr
index 7bd3f8ea6..43a51d1ce 100644
--- a/Exec/DryRegTests/Terrain3d_Hemisphere/inputs.amr
+++ b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs.amr
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     = 0.   0.  0. 
 geometry.prob_hi     = 10  10  10
 
-amr.n_cell           = 100  100   100   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 100  100   100
 
 geometry.is_periodic = 0 1 0
 
@@ -81,11 +81,10 @@ erf.les_type = "None"
 erf.terrain_type = Static
 erf.terrain_smoothing = 0
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.1 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.1 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 # PROBLEM PARAMETERS (optional)
 prob.T_0   = 300.0
diff --git a/Exec/DryRegTests/Terrain3d_Hemisphere/inputs_most_test b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs_most_test
index 0afdbce08..c0b2765e6 100644
--- a/Exec/DryRegTests/Terrain3d_Hemisphere/inputs_most_test
+++ b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs_most_test
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     = 0.   0.  0. 
 geometry.prob_hi     = 10.  1.  2.
 
-amr.n_cell           = 256  8   64   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 256  8   64
 
 geometry.is_periodic = 1 1 0
     
@@ -67,11 +67,9 @@ erf.Cs                   = 0.1
 erf.terrain_type = Static
 erf.terrain_smoothing = 0
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/TurbulentInflow/compressible_direct_inputs b/Exec/DryRegTests/TurbulentInflow/compressible_direct_inputs
index 2799c7a3d..f0499a9d7 100644
--- a/Exec/DryRegTests/TurbulentInflow/compressible_direct_inputs
+++ b/Exec/DryRegTests/TurbulentInflow/compressible_direct_inputs
@@ -35,7 +35,6 @@ xlo.dirichlet_file = "input_ReTau395Ana_inflow.txt"
 # TIME STEP CONTROL
 erf.fixed_dt = 0.0002
 erf.fixed_mri_dt_ratio = 4
-erf.dynamicViscosity = 0.001
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 100    # timesteps between computing mass
@@ -57,8 +56,6 @@ erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure
 #erf.check_per       = 1.0
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.molec_diff_type = "None"
 erf.les_type        = "Smagorinsky"
 erf.Cs              = 0.1
diff --git a/Exec/DryRegTests/TurbulentInflow/compressible_source_inputs b/Exec/DryRegTests/TurbulentInflow/compressible_source_inputs
index 450a0d2a5..a8e510f10 100644
--- a/Exec/DryRegTests/TurbulentInflow/compressible_source_inputs
+++ b/Exec/DryRegTests/TurbulentInflow/compressible_source_inputs
@@ -35,7 +35,7 @@ xlo.dirichlet_file = "input_ReTau395Ana_inflow.txt"
 # TIME STEP CONTROL
 erf.fixed_dt = 0.0002
 erf.fixed_mri_dt_ratio = 4
-erf.dynamicViscosity = 0.001
+
 erf.fix_random_seed  = 1
 
 # DIAGNOSTICS & VERBOSITY
@@ -57,8 +57,6 @@ erf.check_file      = chk    # root name of checkpoint file
 erf.check_per       = 1.0
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.molec_diff_type = "None"
 erf.les_type        = "Smagorinsky"
 erf.Cs              = 0.1
diff --git a/Exec/DryRegTests/TurbulentInflow/incompressible_direct_inputs b/Exec/DryRegTests/TurbulentInflow/incompressible_direct_inputs
index c8344a463..dfd0e6437 100644
--- a/Exec/DryRegTests/TurbulentInflow/incompressible_direct_inputs
+++ b/Exec/DryRegTests/TurbulentInflow/incompressible_direct_inputs
@@ -37,7 +37,6 @@ xlo.theta   = 300.0
 
 # TIME STEP CONTROL
 erf.cfl = 0.5
-erf.dynamicViscosity = 0.001
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 0       # timesteps between computing mass
@@ -59,8 +58,6 @@ erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure
 #erf.check_per       = 1.0
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.molec_diff_type = "None"
 erf.les_type        = "Smagorinsky"
 erf.Cs              = 0.1
diff --git a/Exec/DryRegTests/TurbulentInflow/incompressible_source_inputs b/Exec/DryRegTests/TurbulentInflow/incompressible_source_inputs
index 8e87e102e..1205eec4a 100644
--- a/Exec/DryRegTests/TurbulentInflow/incompressible_source_inputs
+++ b/Exec/DryRegTests/TurbulentInflow/incompressible_source_inputs
@@ -37,7 +37,7 @@ xlo.theta   = 300.0
 
 # TIME STEP CONTROL
 erf.cfl = 0.5
-erf.dynamicViscosity = 0.001
+
 erf.fix_random_seed  = 1
 
 # DIAGNOSTICS & VERBOSITY
@@ -60,8 +60,6 @@ erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure
 #erf.check_per       = 1.0
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.molec_diff_type = "None"
 erf.les_type        = "Smagorinsky"
 erf.Cs              = 0.1
diff --git a/Exec/DryRegTests/WPS_Test/inputs_real_ChisholmView b/Exec/DryRegTests/WPS_Test/inputs_real_ChisholmView
index c1c362c10..f22842eb3 100644
--- a/Exec/DryRegTests/WPS_Test/inputs_real_ChisholmView
+++ b/Exec/DryRegTests/WPS_Test/inputs_real_ChisholmView
@@ -50,9 +50,9 @@ erf.terrain_type = Static
 
 erf.moisture_model = "Kessler"
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 5.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 5.0
 
 erf.use_coriolis = true
 erf.abl_driver_type = "GeostrophicWind"
diff --git a/Exec/DryRegTests/WitchOfAgnesi/inputs b/Exec/DryRegTests/WitchOfAgnesi/inputs
index c7a20f346..fbe3db8e3 100644
--- a/Exec/DryRegTests/WitchOfAgnesi/inputs
+++ b/Exec/DryRegTests/WitchOfAgnesi/inputs
@@ -62,7 +62,6 @@ erf.use_coriolis = false
 erf.les_type = "None"
 
 erf.molec_diff_type = "None"
-#erf.dynamicViscosity = 1e-5 # [kg/(m-s)]
 
 erf.rayleigh_damp_W = true
 erf.rayleigh_zdamp = 5000.0
diff --git a/Exec/DryRegTests/WitchOfAgnesi/inputs_most_test b/Exec/DryRegTests/WitchOfAgnesi/inputs_most_test
index 6d8e05809..57f19a477 100644
--- a/Exec/DryRegTests/WitchOfAgnesi/inputs_most_test
+++ b/Exec/DryRegTests/WitchOfAgnesi/inputs_most_test
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     = 0.   0.  0. 
 geometry.prob_hi     = 10.  1.  2.
 
-amr.n_cell           = 256  8   64   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 256  8   64
 
 geometry.is_periodic = 1 1 0
 
@@ -73,11 +73,9 @@ erf.Cs                   = 0.1
 erf.terrain_type = Static
 erf.terrain_smoothing = 0
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/WitchOfAgnesi/inputs_static_twolevel b/Exec/DryRegTests/WitchOfAgnesi/inputs_static_twolevel
index 90d061d00..5c0373f4d 100644
--- a/Exec/DryRegTests/WitchOfAgnesi/inputs_static_twolevel
+++ b/Exec/DryRegTests/WitchOfAgnesi/inputs_static_twolevel
@@ -54,11 +54,9 @@ erf.les_type = "None"
 erf.terrain_type = Static
 erf.terrain_smoothing = 0
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 1.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 erf.abl_driver_type = "PressureGradient"
 erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/DryRegTests/WitchOfAgnesi/inputs_zlevels b/Exec/DryRegTests/WitchOfAgnesi/inputs_zlevels
index 17bdada4b..0b315f01d 100644
--- a/Exec/DryRegTests/WitchOfAgnesi/inputs_zlevels
+++ b/Exec/DryRegTests/WitchOfAgnesi/inputs_zlevels
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =     0.    0.     0. 
 geometry.prob_hi     = 10000.  100.  3200.
 
-amr.n_cell           = 256  8   32   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 256  8   32
 
 geometry.is_periodic = 0 1 0
 
@@ -63,11 +63,9 @@ erf.terrain_z_levels = 0. 200. 300. 400. 450. 500. 600. 700. 800. 900. 1000. 110
 # TERRRAIN GRID TYPE
 erf.terrain_smoothing = 1
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 0.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
 #erf.abl_pressure_grad = -0.2 0. 0.
diff --git a/Exec/LLJ/inputs b/Exec/LLJ/inputs
index c7a85de2d..bce8927b5 100644
--- a/Exec/LLJ/inputs
+++ b/Exec/LLJ/inputs
@@ -48,9 +48,9 @@ erf.alpha_T = 0.0
 erf.alpha_C = 0.0
 erf.use_gravity = true
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 5.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 5.0
 
 # PROBLEM PARAMETERS (optional)
 prob.rho_0 = 1.0
diff --git a/Exec/MoistRegTests/Bomex/ERF_Prob.cpp b/Exec/MoistRegTests/Bomex/ERF_Prob.cpp
index 3d2839741..38a874e78 100644
--- a/Exec/MoistRegTests/Bomex/ERF_Prob.cpp
+++ b/Exec/MoistRegTests/Bomex/ERF_Prob.cpp
@@ -293,7 +293,7 @@ Problem::update_rhoqt_sources (const Real& /*time*/,
         reduce_to_max_per_height(zlevels, z_phys_cc);
     }
 
-    // Only apply temperature source below nominal inversion height
+    // Only apply moisture source below nominal inversion height
     for (int k = 0; k <= khi; k++) {
         const Real z_cc = (z_phys_cc) ? zlevels[k] : prob_lo[2] + (k+0.5)* dx[2];
         if (z_cc < parms.moisture_cutoff) {
@@ -386,7 +386,7 @@ Problem::update_geostrophic_profile (const Real& /*time*/,
 
     // const Real coriolis = 2.0 * 2.0 * PI / 86400.0; // 0.376E-4;
 
-    // Only apply temperature source below nominal inversion height
+    // Only apply momentum source below nominal inversion height
     for (int k = 0; k <= khi; k++) {
         const Real z_cc = (z_phys_cc) ? zlevels[k] : prob_lo[2] + (k+0.5)* dx[2];
         const Real u_geo_wind = -10.0 + z_cc * 0.0018;
diff --git a/Exec/MoistRegTests/Bubble/inputs_BF02_dry_bubble b/Exec/MoistRegTests/Bubble/inputs_BF02_dry_bubble
index 9992208e5..98919ed8a 100644
--- a/Exec/MoistRegTests/Bubble/inputs_BF02_dry_bubble
+++ b/Exec/MoistRegTests/Bubble/inputs_BF02_dry_bubble
@@ -54,11 +54,10 @@ erf.moisture_model  = "None"
 erf.buoyancy_type   = 1
 erf.use_moist_background = false
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # PROBLEM PARAMETERS (optional)
 # warm bubble input
diff --git a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble
index e86a8c4e0..4dcb7cc37 100644
--- a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble
+++ b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble
@@ -56,11 +56,10 @@ erf.moisture_model  = "Kessler_NoRain"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # INITIAL CONDITIONS
 #erf.init_type = "input_sounding"
diff --git a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_Kessler b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_Kessler
index 58bb41670..34da626ac 100644
--- a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_Kessler
+++ b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_Kessler
@@ -56,11 +56,10 @@ erf.moisture_model  = "Kessler"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # INITIAL CONDITIONS
 #erf.init_type = "input_sounding"
diff --git a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_OpenBC b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_OpenBC
index ea27762c6..7be25f59a 100644
--- a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_OpenBC
+++ b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_OpenBC
@@ -56,11 +56,10 @@ erf.moisture_model  = "Kessler_NoRain"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # INITIAL CONDITIONS
 #erf.init_type = "input_sounding"
diff --git a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM
index 5600feeca..2da4360d9 100644
--- a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM
+++ b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM
@@ -54,11 +54,10 @@ erf.moisture_model  = "SAM"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # PROBLEM PARAMETERS (optional)
 # warm bubble input
diff --git a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce
index fbf21a978..5ff7c8643 100644
--- a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce
+++ b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce
@@ -56,11 +56,10 @@ erf.moisture_model  = "SAM_NoIce"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # INITIAL CONDITIONS
 #erf.init_type = "input_sounding"
diff --git a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce
index d9732baa0..2e041de11 100644
--- a/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce
+++ b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce
@@ -56,11 +56,10 @@ erf.moisture_model  = "SAM_NoPrecip_NoIce"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # INITIAL CONDITIONS
 #erf.init_type = "input_sounding"
diff --git a/Exec/MoistRegTests/Bubble/inputs_grav2d_x b/Exec/MoistRegTests/Bubble/inputs_grav2d_x
index 19cfc8c01..0cd1ac8aa 100644
--- a/Exec/MoistRegTests/Bubble/inputs_grav2d_x
+++ b/Exec/MoistRegTests/Bubble/inputs_grav2d_x
@@ -20,8 +20,8 @@ zlo.type = "SlipWall"
 zhi.type = "SlipWall"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 1.0      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.25     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 1.0      # fixed time step [s]
+erf.fixed_fast_dt  = 0.25     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -53,10 +53,9 @@ erf.pbl_type        = "None"
 
 erf.c_p    = 1004.0
 
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans      = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity= 75.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s == diffusion coefficient from Straka
-erf.alpha_T         = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s == diffusion coefficient from Straka
+erf.alpha_T           = 75.0 # [m^2/s]
 
 # INITIAL CONDITIONS
 erf.init_type = ""
diff --git a/Exec/MoistRegTests/Bubble/inputs_squall2d_x b/Exec/MoistRegTests/Bubble/inputs_squall2d_x
index b801480d3..831ba74b2 100644
--- a/Exec/MoistRegTests/Bubble/inputs_squall2d_x
+++ b/Exec/MoistRegTests/Bubble/inputs_squall2d_x
@@ -16,8 +16,8 @@ zlo.type = "SlipWall"
 zhi.type = "SlipWall"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 3.0      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.75     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 3.0      # fixed time step [s]
+erf.fixed_fast_dt  = 0.75     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -48,16 +48,14 @@ erf.pbl_type        = "None"
 erf.moisture_model  = "SAM"
 erf.buoyancy_type   = 1
 
-erf.molec_diff_type = "Constant"
-erf.rho0_trans      = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity= 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T         = 0.0 # [m^2/s]
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
 
 # INITIAL CONDITIONS
 erf.init_type           = "input_sounding"
 erf.input_sounding_file = "input_sounding_squall2d"
 erf.init_sounding_ideal = 1
-erf.KE_0 = 0.1 # for Deardorff
 
 # PROBLEM PARAMETERS (optional)
 # warm bubble input
@@ -67,3 +65,4 @@ prob.z_c    = 1500.0
 prob.x_r    = 4000.0
 prob.z_r    = 1500.0
 prob.T_0    = 0.0
+prob.KE_0   = 0.1
diff --git a/Exec/MoistRegTests/Bubble/inputs_test_outflow b/Exec/MoistRegTests/Bubble/inputs_test_outflow
index 09a11d7f9..6fb7e0101 100644
--- a/Exec/MoistRegTests/Bubble/inputs_test_outflow
+++ b/Exec/MoistRegTests/Bubble/inputs_test_outflow
@@ -62,11 +62,10 @@ erf.moisture_model  = "Kessler"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # INITIAL CONDITIONS
 #erf.init_type = "input_sounding"
diff --git a/Exec/MoistRegTests/SquallLine_2D/inputs_ml b/Exec/MoistRegTests/SquallLine_2D/inputs_ml
index 4a4f50617..22c12099f 100644
--- a/Exec/MoistRegTests/SquallLine_2D/inputs_ml
+++ b/Exec/MoistRegTests/SquallLine_2D/inputs_ml
@@ -20,8 +20,8 @@ zlo.type = "SlipWall"
 zhi.type = "SlipWall"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 1.0      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.5     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 1.0     # fixed time step [s]
+erf.fixed_fast_dt  = 0.5     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -61,14 +61,11 @@ erf.use_gravity = true
 erf.buoyancy_type = 1
 erf.use_coriolis = false
 
-#
-# diffusion coefficient from Straka, K = 75 m^2/s
-#
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 100.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 100.0 # [m^2/s]
-erf.alpha_C = 100.0
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 100.0 # [kg/(m-s)]
+erf.alpha_T           = 100.0 # [m^2/s]
+erf.alpha_C           = 100.0
 
 erf.moisture_model = "Kessler"
 erf.use_moist_background = true
diff --git a/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_Gabersek b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_Gabersek
index 46484d4ad..4b13516a1 100644
--- a/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_Gabersek
+++ b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_Gabersek
@@ -19,8 +19,8 @@ zlo.type = "SlipWall"
 zhi.type = "HO_Outflow"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 0.25      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.125     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 0.25      # fixed time step [s]
+erf.fixed_fast_dt  = 0.125     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -46,18 +46,14 @@ erf.buoyancy_type = 1
 erf.use_coriolis = false
 
 #erf.les_type = "Smagorinsky"
-erf.Cs              = 0.25
+#erf.Cs              = 0.25
 erf.les_type = "None"
 
-#
-# diffusion coefficient from Straka, K = 75 m^2/s
-#
-erf.molec_diff_type = "ConstantAlpha"
-#erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 200.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 200.0 # [m^2/s]
-erf.alpha_C = 200.0
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 200.0 # [kg/(m-s)]
+erf.alpha_T           = 200.0 # [m^2/s]
+erf.alpha_C           = 200.0
 
 erf.moisture_model = "Kessler"
 erf.use_moist_background = true
diff --git a/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_SAM b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_SAM
index 3f7ea21b1..b3108af07 100644
--- a/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_SAM
+++ b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_SAM
@@ -19,8 +19,8 @@ zlo.type = "SlipWall"
 zhi.type = "Outflow"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 1.0      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.5     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 1.0     # fixed time step [s]
+erf.fixed_fast_dt  = 0.5     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -45,14 +45,11 @@ erf.use_gravity = true
 erf.buoyancy_type = 1
 erf.use_coriolis = false
 
-#
-# diffusion coefficient from Straka, K = 75 m^2/s
-#
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 100.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 100.0 # [m^2/s]
-erf.alpha_C = 100.0
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 100.0 # [kg/(m-s)]
+erf.alpha_T           = 100.0 # [m^2/s]
+erf.alpha_C           = 100.0
 
 erf.moisture_model = "SAM"
 erf.use_moist_background = true
diff --git a/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_WRF b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_WRF
index b1fea7fdb..996356788 100644
--- a/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_WRF
+++ b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_WRF
@@ -19,8 +19,8 @@ zlo.type = "SlipWall"
 zhi.type = "HO_Outflow"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 1.0      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.5     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 1.0     # fixed time step [s]
+erf.fixed_fast_dt  = 0.5     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -44,14 +44,11 @@ erf.use_gravity = true
 erf.buoyancy_type = 1
 erf.use_coriolis = false
 
-#
-# diffusion coefficient from Straka, K = 75 m^2/s
-#
-erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 100.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 100.0 # [m^2/s]
-erf.alpha_C = 100.0
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 100.0 # [kg/(m-s)]
+erf.alpha_T           = 100.0 # [m^2/s]
+erf.alpha_C           = 100.0
 
 erf.moisture_model = "Kessler"
 erf.use_moist_background = true
diff --git a/Exec/MoistRegTests/SuperCell_3D/inputs_moisture_Tissaoui b/Exec/MoistRegTests/SuperCell_3D/inputs_moisture_Tissaoui
index 4f19730c9..a006473c4 100644
--- a/Exec/MoistRegTests/SuperCell_3D/inputs_moisture_Tissaoui
+++ b/Exec/MoistRegTests/SuperCell_3D/inputs_moisture_Tissaoui
@@ -22,8 +22,8 @@ zlo.type = "SlipWall"
 zhi.type = "HO_Outflow"
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 0.5      # fixed time step [s] -- Straka et al 1993
-erf.fixed_fast_dt  = 0.25     # fixed time step [s] -- Straka et al 1993
+erf.fixed_dt       = 0.5      # fixed time step [s]
+erf.fixed_fast_dt  = 0.25     # fixed time step [s]
 
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
@@ -47,21 +47,16 @@ erf.plot_vars_1         = density rhotheta rhoQ1 rhoQ2 rhoQ3 x_velocity y_veloci
 erf.use_gravity = true
 erf.buoyancy_type = 1
 erf.use_coriolis = false
-erf.use_rayleigh_damping = false
 
 #erf.les_type = "Smagorinsky"
 erf.Cs              = 0.25
 erf.les_type = "None"
 
-#
-# diffusion coefficient from Straka, K = 75 m^2/s
-#
-erf.molec_diff_type = "ConstantAlpha"
-#erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 33.33 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 33.33 # [m^2/s]
-erf.alpha_C = 33.33
+# Constant diffusion coefficient
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 33.33 # [kg/(m-s)]
+erf.alpha_T           = 33.33 # [m^2/s]
+erf.alpha_C           = 33.33
 
 erf.moisture_model = "Kessler"
 erf.use_moist_background = true
diff --git a/Exec/SpongeTest/inputs_sponge_test b/Exec/SpongeTest/inputs_sponge_test
index 091ff6406..19b6ffc35 100644
--- a/Exec/SpongeTest/inputs_sponge_test
+++ b/Exec/SpongeTest/inputs_sponge_test
@@ -9,7 +9,7 @@ fabarray.mfiter_tile_size = 1024 1024 1024
 geometry.prob_lo     =  0   0.  0. 
 geometry.prob_hi     =  30.0   1. 10.0
 
-amr.n_cell           = 256  4 128   # dx=dy=dz=100 m, Straka et al 1993 / Xue et al 2000
+amr.n_cell           = 256  4 128
 
 geometry.is_periodic = 0 1 0
 
@@ -84,10 +84,9 @@ erf.terrain_smoothing = 0
 #erf.all_use_WENO = true
 #erf.spatial_order_WENO = 5
 
-# Diffusion coefficient from Straka, K = 75 m^2/s
+# Constant diffusion coefficient
 erf.molec_diff_type = "ConstantAlpha"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
 erf.alpha_T = 0.0 # [m^2/s]
 
 #erf.abl_driver_type = "PressureGradient"
diff --git a/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/NoTerrain/inputs_1WT_x_y b/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/NoTerrain/inputs_1WT_x_y
index 56be43a86..20f8e24d0 100644
--- a/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/NoTerrain/inputs_1WT_x_y
+++ b/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/NoTerrain/inputs_1WT_x_y
@@ -79,14 +79,13 @@ erf.moistscal_horiz_adv_type = "Centered_2nd"
 erf.moistscal_vert_adv_type  = "Centered_2nd"
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "ConstantAlpha"
-erf.les_type        = "None"
-erf.Cs              = 1.5
-erf.dynamicViscosity = 10.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 10.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.pbl_type        = "None"
 
diff --git a/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/WithTerrain/inputs_1WT_x_y b/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/WithTerrain/inputs_1WT_x_y
index 588acff90..42df5a1dc 100644
--- a/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/WithTerrain/inputs_1WT_x_y
+++ b/Exec/WindFarmTests/SingleTurbine/SimpleActuatorDisk/WithTerrain/inputs_1WT_x_y
@@ -87,14 +87,13 @@ erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure
 #erf.moistscal_vert_adv_type  = "Centered_2nd"
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "ConstantAlpha"
-erf.les_type        = "None"
-erf.Cs              = 1.5
-erf.dynamicViscosity = 10.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 10.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.pbl_type        = "None"
 
diff --git a/Exec/WindFarmTests/WindFarm/EWP/inputs_AWAKEN_EWP_KingPlains b/Exec/WindFarmTests/WindFarm/EWP/inputs_AWAKEN_EWP_KingPlains
index 940a06430..c35b52966 100644
--- a/Exec/WindFarmTests/WindFarm/EWP/inputs_AWAKEN_EWP_KingPlains
+++ b/Exec/WindFarmTests/WindFarm/EWP/inputs_AWAKEN_EWP_KingPlains
@@ -62,14 +62,13 @@ erf.plot_int_1      = 1000       # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE vorticity SMark0 SMark1
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "ConstantAlpha"
-erf.les_type        = "None"
-erf.Cs              = 1.5
-erf.dynamicViscosity = 0.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.pbl_type        = "None"
 
diff --git a/Exec/WindFarmTests/WindFarm/Fitch/inputs_AWAKEN_Fitch_KingPlains b/Exec/WindFarmTests/WindFarm/Fitch/inputs_AWAKEN_Fitch_KingPlains
index caec06c0e..bd045978a 100644
--- a/Exec/WindFarmTests/WindFarm/Fitch/inputs_AWAKEN_Fitch_KingPlains
+++ b/Exec/WindFarmTests/WindFarm/Fitch/inputs_AWAKEN_Fitch_KingPlains
@@ -62,14 +62,13 @@ erf.plot_int_1      = 1000       # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE vorticity SMark0 SMark1
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "ConstantAlpha"
-erf.les_type        = "None"
-erf.Cs              = 1.5
-erf.dynamicViscosity = 0.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.pbl_type        = "None"
 
diff --git a/Exec/WindFarmTests/WindFarm/GeneralActuatorDisk/inputs_AWAKEN_GeneralAD_KingPlains b/Exec/WindFarmTests/WindFarm/GeneralActuatorDisk/inputs_AWAKEN_GeneralAD_KingPlains
index 02cf8e49f..c0126da8d 100644
--- a/Exec/WindFarmTests/WindFarm/GeneralActuatorDisk/inputs_AWAKEN_GeneralAD_KingPlains
+++ b/Exec/WindFarmTests/WindFarm/GeneralActuatorDisk/inputs_AWAKEN_GeneralAD_KingPlains
@@ -67,14 +67,13 @@ erf.plot_int_1      = 1000       # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE vorticity SMark0 SMark1
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.molec_diff_type = "ConstantAlpha"
-erf.les_type        = "None"
-erf.Cs              = 1.5
-erf.dynamicViscosity = 0.0
+erf.les_type          = "None"
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.pbl_type        = "None"
 
diff --git a/Source/BoundaryConditions/ERF_ABLMost.H b/Source/BoundaryConditions/ERF_ABLMost.H
index f652b3d69..a5a98ec11 100644
--- a/Source/BoundaryConditions/ERF_ABLMost.H
+++ b/Source/BoundaryConditions/ERF_ABLMost.H
@@ -151,16 +151,22 @@ public:
             pp.query("most.charnock_constant",cnk_a);
             pp.query("most.charnock_viscosity",cnk_visc);
             if (cnk_a > 0) {
-                amrex::Print() << "Using Charnock relation with C_a=" << cnk_a
+                amrex::Print() << "If there is water, Charnock relation with C_a=" << cnk_a
                     << (cnk_visc? " and viscosity" : "")
+                    << " will be used"
                     << std::endl;
             } else {
-                amrex::Print() << "Using Charnock relation with variable Charnock parameter (COARE3.0)"
+                amrex::Print() << "If there is water, Charnock relation with variable Charnock parameter (COARE3.0)"
                     << (cnk_visc? " and viscosity" : "")
+                    << " will be used"
                     << std::endl;
             }
         } else if (rough_sea_string == "coare3.0") {
             rough_type_sea = RoughCalcType::CHARNOCK;
+            amrex::Print() << "If there is water, Charnock relation with variable Charnock parameter (COARE3.0)"
+                << (cnk_visc? " and viscosity" : "")
+                << " will be used"
+                << std::endl;
             cnk_a = -1;
         } else if (rough_sea_string == "donelan") {
             rough_type_sea = RoughCalcType::DONELAN;
diff --git a/Source/BoundaryConditions/ERF_FillIntermediatePatch.cpp b/Source/BoundaryConditions/ERF_FillIntermediatePatch.cpp
index 982040c74..7be2320e3 100644
--- a/Source/BoundaryConditions/ERF_FillIntermediatePatch.cpp
+++ b/Source/BoundaryConditions/ERF_FillIntermediatePatch.cpp
@@ -345,9 +345,9 @@ ERF::FillIntermediatePatch (int lev, Real time,
     // how velocity from fine-fine copies (as well as physical and interpolated bcs) will be filled
     if (!cons_only)
     {
-        IntVect ngu = (!solverChoice.use_NumDiff) ? IntVect(1,1,1) : mfs_vel[Vars::xvel]->nGrowVect();
-        IntVect ngv = (!solverChoice.use_NumDiff) ? IntVect(1,1,1) : mfs_vel[Vars::yvel]->nGrowVect();
-        IntVect ngw = (!solverChoice.use_NumDiff) ? IntVect(1,1,0) : mfs_vel[Vars::zvel]->nGrowVect();
+        IntVect ngu = (!solverChoice.use_num_diff) ? IntVect(1,1,1) : mfs_vel[Vars::xvel]->nGrowVect();
+        IntVect ngv = (!solverChoice.use_num_diff) ? IntVect(1,1,1) : mfs_vel[Vars::yvel]->nGrowVect();
+        IntVect ngw = (!solverChoice.use_num_diff) ? IntVect(1,1,0) : mfs_vel[Vars::zvel]->nGrowVect();
 
         VelocityToMomentum(*mfs_vel[Vars::xvel], ngu,
                            *mfs_vel[Vars::yvel], ngv,
diff --git a/Source/DataStructs/ERF_DataStruct.H b/Source/DataStructs/ERF_DataStruct.H
index c7e9e6b32..13270cdd0 100644
--- a/Source/DataStructs/ERF_DataStruct.H
+++ b/Source/DataStructs/ERF_DataStruct.H
@@ -318,12 +318,14 @@ struct SolverChoice {
         pp.query("use_moist_background", use_moist_background);
 
         // Use numerical diffusion?
-        pp.query("use_NumDiff",use_NumDiff);
-        if(use_NumDiff) {
-            pp.query("NumDiffCoeff",NumDiffCoeff);
-            AMREX_ASSERT_WITH_MESSAGE(( (NumDiffCoeff >= 0.) && (NumDiffCoeff <= 1.) ),
-                                      "Numerical diffusion coefficient must be between 0 & 1.");
-            NumDiffCoeff *= std::pow(2.0,-6);
+        pp.query("num_diff_coeff",num_diff_coeff);
+        AMREX_ASSERT_WITH_MESSAGE(( (num_diff_coeff >= 0.) && (num_diff_coeff <= 1.) ),
+                                  "Numerical diffusion coefficient must be between 0 & 1.");
+        use_num_diff = (num_diff_coeff > 0);
+        if (use_num_diff) {
+            amrex::Print() << "6th-order numerical diffusion turned on with coefficient = "
+                << num_diff_coeff << std::endl;
+            num_diff_coeff *= std::pow(2.0,-6);
         }
 
         // Use monotonic advection?
@@ -508,7 +510,6 @@ struct SolverChoice {
         pp.query("rotational_time_period", rot_time_period);
 
         coriolis_factor = 2.0 * 2.0 * PI / rot_time_period;
-        amrex::Print() << "Coriolis factor = " << coriolis_factor << std::endl;
 
         amrex::Real latitude = 90.0;
         pp.query("latitude", latitude);
@@ -653,8 +654,8 @@ struct SolverChoice {
     PerturbationType pert_type;
 
     // Numerical diffusion
-    bool use_NumDiff{false};
-    amrex::Real NumDiffCoeff{0.};
+    bool use_num_diff{false};
+    amrex::Real num_diff_coeff{0.};
 
     // Monotonic advection limiter
     bool use_mono_adv{false};
diff --git a/Source/DataStructs/ERF_DiffStruct.H b/Source/DataStructs/ERF_DiffStruct.H
index 3d5fdc60d..53098065d 100644
--- a/Source/DataStructs/ERF_DiffStruct.H
+++ b/Source/DataStructs/ERF_DiffStruct.H
@@ -22,12 +22,6 @@ struct DiffChoice {
     {
         amrex::ParmParse pp(pp_prefix);
 
-        // Diffusive constants...
-        pp.query("alpha_T", alpha_T);
-        pp.query("alpha_C", alpha_C);
-        pp.query("dynamicViscosity", dynamicViscosity);
-        pp.query("rho0_trans", rho0_trans);
-
         static std::string molec_diff_type_string = "None";
         pp.query("molec_diff_type",molec_diff_type_string);
 
@@ -41,16 +35,30 @@ struct DiffChoice {
             amrex::Error("Don't know this molec_diff_type");
         }
 
+        if (molec_diff_type != MolecDiffType::None) {
+            pp.query("alpha_T", alpha_T);
+            pp.query("alpha_C", alpha_C);
+            pp.query("dynamic_viscosity", dynamic_viscosity);
+            pp.query("rho0_trans", rho0_trans);
+        }
+
+        // Compute relevant forms of diffusion parameters
+        rhoAlpha_T = rho0_trans * alpha_T;
+        rhoAlpha_C = rho0_trans * alpha_C;
+
         if (molec_diff_type == MolecDiffType::ConstantAlpha) {
             amrex::Print() << "Using constant kinematic diffusion coefficients" << std::endl;
-            amrex::Print() << "  momentum : " << dynamicViscosity/rho0_trans << " m^2/s" << std::endl;
+            amrex::Print() << "  momentum : " << dynamic_viscosity/rho0_trans << " m^2/s" << std::endl;
             amrex::Print() << "  temperature : " << alpha_T << " m^2/s" << std::endl;
             amrex::Print() << "  scalar : " << alpha_C << " m^2/s" << std::endl;
         }
+        else if (molec_diff_type == MolecDiffType::Constant) {
+            amrex::Print() << "Using constant dynamic diffusion coefficients" << std::endl;
+            amrex::Print() << "  momentum : " << dynamic_viscosity << " kg/(m-s)" << std::endl;
+            amrex::Print() << "  temperature : " << rhoAlpha_T << " kg/(m-s)" << std::endl;
+            amrex::Print() << "  scalar : " << rhoAlpha_C << " kg/(m-s)" << std::endl;
+        }
 
-        // Compute relevant forms of diffusion parameters
-        rhoAlpha_T = rho0_trans * alpha_T;
-        rhoAlpha_C = rho0_trans * alpha_C;
     }
 
     void display()
@@ -59,7 +67,7 @@ struct DiffChoice {
         amrex::Print() << "    rho0_trans              : " << rho0_trans << std::endl;
         amrex::Print() << "    alpha_T                 : " << alpha_T << std::endl;
         amrex::Print() << "    alpha_C                 : " << alpha_C << std::endl;
-        amrex::Print() << "    dynamicViscosity        : " << dynamicViscosity << std::endl;
+        amrex::Print() << "    dynamic_viscosity       : " << dynamic_viscosity << std::endl;
 
         if (molec_diff_type == MolecDiffType::Constant) {
             amrex::Print() << "Using constant molecular diffusivity (relevant for DNS)" << std::endl;
@@ -85,6 +93,6 @@ struct DiffChoice {
     // Dynamic diffusion coefficients [kg/(m-s)]
     amrex::Real rhoAlpha_T = 0.0;
     amrex::Real rhoAlpha_C = 0.0;
-    amrex::Real dynamicViscosity = 0.0;
+    amrex::Real dynamic_viscosity = 0.0;
 };
 #endif
diff --git a/Source/ERF.H b/Source/ERF.H
index 27dd95b14..2458c9e54 100644
--- a/Source/ERF.H
+++ b/Source/ERF.H
@@ -975,6 +975,8 @@ private:
                                                     // Time averaged velocity
                                                     "u_t_avg", "v_t_avg", "w_t_avg", "umag_t_avg",
                                                     // eddy viscosity
+                                                    "nut",
+                                                    // eddy diffusivity of momentum
                                                     "Kmv","Kmh",
                                                     // eddy diffusivity of heat
                                                     "Khv","Khh",
diff --git a/Source/ERF.cpp b/Source/ERF.cpp
index 3759ede46..6b33761c0 100644
--- a/Source/ERF.cpp
+++ b/Source/ERF.cpp
@@ -665,51 +665,6 @@ ERF::InitData_post ()
             }
         }
 
-        // If using the Deardoff LES model,
-        // we initialize rho_KE to be nonzero (and positive) so that we end up
-        // with reasonable values for the eddy diffusivity and the MOST fluxes
-        // (~ 1/diffusivity) do not blow up
-        Real RhoKE_0;
-        ParmParse pp(pp_prefix);
-        if (pp.query("RhoKE_0", RhoKE_0)) {
-            // Uniform initial rho*e field
-            for (int lev = 0; lev <= finest_level; lev++) {
-                if (solverChoice.turbChoice[lev].les_type == LESType::Deardorff) {
-                    Print() << "Initializing uniform rhoKE=" << RhoKE_0
-                        << " on level " << lev
-                        << std::endl;
-                    vars_new[lev][Vars::cons].setVal(RhoKE_0,RhoKE_comp,1,0);
-                } else {
-                    vars_new[lev][Vars::cons].setVal(0.0,RhoKE_comp,1,0);
-                }
-            }
-        }
-
-        Real KE_0;
-        if (pp.query("KE_0", KE_0)) {
-            // Uniform initial e field
-            for (int lev = 0; lev <= finest_level; lev++) {
-                auto& lev_new = vars_new[lev];
-                if (solverChoice.turbChoice[lev].les_type == LESType::Deardorff) {
-                    Print() << "Initializing uniform KE=" << KE_0
-                        << " on level " << lev
-                        << std::endl;
-                    for (MFIter mfi(lev_new[Vars::cons], TilingIfNotGPU()); mfi.isValid(); ++mfi) {
-                        const Box &bx = mfi.tilebox();
-                        const auto &cons_arr = lev_new[Vars::cons].array(mfi);
-                        // We want to set the lateral BC values, too
-                        Box gbx = bx; // Copy constructor
-                        gbx.grow(0,1); gbx.grow(1,1); // Grow by one in the lateral directions
-                        ParallelFor(gbx, [=] AMREX_GPU_DEVICE (int i, int j, int k) noexcept {
-                            cons_arr(i,j,k,RhoKE_comp) = cons_arr(i,j,k,Rho_comp) * KE_0;
-                        });
-                    } // mfi
-                } else {
-                    lev_new[Vars::cons].setVal(0.0,RhoKE_comp,1,0);
-                }
-            } // lev
-        }
-
         if (solverChoice.coupling_type == CouplingType::TwoWay) {
             AverageDown();
         }
diff --git a/Source/ERF_MakeNewArrays.cpp b/Source/ERF_MakeNewArrays.cpp
index 40a67bbb5..791a18a80 100644
--- a/Source/ERF_MakeNewArrays.cpp
+++ b/Source/ERF_MakeNewArrays.cpp
@@ -66,7 +66,7 @@ ERF::init_stuff (int lev, const BoxArray& ba, const DistributionMapping& dm,
         ba_nd.surroundingNodes();
 
         // We need this to be one greater than the ghost cells to handle levels > 0
-        int ngrow = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff) + 2;
+        int ngrow = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_num_diff) + 2;
         tmp_zphys_nd = std::make_unique<MultiFab>(ba_nd,dm,1,IntVect(ngrow,ngrow,ngrow));
 
         if (solverChoice.terrain_type == TerrainType::Moving) {
@@ -113,8 +113,8 @@ ERF::init_stuff (int lev, const BoxArray& ba, const DistributionMapping& dm,
     // The number of ghost cells for density must be 1 greater than that for velocity
     //     so that we can go back in forth between velocity and momentum on all faces
     // ********************************************************************************************
-    int ngrow_state = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff) + 1;
-    int ngrow_vels  = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff);
+    int ngrow_state = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_num_diff) + 1;
+    int ngrow_vels  = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_num_diff);
 
     // ********************************************************************************************
     // New solution data containers
diff --git a/Source/ERF_MakeNewLevel.cpp b/Source/ERF_MakeNewLevel.cpp
index 51ceac884..fdfdf6eb5 100644
--- a/Source/ERF_MakeNewLevel.cpp
+++ b/Source/ERF_MakeNewLevel.cpp
@@ -318,7 +318,7 @@ ERF::RemakeLevel (int lev, Real time, const BoxArray& ba, const DistributionMapp
     int     ncomp_cons  = vars_new[lev][Vars::cons].nComp();
     IntVect ngrow_state = vars_new[lev][Vars::cons].nGrowVect();
 
-    int ngrow_vels  = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff);
+    int ngrow_vels  = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_num_diff);
 
     Vector<MultiFab> temp_lev_new(Vars::NumTypes);
     Vector<MultiFab> temp_lev_old(Vars::NumTypes);
diff --git a/Source/IO/ERF_NCCheckpoint.cpp b/Source/IO/ERF_NCCheckpoint.cpp
index 3ff06b215..b1b7a40d6 100644
--- a/Source/IO/ERF_NCCheckpoint.cpp
+++ b/Source/IO/ERF_NCCheckpoint.cpp
@@ -156,8 +156,8 @@ ERF::ReadNCCheckpointFile ()
     ncf.var("dt")   .get(dt.data(),    {0}, {static_cast<long unsigned int>(ndt)});
     ncf.var("t_new").get(t_new.data(), {0}, {static_cast<long unsigned int>(ntime)});
 
-    int ngrow_state = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff) + 1;
-    int ngrow_vels  = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff);
+    int ngrow_state = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_num_diff) + 1;
+    int ngrow_vels  = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_num_diff);
 
     for (int lev = 0; lev <= finest_level; ++lev) {
 
diff --git a/Source/IO/ERF_Plotfile.cpp b/Source/IO/ERF_Plotfile.cpp
index 26ed76e16..c54c61a1f 100644
--- a/Source/IO/ERF_Plotfile.cpp
+++ b/Source/IO/ERF_Plotfile.cpp
@@ -1002,6 +1002,29 @@ ERF::WritePlotFile (int which, PlotFileType plotfile_type, Vector<std::string> p
             }
         }
 
+        if (containerHasElement(plot_var_names, "nut")) {
+            MultiFab dmf(mf[lev], make_alias, mf_comp, 1);
+            MultiFab cmf(vars_new[lev][Vars::cons], make_alias, 0, 1); // to provide rho only
+#ifdef _OPENMP
+#pragma omp parallel if (amrex::Gpu::notInLaunchRegion())
+#endif
+            for (MFIter mfi(dmf, TilingIfNotGPU()); mfi.isValid(); ++mfi)
+            {
+                const Box& bx = mfi.tilebox();
+                auto       prim = dmf[mfi].array();
+                auto const cons = cmf[mfi].const_array();
+                auto const diff = (*eddyDiffs_lev[lev])[mfi].const_array();
+                ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept
+                {
+                    const Real rho = cons(i, j, k, Rho_comp);
+                    const Real Kmv = diff(i, j, k, EddyDiff::Mom_v);
+                    prim(i,j,k) = Kmv / rho;
+                });
+            }
+
+            mf_comp++;
+        }
+
         if (containerHasElement(plot_var_names, "Kmv")) {
             MultiFab::Copy(mf[lev],*eddyDiffs_lev[lev],EddyDiff::Mom_v,mf_comp,1,0);
             mf_comp ++;
diff --git a/Source/SourceTerms/ERF_MakeMomSources.cpp b/Source/SourceTerms/ERF_MakeMomSources.cpp
index a6c05c654..b0981c485 100644
--- a/Source/SourceTerms/ERF_MakeMomSources.cpp
+++ b/Source/SourceTerms/ERF_MakeMomSources.cpp
@@ -90,7 +90,7 @@ void make_mom_sources (int level,
     //    9. Forest canopy
     //   10. Immersed Forcing
     // *****************************************************************************
-    const bool l_use_ndiff       = solverChoice.use_NumDiff;
+  //const bool l_use_ndiff       = solverChoice.use_num_diff;
     const bool l_use_zphys       = (solverChoice.mesh_type != MeshType::ConstantDz);
     const bool l_do_forest_drag  = solverChoice.do_forest_drag;
     const bool l_do_terrain_drag = solverChoice.do_terrain_drag;
@@ -479,14 +479,16 @@ void make_mom_sources (int level,
         // *****************************************************************************
         // 7. Add NUMERICAL DIFFUSION terms
         // *****************************************************************************
+#if 0
         if (l_use_ndiff) {
-            /*
-            NumericalDiffusion_Xmom(tbx, dt, solverChoice.NumDiffCoeff,
+            const Array4<const Real>& mf_u = mapfac_u->const_array(mfi);
+            const Array4<const Real>& mf_v = mapfac_v->const_array(mfi);
+            NumericalDiffusion_Xmom(tbx, dt, solverChoice.num_diff_coeff,
                                     u, cell_data, xmom_src_arr, mf_u);
-            NumericalDiffusion_Ymom(tby, dt, solverChoice.NumDiffCoeff,
+            NumericalDiffusion_Ymom(tby, dt, solverChoice.num_diff_coeff,
                                     v, cell_data, ymom_src_arr, mf_v);
-            */
         }
+#endif
 
         // *****************************************************************************
         // 8. Add SPONGING
diff --git a/Source/SourceTerms/ERF_MakeSources.cpp b/Source/SourceTerms/ERF_MakeSources.cpp
index c770badfa..c4524b4ab 100644
--- a/Source/SourceTerms/ERF_MakeSources.cpp
+++ b/Source/SourceTerms/ERF_MakeSources.cpp
@@ -57,7 +57,7 @@ void make_sources (int level,
     // *****************************************************************************
     source.setVal(0.0);
 
-    const bool l_use_ndiff      = solverChoice.use_NumDiff;
+    const bool l_use_ndiff      = solverChoice.use_num_diff;
     const bool use_terrain      = solverChoice.terrain_type != TerrainType::None;
 
     TurbChoice tc = solverChoice.turbChoice[level];
@@ -335,20 +335,20 @@ void make_sources (int level,
             const Array4<const Real>& mf_m   = mapfac_m->const_array(mfi);
 
             // Rho is a special case
-            NumericalDiffusion_Scal(bx, sc=0, nc=1, dt, solverChoice.NumDiffCoeff,
+            NumericalDiffusion_Scal(bx, sc=0, nc=1, dt, solverChoice.num_diff_coeff,
                                     cell_data, cell_data, cell_src, mf_m);
 
             // Other scalars proceed as normal
-            NumericalDiffusion_Scal(bx, sc=1, nc=1, dt, solverChoice.NumDiffCoeff,
+            NumericalDiffusion_Scal(bx, sc=1, nc=1, dt, solverChoice.num_diff_coeff,
                                     cell_prim, cell_data, cell_src, mf_m);
 
 
             if (l_use_KE && l_diff_KE) {
-                NumericalDiffusion_Scal(bx, sc=RhoKE_comp, nc=1, dt, solverChoice.NumDiffCoeff,
+                NumericalDiffusion_Scal(bx, sc=RhoKE_comp, nc=1, dt, solverChoice.num_diff_coeff,
                                         cell_prim, cell_data, cell_src, mf_m);
             }
 
-            NumericalDiffusion_Scal(bx, sc=RhoScalar_comp, nc=NSCALARS, dt, solverChoice.NumDiffCoeff,
+            NumericalDiffusion_Scal(bx, sc=RhoScalar_comp, nc=NSCALARS, dt, solverChoice.num_diff_coeff,
                                     cell_prim, cell_data, cell_src, mf_m);
         }
 
diff --git a/Source/TimeIntegration/ERF_AdvanceDycore.cpp b/Source/TimeIntegration/ERF_AdvanceDycore.cpp
index e736528ee..89b28be58 100644
--- a/Source/TimeIntegration/ERF_AdvanceDycore.cpp
+++ b/Source/TimeIntegration/ERF_AdvanceDycore.cpp
@@ -249,11 +249,11 @@ void ERF::advance_dycore(int level,
 
     //
     // This is an optimization since we won't need more than one ghost
-    // cell of momentum in the integrator if not using NumDiff
+    // cell of momentum in the integrator if not using numerical diffusion
     //
-    IntVect ngu = (!solverChoice.use_NumDiff) ? IntVect(1,1,1) : xvel_old.nGrowVect();
-    IntVect ngv = (!solverChoice.use_NumDiff) ? IntVect(1,1,1) : yvel_old.nGrowVect();
-    IntVect ngw = (!solverChoice.use_NumDiff) ? IntVect(1,1,0) : zvel_old.nGrowVect();
+    IntVect ngu = (!solverChoice.use_num_diff) ? IntVect(1,1,1) : xvel_old.nGrowVect();
+    IntVect ngv = (!solverChoice.use_num_diff) ? IntVect(1,1,1) : yvel_old.nGrowVect();
+    IntVect ngw = (!solverChoice.use_num_diff) ? IntVect(1,1,0) : zvel_old.nGrowVect();
 
     VelocityToMomentum(xvel_old, ngu, yvel_old, ngv, zvel_old, ngw, density,
                        state_old[IntVars::xmom],
diff --git a/Source/TimeIntegration/ERF_MakeTauTerms.cpp b/Source/TimeIntegration/ERF_MakeTauTerms.cpp
index beae8e85b..ecb122eaf 100644
--- a/Source/TimeIntegration/ERF_MakeTauTerms.cpp
+++ b/Source/TimeIntegration/ERF_MakeTauTerms.cpp
@@ -82,8 +82,8 @@ void erf_make_tau_terms (int level, int nrk,
         // if using constant alpha (mu = rho * alpha), then first divide by the
         // reference density -- mu_eff will be scaled by the instantaneous
         // local density later when ComputeStress*Visc_*() is called
-        Real mu_eff = (l_use_constAlpha) ? 2.0 * dc.dynamicViscosity / dc.rho0_trans
-                                         : 2.0 * dc.dynamicViscosity;
+        Real mu_eff = (l_use_constAlpha) ? 2.0 * dc.dynamic_viscosity / dc.rho0_trans
+                                         : 2.0 * dc.dynamic_viscosity;
 
 #ifdef _OPENMP
 #pragma omp parallel if (Gpu::notInLaunchRegion())
diff --git a/Source/TimeIntegration/ERF_TI_substep_fun.H b/Source/TimeIntegration/ERF_TI_substep_fun.H
index 0717fd577..e2df0963d 100644
--- a/Source/TimeIntegration/ERF_TI_substep_fun.H
+++ b/Source/TimeIntegration/ERF_TI_substep_fun.H
@@ -181,10 +181,10 @@ auto fast_rhs_fun = [&](int fast_step, int /*n_sub*/, int nrk,
         // NOTE: Numerical diffusion is tested on in FillPatchIntermediate and dictates the size of the
         //       box over which VelocityToMomentum is computed. V2M requires one more ghost cell be
         //       filled for rho than velocity. This logical condition ensures we fill enough ghost cells
-        //       when use_NumDiff is true.
+        //       when use_num_diff is true.
         int ng_cons = S_data[IntVars::cons].nGrowVect().max() - 1;
         int ng_vel  = S_data[IntVars::xmom].nGrowVect().max();
-        if (!solverChoice.use_NumDiff) {
+        if (!solverChoice.use_num_diff) {
             ng_cons = 1;
             ng_vel  = 1;
         }
diff --git a/Tests/test_files/Bubble_DensityCurrent/Bubble_DensityCurrent.i b/Tests/test_files/Bubble_DensityCurrent/Bubble_DensityCurrent.i
index c907d06d2..ec2d241b8 100644
--- a/Tests/test_files/Bubble_DensityCurrent/Bubble_DensityCurrent.i
+++ b/Tests/test_files/Bubble_DensityCurrent/Bubble_DensityCurrent.i
@@ -41,15 +41,16 @@ erf.plot_int_1      = 3840       # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta pres_hse dens_hse
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = true
 erf.use_coriolis = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "ConstantAlpha"
+erf.les_type = "None"
+
 # diffusion = 75 m^2/s, rho_0 = 1e5/(287*300) = 1.1614401858
-erf.dynamicViscosity = 87.108013935 # kg/(m-s)
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 87.108013935 # kg/(m-s)
+erf.alpha_T           = 0.0
+erf.alpha_C           = 0.0
 
 erf.init_type = ""
 
diff --git a/Tests/test_files/CouetteFlow_x/CouetteFlow_x.i b/Tests/test_files/CouetteFlow_x/CouetteFlow_x.i
index 534472bf7..2a5537007 100644
--- a/Tests/test_files/CouetteFlow_x/CouetteFlow_x.i
+++ b/Tests/test_files/CouetteFlow_x/CouetteFlow_x.i
@@ -36,16 +36,17 @@ erf.check_int       = 1000       # number of timesteps between checkpoints
 # PLOTFILES
 erf.plot_file_1     = plt        # prefix of plotfile name
 erf.plot_int_1      = 50         # number of timesteps between plotfiles
-erf.plot_vars_1     = density x_velocity y_velocity z_velocity 
+erf.plot_vars_1     = density x_velocity y_velocity z_velocity
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 0.1
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
+erf.alpha_T           = 0.0
+erf.alpha_C           = 0.0
 
 # PROBLEM PARAMETERS
 prob.prob_type = 1
diff --git a/Tests/test_files/CouetteFlow_y/CouetteFlow_y.i b/Tests/test_files/CouetteFlow_y/CouetteFlow_y.i
index 5af596575..7a9a40faf 100644
--- a/Tests/test_files/CouetteFlow_y/CouetteFlow_y.i
+++ b/Tests/test_files/CouetteFlow_y/CouetteFlow_y.i
@@ -38,13 +38,14 @@ erf.plot_int_1      = 50         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 0.1
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
+erf.alpha_T           = 0.0
+erf.alpha_C           = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Tests/test_files/Deardorff_stationary/Deardorff_stationary.i b/Tests/test_files/Deardorff_stationary/Deardorff_stationary.i
index cbed7182a..163df8926 100644
--- a/Tests/test_files/Deardorff_stationary/Deardorff_stationary.i
+++ b/Tests/test_files/Deardorff_stationary/Deardorff_stationary.i
@@ -55,13 +55,18 @@ erf.abl_driver_type = "GeostrophicWind"
 erf.abl_geo_wind = 0. 0. 0.  # no background pressure gradient
 
 erf.molec_diff_type = "None"
+
 erf.les_type = "Deardorff"
 erf.Ck       = 0.1
 erf.Ce       = 0.93
 erf.Pr_t     = 0.3333
 erf.theta_ref = 290.0 # used in buoyancy term
-erf.KE_0  = 0.000656292002688172 # exact soln in uniform density field, e = Ck/Ce*(dUdz*delta)**2
 
 # INITIAL PROFILES
 erf.init_type = "input_sounding"
 erf.input_sounding_file = "input_sounding" # with linear wind profile
+
+# exact soln in uniform density field
+#   e = Ck/Ce*(dUdz*delta)**2,
+# with dU/dz=0.01 and  dx=dy=dz=delta=7.8125
+prob.rhoKE_0 = 0.000656292002688172
diff --git a/Tests/test_files/DensityCurrent/DensityCurrent.i b/Tests/test_files/DensityCurrent/DensityCurrent.i
index d476b95cc..aca1b2bd9 100644
--- a/Tests/test_files/DensityCurrent/DensityCurrent.i
+++ b/Tests/test_files/DensityCurrent/DensityCurrent.i
@@ -43,7 +43,6 @@ erf.plot_int_1      = 3840       # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta pres_hse dens_hse
 
 # SOLVER CHOICE
-erf.alpha_C = 0.0
 erf.use_gravity = true
 erf.use_coriolis = false
 
@@ -52,10 +51,10 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 erf.c_p = 1004.0
 
diff --git a/Tests/test_files/DensityCurrent_anelastic/DensityCurrent_anelastic.i b/Tests/test_files/DensityCurrent_anelastic/DensityCurrent_anelastic.i
index 0e42dcc13..b8827451b 100644
--- a/Tests/test_files/DensityCurrent_anelastic/DensityCurrent_anelastic.i
+++ b/Tests/test_files/DensityCurrent_anelastic/DensityCurrent_anelastic.i
@@ -52,10 +52,9 @@ erf.les_type     = None
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = ConstantAlpha # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0           # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0          # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0          # [m^2/s]
+erf.molec_diff_type   = ConstantAlpha # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0          # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0          # [m^2/s]
 
 erf.c_p = 1004.0
 
diff --git a/Tests/test_files/DensityCurrent_detJ2/DensityCurrent_detJ2.i b/Tests/test_files/DensityCurrent_detJ2/DensityCurrent_detJ2.i
index 811af37e6..e07a18051 100644
--- a/Tests/test_files/DensityCurrent_detJ2/DensityCurrent_detJ2.i
+++ b/Tests/test_files/DensityCurrent_detJ2/DensityCurrent_detJ2.i
@@ -43,7 +43,6 @@ erf.plot_int_1      = 3840       # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta pres_hse dens_hse
 
 # SOLVER CHOICE
-erf.alpha_C = 0.0
 erf.use_gravity = true
 erf.use_coriolis = false
 
@@ -51,10 +50,10 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 erf.c_p = 1004.0
 
diff --git a/Tests/test_files/DensityCurrent_detJ2_MT/DensityCurrent_detJ2_MT.i b/Tests/test_files/DensityCurrent_detJ2_MT/DensityCurrent_detJ2_MT.i
index a21c6c43f..47e075c53 100644
--- a/Tests/test_files/DensityCurrent_detJ2_MT/DensityCurrent_detJ2_MT.i
+++ b/Tests/test_files/DensityCurrent_detJ2_MT/DensityCurrent_detJ2_MT.i
@@ -43,7 +43,6 @@ erf.plot_int_1      = 3840       # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta pres_hse dens_hse
 
 # SOLVER CHOICE
-erf.alpha_C = 0.0
 erf.use_gravity = true
 erf.use_coriolis = false
 
@@ -51,10 +50,10 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 erf.dycore_horiz_adv_type  = Centered_2nd
 erf.dycore_vert_adv_type   = Centered_2nd
diff --git a/Tests/test_files/DensityCurrent_detJ2_nosub/DensityCurrent_detJ2_nosub.i b/Tests/test_files/DensityCurrent_detJ2_nosub/DensityCurrent_detJ2_nosub.i
index e13a22994..264a39d54 100644
--- a/Tests/test_files/DensityCurrent_detJ2_nosub/DensityCurrent_detJ2_nosub.i
+++ b/Tests/test_files/DensityCurrent_detJ2_nosub/DensityCurrent_detJ2_nosub.i
@@ -42,7 +42,6 @@ erf.plot_int_1      = 3840       # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta pres_hse dens_hse
 
 # SOLVER CHOICE
-erf.alpha_C = 0.0
 erf.use_gravity = true
 erf.use_coriolis = false
 
@@ -50,10 +49,10 @@ erf.les_type         = "None"
 #
 # Diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type  = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
-erf.alpha_T          = 75.0 # [m^2/s]
+erf.molec_diff_type   = "ConstantAlpha" # where alpha == "K" in Straka et al 1993
+erf.dynamic_viscosity = 75.0 # [kg/(m-s)] ==> alpha = 75.0 m^2/s
+erf.alpha_T           = 75.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 erf.c_p = 1004.0
 
diff --git a/Tests/test_files/EkmanSpiral/EkmanSpiral.i b/Tests/test_files/EkmanSpiral/EkmanSpiral.i
index a21f4ac8b..5d7ef721d 100644
--- a/Tests/test_files/EkmanSpiral/EkmanSpiral.i
+++ b/Tests/test_files/EkmanSpiral/EkmanSpiral.i
@@ -39,13 +39,14 @@ erf.plot_int_1      = 100      # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 5.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 5.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 0.0
 
 erf.use_coriolis = true
 erf.abl_driver_type = "GeostrophicWind"
diff --git a/Tests/test_files/IVA_NumDiff/IVA_NumDiff.i b/Tests/test_files/IVA_NumDiff/IVA_NumDiff.i
index 308499ff0..425f454cd 100644
--- a/Tests/test_files/IVA_NumDiff/IVA_NumDiff.i
+++ b/Tests/test_files/IVA_NumDiff/IVA_NumDiff.i
@@ -37,16 +37,12 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta temp
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.use_NumDiff  = true
-erf.NumDiffCoeff = 0.001
+erf.num_diff_coeff = 0.001
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Tests/test_files/IsentropicVortexAdvecting/IsentropicVortexAdvecting.i b/Tests/test_files/IsentropicVortexAdvecting/IsentropicVortexAdvecting.i
index cb3a4175a..f81268f77 100644
--- a/Tests/test_files/IsentropicVortexAdvecting/IsentropicVortexAdvecting.i
+++ b/Tests/test_files/IsentropicVortexAdvecting/IsentropicVortexAdvecting.i
@@ -37,13 +37,10 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta temp vorticity_x vorticity_y vorticity_z
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Tests/test_files/IsentropicVortexStationary/IsentropicVortexStationary.i b/Tests/test_files/IsentropicVortexStationary/IsentropicVortexStationary.i
index f43aa5a10..7c8398250 100644
--- a/Tests/test_files/IsentropicVortexStationary/IsentropicVortexStationary.i
+++ b/Tests/test_files/IsentropicVortexStationary/IsentropicVortexStationary.i
@@ -37,13 +37,10 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure theta temp
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Tests/test_files/MSF_NoSub_IsentropicVortexAdv/MSF_NoSub_IsentropicVortexAdv.i b/Tests/test_files/MSF_NoSub_IsentropicVortexAdv/MSF_NoSub_IsentropicVortexAdv.i
index 816623a08..16893801a 100644
--- a/Tests/test_files/MSF_NoSub_IsentropicVortexAdv/MSF_NoSub_IsentropicVortexAdv.i
+++ b/Tests/test_files/MSF_NoSub_IsentropicVortexAdv/MSF_NoSub_IsentropicVortexAdv.i
@@ -43,9 +43,10 @@ erf.alpha_T = 0.1
 erf.alpha_C = 0.1
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 1.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Tests/test_files/MSF_Sub_IsentropicVortexAdv/MSF_Sub_IsentropicVortexAdv.i b/Tests/test_files/MSF_Sub_IsentropicVortexAdv/MSF_Sub_IsentropicVortexAdv.i
index 46763bf72..adb3f4468 100644
--- a/Tests/test_files/MSF_Sub_IsentropicVortexAdv/MSF_Sub_IsentropicVortexAdv.i
+++ b/Tests/test_files/MSF_Sub_IsentropicVortexAdv/MSF_Sub_IsentropicVortexAdv.i
@@ -44,9 +44,10 @@ erf.alpha_T = 0.1
 erf.alpha_C = 0.1
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 1.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 1.0
 
 # PROBLEM PARAMETERS
 prob.p_inf = 1e5  # reference pressure [Pa]
diff --git a/Tests/test_files/MoistBubble/MoistBubble.i b/Tests/test_files/MoistBubble/MoistBubble.i
index 35b646113..9da44897d 100644
--- a/Tests/test_files/MoistBubble/MoistBubble.i
+++ b/Tests/test_files/MoistBubble/MoistBubble.i
@@ -56,11 +56,10 @@ erf.moisture_model  = "Kessler_NoRain"
 erf.buoyancy_type   = 1
 erf.use_moist_background = true
 
-erf.molec_diff_type  = "ConstantAlpha"
-erf.rho0_trans       = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 0.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T          = 0.0 # [m^2/s]
-erf.alpha_C          = 0.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 0.0 # [kg/(m-s)]
+erf.alpha_T           = 0.0 # [m^2/s]
+erf.alpha_C           = 0.0
 
 # INITIAL CONDITIONS
 #erf.init_type = "input_sounding"
diff --git a/Tests/test_files/PoiseuilleFlow_x/PoiseuilleFlow_x.i b/Tests/test_files/PoiseuilleFlow_x/PoiseuilleFlow_x.i
index 97d3ebed8..5c767b13f 100644
--- a/Tests/test_files/PoiseuilleFlow_x/PoiseuilleFlow_x.i
+++ b/Tests/test_files/PoiseuilleFlow_x/PoiseuilleFlow_x.i
@@ -36,17 +36,17 @@ erf.check_int       = 1000       # number of timesteps between checkpoints
 # PLOTFILES
 erf.plot_file_1     = plt        # prefix of plotfile name
 erf.plot_int_1      = 100        # number of timesteps between plotfiles
-erf.plot_vars_1     = density x_velocity y_velocity z_velocity 
+erf.plot_vars_1     = density x_velocity y_velocity z_velocity
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity            = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.1
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
+erf.alpha_T           = 0.0
+erf.alpha_C           = 0.0
 
 erf.use_coriolis = false
 erf.abl_driver_type = "PressureGradient"
diff --git a/Tests/test_files/PoiseuilleFlow_y/PoiseuilleFlow_y.i b/Tests/test_files/PoiseuilleFlow_y/PoiseuilleFlow_y.i
index 21f190d3d..ca708e8b7 100644
--- a/Tests/test_files/PoiseuilleFlow_y/PoiseuilleFlow_y.i
+++ b/Tests/test_files/PoiseuilleFlow_y/PoiseuilleFlow_y.i
@@ -39,13 +39,12 @@ erf.plot_vars_1     = density x_velocity y_velocity z_velocity
 # SOLVER CHOICE
 erf.use_gravity            = false
 
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
+erf.les_type = "None"
 
-erf.les_type         = "None"
-erf.rho0_trans       = 1.0
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 0.1
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.1
+erf.alpha_T           = 0.0
+erf.alpha_C           = 0.0
 
 erf.use_coriolis = false
 erf.abl_driver_type   = "PressureGradient"
diff --git a/Tests/test_files/RayleighDamping/RayleighDamping.i b/Tests/test_files/RayleighDamping/RayleighDamping.i
index 37e6d8c35..692d51aff 100644
--- a/Tests/test_files/RayleighDamping/RayleighDamping.i
+++ b/Tests/test_files/RayleighDamping/RayleighDamping.i
@@ -37,9 +37,6 @@ erf.plot_int_1      = 100     # number of timesteps between plotfiles
 erf.plot_vars_1     = x_velocity y_velocity z_velocity theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
-
 erf.use_gravity = false
 erf.use_coriolis = false
 
@@ -52,7 +49,6 @@ erf.rayleigh_dampcoef = 1.0  # tau==1
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Tests/test_files/ScalarAdvDiff_order2/ScalarAdvDiff_order2.i b/Tests/test_files/ScalarAdvDiff_order2/ScalarAdvDiff_order2.i
index bd7207741..58add10b4 100644
--- a/Tests/test_files/ScalarAdvDiff_order2/ScalarAdvDiff_order2.i
+++ b/Tests/test_files/ScalarAdvDiff_order2/ScalarAdvDiff_order2.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Centered_2nd
 erf.dycore_vert_adv_type   = Centered_2nd
diff --git a/Tests/test_files/ScalarAdvDiff_order3/ScalarAdvDiff_order3.i b/Tests/test_files/ScalarAdvDiff_order3/ScalarAdvDiff_order3.i
index 8ec30ff7c..1bc67e8ba 100644
--- a/Tests/test_files/ScalarAdvDiff_order3/ScalarAdvDiff_order3.i
+++ b/Tests/test_files/ScalarAdvDiff_order3/ScalarAdvDiff_order3.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Upwind_3rd
 erf.dycore_vert_adv_type   = Upwind_3rd
diff --git a/Tests/test_files/ScalarAdvDiff_order4/ScalarAdvDiff_order4.i b/Tests/test_files/ScalarAdvDiff_order4/ScalarAdvDiff_order4.i
index 1ec9d9d96..efc724898 100644
--- a/Tests/test_files/ScalarAdvDiff_order4/ScalarAdvDiff_order4.i
+++ b/Tests/test_files/ScalarAdvDiff_order4/ScalarAdvDiff_order4.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20        # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Centered_4th
 erf.dycore_vert_adv_type   = Centered_4th
diff --git a/Tests/test_files/ScalarAdvDiff_order5/ScalarAdvDiff_order5.i b/Tests/test_files/ScalarAdvDiff_order5/ScalarAdvDiff_order5.i
index a0ce73ef7..4b937d986 100644
--- a/Tests/test_files/ScalarAdvDiff_order5/ScalarAdvDiff_order5.i
+++ b/Tests/test_files/ScalarAdvDiff_order5/ScalarAdvDiff_order5.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Upwind_5th
 erf.dycore_vert_adv_type   = Upwind_5th
diff --git a/Tests/test_files/ScalarAdvDiff_order6/ScalarAdvDiff_order6.i b/Tests/test_files/ScalarAdvDiff_order6/ScalarAdvDiff_order6.i
index 1270ff551..cd5ef86f7 100644
--- a/Tests/test_files/ScalarAdvDiff_order6/ScalarAdvDiff_order6.i
+++ b/Tests/test_files/ScalarAdvDiff_order6/ScalarAdvDiff_order6.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Centered_6th
 erf.dycore_vert_adv_type   = Centered_6th
diff --git a/Tests/test_files/ScalarAdvDiff_weno3/ScalarAdvDiff_weno3.i b/Tests/test_files/ScalarAdvDiff_weno3/ScalarAdvDiff_weno3.i
index 399dce738..54033551c 100644
--- a/Tests/test_files/ScalarAdvDiff_weno3/ScalarAdvDiff_weno3.i
+++ b/Tests/test_files/ScalarAdvDiff_weno3/ScalarAdvDiff_weno3.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Centered_2nd
 erf.dycore_vert_adv_type   = Centered_2nd
diff --git a/Tests/test_files/ScalarAdvDiff_weno3z/ScalarAdvDiff_weno3z.i b/Tests/test_files/ScalarAdvDiff_weno3z/ScalarAdvDiff_weno3z.i
index 23c3cb6f2..57a266ca9 100644
--- a/Tests/test_files/ScalarAdvDiff_weno3z/ScalarAdvDiff_weno3z.i
+++ b/Tests/test_files/ScalarAdvDiff_weno3z/ScalarAdvDiff_weno3z.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dryscal_horiz_adv_type = WENOZ3
 erf.dryscal_vert_adv_type  = WENOZ3
diff --git a/Tests/test_files/ScalarAdvDiff_weno5/ScalarAdvDiff_weno5.i b/Tests/test_files/ScalarAdvDiff_weno5/ScalarAdvDiff_weno5.i
index 86d5dee58..a0ca9fe70 100644
--- a/Tests/test_files/ScalarAdvDiff_weno5/ScalarAdvDiff_weno5.i
+++ b/Tests/test_files/ScalarAdvDiff_weno5/ScalarAdvDiff_weno5.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Centered_2nd
 erf.dycore_vert_adv_type   = Centered_2nd
diff --git a/Tests/test_files/ScalarAdvDiff_weno5z/ScalarAdvDiff_weno5z.i b/Tests/test_files/ScalarAdvDiff_weno5z/ScalarAdvDiff_weno5z.i
index f1e3a76f1..d31b32ec4 100644
--- a/Tests/test_files/ScalarAdvDiff_weno5z/ScalarAdvDiff_weno5z.i
+++ b/Tests/test_files/ScalarAdvDiff_weno5z/ScalarAdvDiff_weno5z.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dryscal_horiz_adv_type = WENOZ5
 erf.dryscal_vert_adv_type  = WENOZ5
diff --git a/Tests/test_files/ScalarAdvDiff_wenomzq3/ScalarAdvDiff_wenomzq3.i b/Tests/test_files/ScalarAdvDiff_wenomzq3/ScalarAdvDiff_wenomzq3.i
index ec49b8caf..285e05ab2 100644
--- a/Tests/test_files/ScalarAdvDiff_wenomzq3/ScalarAdvDiff_wenomzq3.i
+++ b/Tests/test_files/ScalarAdvDiff_wenomzq3/ScalarAdvDiff_wenomzq3.i
@@ -43,14 +43,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.dycore_horiz_adv_type  = Centered_2nd
 erf.dycore_vert_adv_type   = Centered_2nd
diff --git a/Tests/test_files/ScalarAdvectionShearedU/ScalarAdvectionShearedU.i b/Tests/test_files/ScalarAdvectionShearedU/ScalarAdvectionShearedU.i
index 10c746152..4b825a220 100644
--- a/Tests/test_files/ScalarAdvectionShearedU/ScalarAdvectionShearedU.i
+++ b/Tests/test_files/ScalarAdvectionShearedU/ScalarAdvectionShearedU.i
@@ -36,13 +36,10 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Tests/test_files/ScalarAdvectionUniformU/ScalarAdvectionUniformU.i b/Tests/test_files/ScalarAdvectionUniformU/ScalarAdvectionUniformU.i
index 68f4ab676..a93e8b84d 100644
--- a/Tests/test_files/ScalarAdvectionUniformU/ScalarAdvectionUniformU.i
+++ b/Tests/test_files/ScalarAdvectionUniformU/ScalarAdvectionUniformU.i
@@ -36,8 +36,6 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
 erf.dryscal_horiz_adv_type = "Centered_2nd"
@@ -47,7 +45,6 @@ erf.moistscal_vert_adv_type  = "Centered_2nd"
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 erf.init_type = "uniform"
 
diff --git a/Tests/test_files/ScalarDiffusionGaussian/ScalarDiffusionGaussian.i b/Tests/test_files/ScalarDiffusionGaussian/ScalarDiffusionGaussian.i
index 6c05b2d6a..bbeded275 100644
--- a/Tests/test_files/ScalarDiffusionGaussian/ScalarDiffusionGaussian.i
+++ b/Tests/test_files/ScalarDiffusionGaussian/ScalarDiffusionGaussian.i
@@ -36,14 +36,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.init_type = "uniform"
 
diff --git a/Tests/test_files/ScalarDiffusionSine/ScalarDiffusionSine.i b/Tests/test_files/ScalarDiffusionSine/ScalarDiffusionSine.i
index 70b00e324..44408081e 100644
--- a/Tests/test_files/ScalarDiffusionSine/ScalarDiffusionSine.i
+++ b/Tests/test_files/ScalarDiffusionSine/ScalarDiffusionSine.i
@@ -36,14 +36,14 @@ erf.plot_int_1      = 20         # number of timesteps between plotfiles
 erf.plot_vars_1     = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 1.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.rho0_trans       = 1.0
-erf.dynamicViscosity = 0.0
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 0.0
+erf.alpha_T           = 0.0
+erf.alpha_C           = 1.0
 
 erf.init_type = "uniform"
 
diff --git a/Tests/test_files/SquallLine_2D/SquallLine_2D.i b/Tests/test_files/SquallLine_2D/SquallLine_2D.i
index eed22d9c0..997493812 100644
--- a/Tests/test_files/SquallLine_2D/SquallLine_2D.i
+++ b/Tests/test_files/SquallLine_2D/SquallLine_2D.i
@@ -45,18 +45,16 @@ erf.buoyancy_type = 1
 erf.use_coriolis = false
 
 #erf.les_type = "Smagorinsky"
-erf.Cs              = 0.25
+#erf.Cs       = 0.25
 erf.les_type = "None"
 
 #
 # diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type = "ConstantAlpha"
-#erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 200.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 200.0 # [m^2/s]
-erf.alpha_C = 200.0
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 200.0 # [kg/(m-s)]
+erf.alpha_T           = 200.0 # [m^2/s]
+erf.alpha_C           = 200.0
 
 erf.moisture_model = "Kessler"
 erf.use_moist_background = true
diff --git a/Tests/test_files/SuperCell_3D/SuperCell_3D.i b/Tests/test_files/SuperCell_3D/SuperCell_3D.i
index 9f829de79..86fe706d4 100644
--- a/Tests/test_files/SuperCell_3D/SuperCell_3D.i
+++ b/Tests/test_files/SuperCell_3D/SuperCell_3D.i
@@ -49,18 +49,16 @@ erf.use_coriolis = false
 erf.use_rayleigh_damping = false
 
 #erf.les_type = "Smagorinsky"
-erf.Cs              = 0.25
+#erf.Cs       = 0.25
 erf.les_type = "None"
 
 #
 # diffusion coefficient from Straka, K = 75 m^2/s
 #
-erf.molec_diff_type = "ConstantAlpha"
-#erf.molec_diff_type = "Constant"
-erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
-erf.dynamicViscosity = 33.33 # [kg/(m-s)] ==> nu = 75.0 m^2/s
-erf.alpha_T = 33.33 # [m^2/s]
-erf.alpha_C = 33.33
+erf.molec_diff_type   = "ConstantAlpha"
+erf.dynamic_viscosity = 33.33 # [kg/(m-s)]
+erf.alpha_T           = 33.33 # [m^2/s]
+erf.alpha_C           = 33.33
 
 erf.moisture_model = "Kessler"
 erf.use_moist_background = true
diff --git a/Tests/test_files/TaylorGreenAdvecting/TaylorGreenAdvecting.i b/Tests/test_files/TaylorGreenAdvecting/TaylorGreenAdvecting.i
index c9e553a21..06d540e3b 100644
--- a/Tests/test_files/TaylorGreenAdvecting/TaylorGreenAdvecting.i
+++ b/Tests/test_files/TaylorGreenAdvecting/TaylorGreenAdvecting.i
@@ -36,13 +36,10 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure temp theta scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
 erf.les_type         = "None"
 erf.molec_diff_type  = "None"
-erf.dynamicViscosity = 0.0
 
 # PROBLEM PARAMETERS
 prob.rho_0 = 1.0
diff --git a/Tests/test_files/TaylorGreenAdvectingDiffusing/TaylorGreenAdvectingDiffusing.i b/Tests/test_files/TaylorGreenAdvectingDiffusing/TaylorGreenAdvectingDiffusing.i
index 81f64b4b7..65473a61e 100644
--- a/Tests/test_files/TaylorGreenAdvectingDiffusing/TaylorGreenAdvectingDiffusing.i
+++ b/Tests/test_files/TaylorGreenAdvectingDiffusing/TaylorGreenAdvectingDiffusing.i
@@ -35,13 +35,14 @@ erf.plot_int_1      = 10         # number of timesteps between plotfiles
 erf.plot_vars_1     = density x_velocity y_velocity z_velocity pressure temp theta scalar
 
 # SOLVER CHOICE
-erf.alpha_T = 0.0
-erf.alpha_C = 0.0
 erf.use_gravity = false
 
-erf.les_type         = "None"
-erf.molec_diff_type  = "Constant"
-erf.dynamicViscosity = 6.25e-4 # 1.5e-5
+erf.les_type = "None"
+
+erf.molec_diff_type   = "Constant"
+erf.dynamic_viscosity = 6.25e-4 # 1.5e-5
+erf.alpha_T           = 0.0
+erf.alpha_C           = 0.0
 
 # PROBLEM PARAMETERS
 prob.rho_0 = 1.0