EAMxx: Removing changes in the RRTMGP interface. It was decided not to couple O3 from the chemistry model.

Author: odiazib

components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.cpp

@@ -82,9 +82,6 @@ RRTMGPRadiation (const ekat::Comm& comm, const ekat::ParameterList& params)
 
   // Determine rad timestep, specified as number of atm steps
   m_rad_freq_in_steps = m_params.get<Int>("rad_frequency", 1);
-  // use ozone computed by a chemistry model, e.g., mam4xx
-  m_prognostic_ozone =m_params.get<bool>("prognostic_ozone",false);
-
 }
 
 void RRTMGPRadiation::set_grids(const std::shared_ptr<const GridsManager> grids_manager) {
@@ -303,11 +300,6 @@ void RRTMGPRadiation::set_grids(const std::shared_ptr<const GridsManager> grids_
       m_grid->set_geometry_data(bands);
     }
   }
-  // O3 from chemistry model
-  if (m_prognostic_ozone)
-  {
-   add_field<Required>("O3",  scalar3d_mid, mol/mol,    grid_name);
-  }
 }  // RRTMGPRadiation::set_grids
 
 size_t RRTMGPRadiation::requested_buffer_size_in_bytes() const
@@ -391,9 +383,6 @@ void RRTMGPRadiation::init_buffers(const ATMBufferManager &buffer_manager)
   mem += m_buffer.d_tint.size();
   m_buffer.d_dz  = decltype(m_buffer.d_dz)(mem, m_col_chunk_size, m_nlay);
   mem += m_buffer.d_dz.size();
-  //
-  m_buffer.o3_prog  = decltype(m_buffer.o3_prog)(mem, m_col_chunk_size, m_nlay);
-  mem += m_buffer.o3_prog.size();
   // 3d arrays
   m_buffer.sw_flux_up_k = decltype(m_buffer.sw_flux_up_k)(mem, m_col_chunk_size, m_nlay+1);
   mem += m_buffer.sw_flux_up_k.size();
@@ -560,19 +549,6 @@ void RRTMGPRadiation::initialize_impl(const RunType run_type) {
 
   m_force_run_on_next_step = run_type==RunType::Initial or
     m_params.get("force_run_after_restart",false);
-
-  // If m_prognostic_ozone is true, we should not use O3 as it is currently employed in RRTMGP.
-  if (m_prognostic_ozone)
-  {
-   for (int igas = 0; igas < m_ngas; igas++) {
-    auto name = m_gas_names[igas];
-    EKAT_REQUIRE_MSG(
-        m_gas_names[igas] !="o3",
-        "Error! m_prognostic_ozone is set to true,"
-        "remove o3 from list of active gases.. \n");
-   }
-  }
-
 }
 
 // =========================================================================================
@@ -979,28 +955,6 @@ void RRTMGPRadiation::run_impl (const double dt) {
         m_gas_concs_k.set_vmr(name, tmp2d_k);
       }
 
-      if (m_prognostic_ozone)
-      {
-        auto o3_dry_vmr = m_buffer.o3_prog;
-        // get O3 from FM, here we assume that O3 is wet_mmr
-        auto o3_wet_mmr = get_field_out("O3").get_view<Real**>();
-        const Real O3_molecular_weigth= PC::get_gas_mol_weight("o3");
-        const auto policy = ekat::ExeSpaceUtils<ExeSpace>::get_default_team_policy(ncol, m_nlay);
-        const int nlev_local = m_nlay;
-        Kokkos::parallel_for(policy, KOKKOS_LAMBDA(const MemberType& team) {
-        const int icol = team.league_rank();
-          Kokkos::parallel_for(Kokkos::TeamVectorRange(team, nlev_local), [&] (const int& k) {
-          // from wet to dry
-          const Real o3_dry_mmr = PF::calculate_drymmr_from_wetmmr(o3_wet_mmr(icol,k),d_qv(icol,k));
-          // Question: Do I need to use qv_dry?
-          // from mmr to vmr
-          o3_dry_vmr(icol,k) = PF::calculate_vmr_from_mmr(O3_molecular_weigth,
-                          d_qv(icol,k),o3_dry_mmr);
-        });
-      });
-      m_gas_concs_k.set_vmr("o3", o3_dry_vmr);
-      }
-
       // Set layer cloud fraction.
       //
       // If not doing subcolumn sampling for mcica, we want to make sure we use grid-mean

components/eamxx/src/physics/rrtmgp/eamxx_rrtmgp_process_interface.hpp

@@ -133,7 +133,7 @@ class RRTMGPRadiation : public AtmosphereProcess {
   // Structure for storing local variables initialized using the ATMBufferManager
   struct Buffer {
     static constexpr int num_1d_ncol        = 8;
-    static constexpr int num_2d_nlay        = 17;
+    static constexpr int num_2d_nlay        = 16;
     static constexpr int num_2d_nlay_p1     = 23;
     static constexpr int num_2d_nswbands    = 2;
     static constexpr int num_3d_nlev_nswbands = 4;
@@ -171,10 +171,6 @@ class RRTMGPRadiation : public AtmosphereProcess {
     ureal2dk sw_heating_k;
     ureal2dk lw_heating_k;
 
-    // ozone prog
-    ureal2dk o3_prog;
-
-
     // 2d size (ncol, nlay+1)
     ureal2dk d_tint;
     ureal2dk p_lev_k;
@@ -244,10 +240,6 @@ class RRTMGPRadiation : public AtmosphereProcess {
   Buffer m_buffer;
 
   bool m_force_run_on_next_step = false;
-  // use a ozone prognostic variable computed by chemistry
-  bool m_prognostic_ozone = false;
-
-
 };  // class RRTMGPRadiation
 
 }  // namespace scream