Fix surface coupling use of TimeInterpolation

Author: AaronDonahue

components/eamxx/src/control/atmosphere_surface_coupling_exporter.cpp

@@ -232,7 +232,7 @@ void SurfaceCouplingExporter::initialize_impl (const RunType /* run_type */)
     bool do_export_from_file = are_fields_present and are_files_present;
     if (do_export_from_file) {
       // Construct a time interpolation object
-      m_time_interp = util::TimeInterpolation(m_grid,export_from_file_names);
+      auto time_interp = util::TimeInterpolation(m_grid,export_from_file_names);
       for (auto fname : export_from_file_fields) {
         // Find the index for this field in the list of export fields.
 	auto v_loc = std::find(m_export_field_names_vector.begin(),m_export_field_names_vector.end(),fname);
@@ -244,9 +244,10 @@ void SurfaceCouplingExporter::initialize_impl (const RunType /* run_type */)
         --m_num_from_model_exports;
         auto& f_helper = m_helper_fields.at(fname);
 	// We want to add the field as a deep copy so that the helper_fields are automatically updated.
-        m_time_interp.add_field(f_helper, true);
+        time_interp.add_field(f_helper, true);
         m_export_from_file_field_names.push_back(fname);
       }
+      m_time_interp = time_interp;
       m_time_interp.initialize_data_from_files();
     }
   }
@@ -544,7 +545,7 @@ void SurfaceCouplingExporter::do_export_to_cpl(const bool called_during_initiali
 // =========================================================================================
 void SurfaceCouplingExporter::finalize_impl()
 {
-
+  // Nothing to do
 }
 // =========================================================================================
 } // namespace scream

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

@@ -27,13 +27,6 @@ TimeInterpolation::TimeInterpolation(
   m_is_data_from_file = true;
 }
 /*-----------------------------------------------------------------------------------------------*/
-// Destructor
-TimeInterpolation::
-~TimeInterpolation ()
-{
-  finalize();
-}
-/*-----------------------------------------------------------------------------------------------*/
 void TimeInterpolation::finalize()
 {
   if (m_is_data_from_file) {

components/eamxx/src/share/util/eamxx_time_interpolation.hpp

@@ -23,7 +23,7 @@ class TimeInterpolation {
   TimeInterpolation() = default;
   TimeInterpolation(const grid_ptr_type& grid);
   TimeInterpolation(const grid_ptr_type& grid, const vos_type& list_of_files);
-  ~TimeInterpolation ();
+  ~TimeInterpolation () = default;
 
   // Running the interpolation
   void initialize_timestamps(const TimeStamp& ts_in);