Change turbulence_advected->no_turbulence_advection, and give a default value (false)

Author: tcclevenger

components/eamxx/src/control/atmosphere_surface_coupling_exporter.cpp

@@ -44,7 +44,7 @@ void SurfaceCouplingExporter::set_grids(const std::shared_ptr<const GridsManager
   add_field<Required>("phis",                 scalar2d_layout,      m2/s2,  grid_name);
   add_field<Required>("p_mid",                scalar3d_layout_mid,  Pa,     grid_name, ps);
   add_field<Required>("T_mid",                scalar3d_layout_mid,  K,      grid_name, ps);
-  add_tracer<Required>("qv", m_grid,  kg/kg, true, ps);
+  add_tracer<Required>("qv", m_grid,  kg/kg, ps);
   // TODO: Switch horiz_winds to using U and V, note right now there is an issue with when the subfields are created, so can't switch yet.
   add_field<Required>("horiz_winds",          vector3d_layout,      m/s,    grid_name);
   add_field<Required>("sfc_flux_dir_nir",     scalar2d_layout,      W/m2,   grid_name);

components/eamxx/src/dynamics/homme/eamxx_homme_process_interface.cpp

@@ -179,7 +179,7 @@ void HommeDynamics::set_grids (const std::shared_ptr<const GridsManager> grids_m
   add_field<Computed>("p_dry_mid",          pg_scalar3d_mid, Pa,    pgn,N);
   add_field<Computed>("omega",              pg_scalar3d_mid, Pa/s,  pgn,N);
 
-  add_tracer<Updated >("qv", m_phys_grid, kg/kg, true, N);
+  add_tracer<Updated >("qv", m_phys_grid, kg/kg, N);
   add_group<Updated>("tracers",pgn,N, true);
 
   if (fv_phys_active()) {

components/eamxx/src/physics/cld_fraction/eamxx_cld_fraction_process_interface.cpp

@@ -38,7 +38,7 @@ void CldFraction::set_grids(const std::shared_ptr<const GridsManager> grids_mana
 
   // Set of fields used strictly as input
   constexpr int ps = Pack::n;
-  add_tracer<Required>("qi", m_grid, kg/kg, true, ps);
+  add_tracer<Required>("qi", m_grid, kg/kg, ps);
   add_field<Required>("cldfrac_liq", scalar3d_layout_mid, nondim, grid_name,ps);
 
   // Set of fields used strictly as output

components/eamxx/src/physics/cosp/eamxx_cosp.cpp

@@ -75,9 +75,9 @@ void Cosp::set_grids(const std::shared_ptr<const GridsManager> grids_manager)
   add_field<Required>("phis",             scalar2d    , m2/s2,  grid_name);
   add_field<Required>("pseudo_density",   scalar3d_mid, Pa,     grid_name);
   add_field<Required>("cldfrac_rad",      scalar3d_mid, nondim, grid_name);
-  add_tracer<Required>("qv", m_grid, kg/kg, true);
-  add_tracer<Required>("qc", m_grid, kg/kg, true);
-  add_tracer<Required>("qi", m_grid, kg/kg, true);
+  add_tracer<Required>("qv", m_grid, kg/kg);
+  add_tracer<Required>("qc", m_grid, kg/kg);
+  add_tracer<Required>("qi", m_grid, kg/kg);
   // Optical properties, should be computed in radiation interface
   add_field<Required>("dtau067",     scalar3d_mid, nondim, grid_name); // 0.67 micron optical depth
   add_field<Required>("dtau105",     scalar3d_mid, nondim, grid_name); // 10.5 micron optical depth

components/eamxx/src/physics/mam/eamxx_mam_generic_process_interface.cpp

@@ -151,13 +151,13 @@ void MAMGenericInterface::add_tracers_interstitial_aerosol() {
     // interstitial aerosol tracers of interest: number (n) mixing ratios
     const std::string int_nmr_field_name =
         mam_coupling::int_aero_nmr_field_name(mode);
-    add_tracer<Updated>(int_nmr_field_name, grid_, n_unit, false);
+    add_tracer<Updated>(int_nmr_field_name, grid_, n_unit, 1, true);
     for(int a = 0; a < mam_coupling::num_aero_species(); ++a) {
       // (interstitial) aerosol tracers of interest: mass (q) mixing ratios
       const std::string int_mmr_field_name =
           mam_coupling::int_aero_mmr_field_name(mode, a);
       if(not int_mmr_field_name.empty()) {
-        add_tracer<Updated>(int_mmr_field_name, grid_, q_unit, false);
+        add_tracer<Updated>(int_mmr_field_name, grid_, q_unit, 1, true);
       }
     }  // end for loop num species
   }    // end for loop for num modes
@@ -169,7 +169,7 @@ void MAMGenericInterface::add_tracers_gases() {
   auto q_unit = kg / kg;  // units of mass mixing ratios of tracers
   for(int g = 0; g < mam_coupling::num_aero_gases(); ++g) {
     const std::string gas_mmr_field_name = mam_coupling::gas_mmr_field_name(g);
-    add_tracer<Updated>(gas_mmr_field_name, grid_, q_unit, true);
+    add_tracer<Updated>(gas_mmr_field_name, grid_, q_unit);
   }  // end for loop num gases
 }
 // ================================================================
@@ -333,19 +333,19 @@ void MAMGenericInterface::add_tracers_wet_atm() {
 
   // atmospheric quantities
   // specific humidity [kg/kg]
-  add_tracer<Required>("qv", grid_, q_unit, true);
+  add_tracer<Required>("qv", grid_, q_unit);
 
   // cloud liquid mass mixing ratio [kg/kg]
-  add_tracer<Required>("qc", grid_, q_unit, true);
+  add_tracer<Required>("qc", grid_, q_unit);
 
   // cloud ice mass mixing ratio [kg/kg]
-  add_tracer<Required>("qi", grid_, q_unit, true);
+  add_tracer<Required>("qi", grid_, q_unit);
 
   // cloud liquid number mixing ratio [1/kg]
-  add_tracer<Required>("nc", grid_, n_unit, true);
+  add_tracer<Required>("nc", grid_, n_unit);
 
   // cloud ice number mixing ratio [1/kg]
-  add_tracer<Required>("ni", grid_, n_unit, true);
+  add_tracer<Required>("ni", grid_, n_unit);
 }
 
 void MAMGenericInterface::add_fields_dry_atm() {

components/eamxx/src/physics/ml_correction/eamxx_ml_correction_process_interface.cpp

@@ -66,7 +66,7 @@ void MLCorrection::set_grids(
   add_field<Updated>("precip_liq_surf_mass", scalar2d,     kg/m2,  grid_name);
   add_field<Updated>("precip_ice_surf_mass", scalar2d,     kg/m2,  grid_name);
   /* ----------------------- WARNING --------------------------------*/
-  add_tracer<Updated>("qv", m_grid, kg/kg, true, ps);
+  add_tracer<Updated>("qv", m_grid, kg/kg, ps);
   add_group<Updated>("tracers", grid_name, 1, true);
 }
 

components/eamxx/src/physics/nudging/eamxx_nudging_process_interface.cpp

@@ -83,7 +83,7 @@ void Nudging::set_grids(const std::shared_ptr<const GridsManager> grids_manager)
     add_field<Updated>("T_mid", scalar3d_layout_mid, K, grid_name, ps);
   }
   if (ekat::contains(m_fields_nudge,"qv")) {
-    add_tracer<Updated>("qv", m_grid, kg/kg, true, ps);
+    add_tracer<Updated>("qv", m_grid, kg/kg, ps);
   }
   if (ekat::contains(m_fields_nudge,"U") or ekat::contains(m_fields_nudge,"V")) {
     add_field<Updated>("horiz_winds",   horiz_wind_layout,   m/s,     grid_name, ps);

components/eamxx/src/physics/p3/eamxx_p3_process_interface.cpp

@@ -76,15 +76,15 @@ void P3Microphysics::set_grids(const std::shared_ptr<const GridsManager> grids_m
   add_field<Updated> ("T_mid",       scalar3d_layout_mid, K,      grid_name, ps);  // T_mid is the only one of these variables that is also updated.
 
   // Prognostic State:  (all fields are both input and output)
-  add_tracer<Updated>("qv", m_grid, kg/kg, true, ps);
-  add_tracer<Updated>("qc", m_grid, kg/kg, true, ps);
-  add_tracer<Updated>("qr", m_grid, kg/kg, true, ps);
-  add_tracer<Updated>("qi", m_grid, kg/kg, true, ps);
-  add_tracer<Updated>("qm", m_grid, kg/kg, true, ps);
-  add_tracer<Updated>("nc", m_grid, 1/kg,  true, ps);
-  add_tracer<Updated>("nr", m_grid, 1/kg,  true, ps);
-  add_tracer<Updated>("ni", m_grid, 1/kg,  true, ps);
-  add_tracer<Updated>("bm", m_grid, 1/kg,  true, ps);
+  add_tracer<Updated>("qv", m_grid, kg/kg, ps);
+  add_tracer<Updated>("qc", m_grid, kg/kg, ps);
+  add_tracer<Updated>("qr", m_grid, kg/kg, ps);
+  add_tracer<Updated>("qi", m_grid, kg/kg, ps);
+  add_tracer<Updated>("qm", m_grid, kg/kg, ps);
+  add_tracer<Updated>("nc", m_grid, 1/kg,  ps);
+  add_tracer<Updated>("nr", m_grid, 1/kg,  ps);
+  add_tracer<Updated>("ni", m_grid, 1/kg,  ps);
+  add_tracer<Updated>("bm", m_grid, 1/kg,  ps);
 
   // Diagnostic Inputs: (only the X_prev fields are both input and output, all others are just inputs)
   add_field<Required>("nc_nuceat_tend",     scalar3d_layout_mid, 1/(kg*s), grid_name, ps);
@@ -346,7 +346,7 @@ void P3Microphysics::initialize_impl (const RunType /* run_type */)
   diag_inputs.cld_frac_r      = p3_preproc.cld_frac_r;
   diag_inputs.dz              = p3_preproc.dz;
   diag_inputs.inv_exner       = p3_preproc.inv_exner;
-  
+
   // Inputs for the heteogeneous freezing
   if (runtime_options.use_hetfrz_classnuc){
     diag_inputs.hetfrz_immersion_nucleation_tend  = get_field_in("hetfrz_immersion_nucleation_tend").get_view<const Pack**>();

components/eamxx/src/physics/shoc/eamxx_shoc_process_interface.cpp

@@ -61,7 +61,7 @@ void SHOCMacrophysics::set_grids(const std::shared_ptr<const GridsManager> grids
 
   add_field<Updated>("surf_evap",       scalar2d    , kg/(m2*s), grid_name);
   add_field<Updated> ("T_mid",          scalar3d_mid, K,         grid_name, ps);
-  add_tracer<Updated>("qv", m_grid, kg/kg, true, ps);
+  add_tracer<Updated>("qv", m_grid, kg/kg, ps);
 
   // If TMS is a process, add surface drag coefficient to required fields
   if (m_params.get<bool>("apply_tms", false)) {
@@ -79,8 +79,8 @@ void SHOCMacrophysics::set_grids(const std::shared_ptr<const GridsManager> grids
   add_field<Updated>("sgs_buoy_flux", scalar3d_mid, K*(m/s), grid_name, ps);
   add_field<Updated>("eddy_diff_mom", scalar3d_mid, m2/s,    grid_name, ps);
   add_field<Updated>("cldfrac_liq",   scalar3d_mid, nondim,  grid_name, ps);
-  add_tracer<Updated>("tke", m_grid, m2/s2, true, ps);
-  add_tracer<Updated>("qc",  m_grid, kg/kg, true, ps);
+  add_tracer<Updated>("tke", m_grid, m2/s2, ps);
+  add_tracer<Updated>("qc",  m_grid, kg/kg, ps);
 
   // Output variables
   add_field<Computed>("pbl_height",    scalar2d    , m,            grid_name);

components/eamxx/src/physics/tms/eamxx_tms_process_interface.cpp

@@ -52,7 +52,7 @@ void TurbulentMountainStress::set_grids(const std::shared_ptr<const GridsManager
   add_field<Required>("pseudo_density", scalar3d_mid, Pa,     grid_name,            ps);
   add_field<Required>("sgh30",          scalar2d    , m,      grid_name);
   add_field<Required>("landfrac",       scalar2d    , nondim, grid_name);
-  add_tracer<Required>("qv", m_grid, kg/kg, true, ps);
+  add_tracer<Required>("qv", m_grid, kg/kg, ps);
 
   add_field<Computed>("surf_drag_coeff_tms", scalar2d, kg/(m2*s), grid_name);
   add_field<Computed>("wind_stress_tms",     vector2d, N/m2,      grid_name);