EAMxx: switch from ekat::enable_shared_from_this to the std version

Author: bartgol

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

@@ -147,7 +147,6 @@ void HommeGridsManager::build_dynamics_grid () {
   const int nlev   = get_nlev_f90();
 
   auto dyn_grid = std::make_shared<SEGrid>("dynamics",nlelem,HOMMEXX_NP,nlev,m_comm);
-  dyn_grid->setSelfPointer(dyn_grid);
 
   const auto layout2d = dyn_grid->get_2d_scalar_layout();
   const Units rad (Units::nondimensional(),"rad");
@@ -215,7 +214,6 @@ build_physics_grid (const ci_string& type, const ci_string& rebalance) {
   const int nlcols = get_num_local_columns_f90 (pg_code % 10);
 
   auto phys_grid = std::make_shared<PointGrid>(name,nlcols,nlev,m_comm);
-  phys_grid->setSelfPointer(phys_grid);
 
   // Create the gids, coords, area views
   using namespace ShortFieldTagsNames;

components/eamxx/src/share/atm_process/atmosphere_diagnostic.hpp

@@ -94,9 +94,7 @@ using AtmosphereDiagnosticFactory =
 template <typename AtmDiagType>
 inline std::shared_ptr<AtmosphereDiagnostic>
 create_atmosphere_diagnostic (const ekat::Comm& comm, const ekat::ParameterList& p) {
-  auto ptr = std::make_shared<AtmDiagType>(comm,p);
-  ptr->setSelfPointer(ptr);
-  return ptr;
+  return std::make_shared<AtmDiagType>(comm,p);
 }
 } //namespace scream
 

components/eamxx/src/share/atm_process/atmosphere_process.hpp

@@ -17,12 +17,12 @@
 #include <ekat_parameter_list.hpp>
 #include <ekat_factory.hpp>
 #include <ekat_string_utils.hpp>
-#include <ekat_std_enable_shared_from_this.hpp>
 #include <ekat_logger.hpp>
 
 #include <memory>
 #include <string>
 #include <set>
+#include <any>
 #include <list>
 
 namespace scream
@@ -69,7 +69,7 @@ namespace scream
  *     to override the get_internal_fields method.
  */
 
-class AtmosphereProcess : public ekat::enable_shared_from_this<AtmosphereProcess>
+class AtmosphereProcess : public std::enable_shared_from_this<AtmosphereProcess>
 {
 public:
   using TimeStamp = util::TimeStamp;
@@ -657,9 +657,7 @@ using AtmosphereProcessFactory =
 template <typename AtmProcType>
 inline std::shared_ptr<AtmosphereProcess>
 create_atmosphere_process (const ekat::Comm& comm, const ekat::ParameterList& p) {
-  auto ptr = std::make_shared<AtmProcType>(comm,p);
-  ptr->setSelfPointer(ptr);
-  return ptr;
+  return std::make_shared<AtmProcType>(comm,p);
 }
 
 } // namespace scream

components/eamxx/src/share/field/field.cpp

@@ -6,9 +6,8 @@ namespace scream
 
 Field::
 Field (const identifier_type& id)
- : m_header (create_header(id))
 {
-  // Nothing to do here
+  m_header = std::make_shared<FieldHeader>(id);
 }
 
 Field

components/eamxx/src/share/field/field_header.cpp

@@ -6,8 +6,8 @@ namespace scream {
 
 FieldHeader::FieldHeader (const identifier_type& id)
  : m_identifier (id)
- , m_tracking (create_tracking())
 {
+  m_tracking   = std::make_shared<FieldTracking>();
   m_alloc_prop = std::make_shared<FieldAllocProp>(get_type_size(id.data_type()));
   m_extra_data = std::make_shared<extra_data_type>();
 
@@ -33,7 +33,7 @@ set_extra_data (const std::string& key,
 }
 
 std::shared_ptr<FieldHeader> FieldHeader::alias(const std::string& name) const {
-  auto fh = create_header(get_identifier().alias(name));
+  auto fh = std::make_shared<FieldHeader>(get_identifier().alias(name));
   fh->m_tracking = m_tracking;
   fh->m_alloc_prop = m_alloc_prop;
   fh->m_extra_data = m_extra_data;
@@ -72,11 +72,11 @@ create_subfield_header (const FieldIdentifier& id,
       "Error! Invalid pointer for parent header.\n");
 
   // Create header, and set up parent/child
-  auto fh = create_header(id);
+  auto fh = std::make_shared<FieldHeader>(id);
   fh->create_parent_child_link(parent);
 
   // Create tracking, and set up parent/child
-  fh->m_tracking = create_tracking();
+  fh->m_tracking = std::make_shared<FieldTracking>();
   fh->m_tracking->create_parent_child_link(parent->get_tracking_ptr());
   if (parent->get_tracking().get_time_stamp().is_valid()) {
     fh->m_tracking->update_time_stamp(parent->get_tracking().get_time_stamp());
@@ -100,11 +100,11 @@ create_subfield_header(const FieldIdentifier& id,
                    "Error! Slice indices are invalid (non-increasing).\n");
 
   // Create header, and set up parent/child
-  auto fh = create_header(id);
+  auto fh = std::make_shared<FieldHeader>(id);
   fh->create_parent_child_link(parent);
 
   // Create tracking, and set up parent/child
-  fh->m_tracking = create_tracking();
+  fh->m_tracking = std::make_shared<FieldTracking>();
   fh->m_tracking->create_parent_child_link(parent->get_tracking_ptr());
   if (parent->get_tracking().get_time_stamp().is_valid()) {
     fh->m_tracking->update_time_stamp(parent->get_tracking().get_time_stamp());

components/eamxx/src/share/field/field_header.hpp

@@ -161,15 +161,6 @@ has_extra_data (const std::string& key) const
   return m_extra_data->find(key)!=m_extra_data->end();
 }
 
-// Use this free function to exploit features of enable_from_this
-template<typename... Args>
-inline std::shared_ptr<FieldHeader>
-create_header(const Args&... args) {
-  auto ptr = std::make_shared<FieldHeader>(args...);
-  ptr->setSelfPointer(ptr);
-  return ptr;
-}
-
 // Use this free function to create a header for a field that
 // is the subfield of another field, that is, for something
 // that (in matlab syntax) looks like sf = f(:,1,:)

components/eamxx/src/share/field/field_tracking.hpp

@@ -93,17 +93,6 @@ class FieldTracking : public FamilyTracking<FieldTracking> {
   ekat::WeakPtrSet<const FieldGroupInfo>    m_groups;
 };
 
-// Use this free function to exploit features of enable_shared_from_this,
-// as well as features from FamilyTracking.
-template<typename... Args>
-inline std::shared_ptr<FieldTracking>
-create_tracking(const Args&... args) {
-  auto ptr = std::make_shared<FieldTracking>(args...);
-  ptr->setSelfPointer(ptr);
-  return ptr;
-}
-
-
 } // namespace scream
 
 #endif // SCREAM_FIELD_TRACKING_HPP

components/eamxx/src/share/grid/abstract_grid.hpp

@@ -38,7 +38,7 @@ namespace scream
  * like spatial dimension or "physical" rank.
  */
 
-class AbstractGrid : public ekat::enable_shared_from_this<AbstractGrid>
+class AbstractGrid : public std::enable_shared_from_this<AbstractGrid>
 {
 public:
   // TODO: use int64_t? int? template class on gid_type?

components/eamxx/src/share/grid/mesh_free_grids_manager.cpp

@@ -68,7 +68,6 @@ build_se_grid (const std::string& name, ekat::ParameterList& params)
   // Create the grid
   std::shared_ptr<SEGrid> se_grid;
   se_grid = std::make_shared<SEGrid>(name,num_local_elems,num_gp,num_vertical_levels,m_comm);
-  se_grid->setSelfPointer(se_grid);
 
   // Set up the degrees of freedom.
   auto dof_gids  = se_grid->get_dofs_gids();

components/eamxx/src/share/grid/point_grid.cpp

@@ -160,7 +160,6 @@ create_point_grid (const std::string& grid_name,
   }
 
   auto grid = std::make_shared<PointGrid>(grid_name,num_my_cols,num_vertical_lev,comm);
-  grid->setSelfPointer(grid);
 
   auto dofs_gids = grid->get_dofs_gids();
   auto h_dofs_gids = dofs_gids.get_view<AbstractGrid::gid_type*,Host>();