EAMxx: fix usage of std::any for restart data in atm procs

Author: bartgol

components/eamxx/src/control/atmosphere_driver.cpp

@@ -955,7 +955,7 @@ void AtmosphereDriver::restart_model ()
 
   for (auto& it : m_atm_process_group->get_restart_extra_data()) {
     const auto& name = it.first;
-          auto& any  = it.second;
+          auto& any  = *it.second;
 
     if (any.type()==typeid(int)) {
       std::any_cast<int&>(any) = scorpio::get_attribute<int>(filename,"GLOBAL",name);

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

@@ -52,7 +52,7 @@ HommeDynamics::HommeDynamics (const ekat::Comm& comm, const ekat::ParameterList&
   // This class needs Homme's context, so register as a user
   HommeContextUser::singleton().add_user();
 
-  m_restart_extra_data["homme_nsteps"] = std::make_any<int>(-1);
+  m_restart_extra_data["homme_nsteps"] = std::make_shared<std::any>(std::make_any<int>(-1));
 
   if (!is_parallel_inited_f90()) {
     // While we're here, we can init homme's parallel session
@@ -505,8 +505,7 @@ void HommeDynamics::run_impl (const double dt)
 
     // Update nstep in the restart extra data, so it can be written to restart if needed.
     const auto& tl = c.get<Homme::TimeLevel>();
-    auto& nstep = std::any_cast<int&>(m_restart_extra_data["homme_nsteps"]);
-    nstep = tl.nstep;
+    std::any_cast<int&>(*m_restart_extra_data["homme_nsteps"]) = tl.nstep;
 
     // Post process Homme's output, to produce what the rest of Atm expects
     Kokkos::fence();
@@ -940,7 +939,7 @@ void HommeDynamics::restart_homme_state () {
         auto& tl = c.get<Homme::TimeLevel>();
 
   // For BFB restarts, set nstep counter in Homme's TimeLevel to match the restarted value.
-  const auto& nstep = std::any_cast<int>(m_restart_extra_data["homme_nsteps"]);
+  const auto& nstep = std::any_cast<const int&>(*m_restart_extra_data["homme_nsteps"]);
   tl.nstep = nstep;
   set_homme_param("num_steps",nstep);
 
@@ -1119,7 +1118,7 @@ void HommeDynamics::initialize_homme_state () {
   const int n0  = tl.n0;
   const int n0_qdp  = tl.n0_qdp;
 
-  std::any_cast<int&>(m_restart_extra_data["homme_nsteps"]) = tl.nstep;
+  std::any_cast<int&>(*m_restart_extra_data["homme_nsteps"]) = tl.nstep;
 
   const auto phis_dyn_view = m_helper_fields.at("phis_dyn").get_view<const Real***>();
   const auto phi_int_view = m_helper_fields.at("phi_int_dyn").get_view<Pack*****>();

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

@@ -266,8 +266,8 @@ class AtmosphereProcess : public std::enable_shared_from_this<AtmosphereProcess>
   //  - these maps are: data_name -> std::any
   //  - the data_name is unique across the whole atm
   // The AD will take care of ensuring these are written/read to/from restart files.
-  const strmap_t<std::any>& get_restart_extra_data () const { return m_restart_extra_data; }
-        strmap_t<std::any>& get_restart_extra_data ()       { return m_restart_extra_data; }
+  const strmap_t<std::shared_ptr<std::any>>& get_restart_extra_data () const { return m_restart_extra_data; }
+        strmap_t<std::shared_ptr<std::any>>& get_restart_extra_data ()       { return m_restart_extra_data; }
 
   // Boolean that dictates whether or not the conservation checks are run for this process
   bool has_column_conservation_check () { return m_column_conservation_check_data.has_check; }
@@ -506,7 +506,7 @@ class AtmosphereProcess : public std::enable_shared_from_this<AtmosphereProcess>
   std::shared_ptr<logger_t>  m_atm_logger;
 
   // Extra data needed for restart
-  strmap_t<std::any>  m_restart_extra_data;
+  strmap_t<std::shared_ptr<std::any>>  m_restart_extra_data;
 
   // Use at your own risk. Motivation: Free up device memory for a field that is
   // no longer used, such as a field read in the ICs used only to initialize

components/eamxx/src/share/io/eamxx_output_manager.cpp

@@ -296,7 +296,7 @@ setup (const std::shared_ptr<fm_type>& field_mgr,
 }
 
 void OutputManager::
-add_global (const std::string& name, const std::any& global) {
+add_global (const std::string& name, const std::shared_ptr<std::any>& global) {
   EKAT_REQUIRE_MSG (m_globals.find(name)==m_globals.end(),
       "Error! Global attribute was already set in this output manager.\n"
       "  - global att name: " + name + "\n");
@@ -540,17 +540,17 @@ void OutputManager::run(const util::TimeStamp& timestamp)
       // Write all stored globals
       for (const auto& it : m_globals) {
         const auto& name = it.first;
-        const auto& any = it.second;
+        const auto& any = *it.second;
         if (any.type()==typeid(int)) {
-          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<int>(any));
+          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<const int&>(any));
         } else if (any.type()==typeid(std::int64_t)) {
-          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<std::int64_t>(any));
+          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<const std::int64_t&>(any));
         } else if (any.type()==typeid(float)) {
-          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<float>(any));
+          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<const float&>(any));
         } else if (any.type()==typeid(double)) {
-          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<double>(any));
+          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<const double&>(any));
         } else if (any.type()==typeid(std::string)) {
-          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<std::string>(any));
+          set_attribute(filespecs.filename,"GLOBAL",name,std::any_cast<const std::string&>(any));
         } else {
           EKAT_ERROR_MSG (
               "Error! Invalid concrete type for IO global.\n"

components/eamxx/src/share/io/eamxx_output_manager.hpp

@@ -63,7 +63,7 @@ class OutputManager
 public:
   using fm_type = FieldManager;
   using gm_type = GridsManager;
-  using globals_map_t = std::map<std::string,std::any>;
+  using globals_map_t = std::map<std::string,std::shared_ptr<std::any>>;
 
   // Constructor(s) & Destructor
   OutputManager() = default;
@@ -105,7 +105,7 @@ class OutputManager
   void set_logger(const std::shared_ptr<ekat::logger::LoggerBase>& atm_logger) {
       m_atm_logger = atm_logger;
   }
-  void add_global (const std::string& name, const std::any& global);
+  void add_global (const std::string& name, const std::shared_ptr<std::any>& global);
 
   void init_timestep (const util::TimeStamp& start_of_step, const Real dt);
   void run (const util::TimeStamp& current_ts);