EAMxx: Initialize VerticalRemapperMAM4::m_vremap_type in the constructor.

Author: odiazib

components/eamxx/src/physics/mam/readfiles/vertical_remapper_mam4.cpp

@@ -16,13 +16,16 @@ namespace scream
 {
 VerticalRemapperMAM4::
 VerticalRemapperMAM4 (const grid_ptr_type& src_grid,
-                  const grid_ptr_type& tgt_grid)
+                  const grid_ptr_type& tgt_grid,
+                  const VertRemapType& vremp_type)
 {
   // We only go in one direction for simplicity, since we need to setup some
   // infrsatructures, and we don't want to setup 2x as many "just in case".
   // If you need to remap bwd, just create another remapper with src/tgt grids swapped.
   m_bwd_allowed = false;
 
+  m_vremap_type=vremp_type;
+
   EKAT_REQUIRE_MSG (src_grid->get_2d_scalar_layout().congruent(tgt_grid->get_2d_scalar_layout()),
       "Error! Source and target grid can only differ for their number of level.\n");
 
@@ -49,11 +52,6 @@ set_target_pressure (const Field& p)
 {
   m_tgt_pmid=p;
 }
-void VerticalRemapperMAM4::
-set_vremap_type(const VertRemapType& vremp_type)
-{
-  m_vremap_type=vremp_type;
-}
 
 void VerticalRemapperMAM4::
 apply_vertical_interpolation(const Field& f_src, const Field& f_tgt,

components/eamxx/src/physics/mam/readfiles/vertical_remapper_mam4.hpp

@@ -22,13 +22,13 @@ class VerticalRemapperMAM4 : public AbstractRemapper
   };
 
   VerticalRemapperMAM4 (const grid_ptr_type& src_grid,
-                    const grid_ptr_type& tgt_grid);
+                        const grid_ptr_type& tgt_grid,
+                        const VertRemapType& vremp_type);
 
   ~VerticalRemapperMAM4 () = default;
 
   void set_source_pressure (const Field& p);
   void set_target_pressure (const Field& p);
-  void set_vremap_type (const VertRemapType&  vremp_type);
 
 protected:
 

components/eamxx/src/share/util/eamxx_data_interpolation.cpp

@@ -499,10 +499,11 @@ setup_vert_remapper (const RemapData& data)
     p_data_reader.read_variables();
   }
   if (m_vr_type==MAM4_PSRef) {
-    auto vremap = std::make_shared<VerticalRemapperMAM4>(m_grid_after_hremap, m_model_grid);
+    auto vremap = std::make_shared<VerticalRemapperMAM4>(m_grid_after_hremap, m_model_grid,
+      VerticalRemapperMAM4::VertRemapType::MAM4_PSRef);
     vremap->set_source_pressure (m_helper_pressure_fields["p_data"]);
     vremap->set_target_pressure(data.pmid);
-    vremap->set_vremap_type(VerticalRemapperMAM4::VertRemapType::MAM4_PSRef);
+    // vremap->set_vremap_type(VerticalRemapperMAM4::VertRemapType::MAM4_PSRef);
     m_vert_remapper = vremap;
     return;
   }
@@ -513,8 +514,9 @@ setup_vert_remapper (const RemapData& data)
     auto levs_field = m_grid_after_hremap->create_geometry_data("lev",layout,mbar);
     AtmosphereInput p_data_reader (m_time_database.files.front(),m_grid_after_hremap,{levs_field},true);
     p_data_reader.read_variables();
-    auto vremap = std::make_shared<VerticalRemapperMAM4>(m_grid_after_hremap, m_model_grid);
-    vremap->set_vremap_type (VerticalRemapperMAM4::VertRemapType::MAM4_ZONAL);
+    auto vremap = std::make_shared<VerticalRemapperMAM4>(m_grid_after_hremap, m_model_grid,
+       VerticalRemapperMAM4::VertRemapType::MAM4_ZONAL);
+    // vremap->set_vremap_type (VerticalRemapperMAM4::VertRemapType::MAM4_ZONAL);
     vremap->set_source_pressure (levs_field);
     vremap->set_target_pressure(data.pmid);
     m_vert_remapper = vremap;