Merge branch 'bartgol/eamxx/avoid-views-in-output-class' (PR #7397)

Replaces manual parallel loops with usage of Field and Field utilities functions.

[BFB]

Author: tcclevenger

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

@@ -312,8 +312,6 @@ build_physics_grid (const ci_string& type, const ci_string& rebalance) {
 
 void HommeGridsManager::
 initialize_vertical_coordinates (const nonconstgrid_ptr_type& dyn_grid) {
-  using view_1d_host = AtmosphereInput::view_1d_host;
-  using vos_t = std::vector<std::string>;
   using namespace ShortFieldTagsNames;
 
   // If we put vcoords in the IC file, we open the ic file, whose name
@@ -329,11 +327,7 @@ initialize_vertical_coordinates (const nonconstgrid_ptr_type& dyn_grid) {
     filename =  m_params.get<std::string>("ic_filename");
   }
 
-  // Read vcoords into host views
-  ekat::ParameterList vcoord_reader_pl;
-  vcoord_reader_pl.set("filename",filename);
-  vcoord_reader_pl.set<vos_t>("field_names",{"hyai","hybi","hyam","hybm"});
-
+  // Create vcoords fields
   auto layout_mid = dyn_grid->get_vertical_layout(true);
   auto layout_int = dyn_grid->get_vertical_layout(false);
   constexpr auto nondim = ekat::units::Units::nondimensional();
@@ -343,39 +337,19 @@ initialize_vertical_coordinates (const nonconstgrid_ptr_type& dyn_grid) {
   auto hyam = dyn_grid->create_geometry_data("hyam",layout_mid,nondim);
   auto hybm = dyn_grid->create_geometry_data("hybm",layout_mid,nondim);
 
-  std::map<std::string,view_1d_host> host_views = {
-    { "hyai", hyai.get_view<Real*,Host>() },
-    { "hybi", hybi.get_view<Real*,Host>() },
-    { "hyam", hyam.get_view<Real*,Host>() },
-    { "hybm", hybm.get_view<Real*,Host>() }
-  };
-  std::map<std::string,FieldLayout> layouts = {
-    { "hyai", layout_int },
-    { "hybi", layout_int },
-    { "hyam", layout_mid },
-    { "hybm", layout_mid }
-  };
-
-  AtmosphereInput vcoord_reader(vcoord_reader_pl,dyn_grid,host_views,layouts);
+  std::vector<Field> fields = {hyai, hybi, hyam, hybm};
+  AtmosphereInput vcoord_reader(filename,dyn_grid,fields);
   vcoord_reader.read_variables();
   vcoord_reader.finalize();
 
-  // Sync to device
-  hyai.sync_to_dev();
-  hybi.sync_to_dev();
-  hyam.sync_to_dev();
-  hybm.sync_to_dev();
-
-  // Pass host views data to hvcoord init function
-  const auto ps0 = Homme::PhysicalConstants::p0;
-
   // Set vcoords in f90
   // NOTE: homme does the check for these arrays, so no need to do any property check here
+  const auto ps0 = Homme::PhysicalConstants::p0;
   prim_set_hvcoords_f90 (ps0,
-                         host_views["hyai"].data(),
-                         host_views["hybi"].data(),
-                         host_views["hyam"].data(),
-                         host_views["hybm"].data());
+                         hyai.get_internal_view_data<Real,Host>(),
+                         hybi.get_internal_view_data<Real,Host>(),
+                         hyam.get_internal_view_data<Real,Host>(),
+                         hybm.get_internal_view_data<Real,Host>());
 }
 
 void HommeGridsManager::

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

@@ -210,8 +210,6 @@ void MAMOptics::initialize_impl(const RunType run_type) {
   {
     using namespace ShortFieldTagsNames;
 
-    using view_1d_host = typename KT::view_1d<Real>::HostMirror;
-
     // Note: these functions do not set values for aerosol_optics_device_data_.
     mam4::modal_aer_opt::set_complex_views_modal_aero(
         aerosol_optics_device_data_);
@@ -220,23 +218,16 @@ void MAMOptics::initialize_impl(const RunType run_type) {
     mam4::modal_aer_opt::set_aerosol_optics_data_for_modal_aero_lw_views(
         aerosol_optics_device_data_);
 
-    mam_coupling::AerosolOpticsHostData aerosol_optics_host_data;
-
-    std::map<std::string, FieldLayout> layouts;
-    std::map<std::string, view_1d_host> host_views;
-    ekat::ParameterList rrtmg_params;
-
-    mam_coupling::set_parameters_table(aerosol_optics_host_data, rrtmg_params,
-                                       layouts, host_views);
+    auto aerosol_optics_fields = mam_coupling::create_optics_fields(grid_);
 
     for(int imode = 0; imode < ntot_amode; imode++) {
       const auto key =
           "mam4_mode" + std::to_string(imode + 1) + "_physical_properties_file";
       const auto &fname = m_params.get<std::string>(key);
       mam_coupling::read_rrtmg_table(fname,
                                      imode,  // mode No
-                                     rrtmg_params, grid_, host_views, layouts,
-                                     aerosol_optics_host_data,
+                                     grid_,
+                                     aerosol_optics_fields,
                                      aerosol_optics_device_data_);
     }
 
@@ -249,14 +240,8 @@ void MAMOptics::initialize_impl(const RunType run_type) {
                                       aerosol_optics_device_data_.crefwsw);
     //
     {
-      // make a list of host views
-      std::map<std::string, view_1d_host> host_views_aero;
-      // defines layouts
-      std::map<std::string, FieldLayout> layouts_aero;
-      ekat::ParameterList params_aero;
       std::string surname_aero = "aer";
-      mam_coupling::set_refindex_names(surname_aero, params_aero,
-                                       host_views_aero, layouts_aero);
+      auto refindex_fields = mam_coupling::create_refindex_fields (surname_aero,grid_);
 
       constexpr int maxd_aspectype = mam4::ndrop::maxd_aspectype;
       auto specrefndxsw_host       = mam_coupling::complex_view_2d::HostMirror(
@@ -283,14 +268,12 @@ void MAMOptics::initialize_impl(const RunType run_type) {
         const auto &fname = m_params.get<std::string>(table_name);
         // read data
         // need to update table name
-        params_aero.set("filename", fname);
-        AtmosphereInput refindex_aerosol(params_aero, grid_, host_views_aero,
-                                         layouts_aero);
+        AtmosphereInput refindex_aerosol(fname, grid_, refindex_fields);
         refindex_aerosol.read_variables();
         refindex_aerosol.finalize();
         // copy data to device
         mam_coupling::set_refindex_aerosol(
-            species_id, host_views_aero,
+            species_id, refindex_fields,
             specrefndxsw_host,  // complex refractive index for water visible
             specrefndxlw_host);
       }  // done ispec