WIP: avoiding shared_ptr

Author: guo.2154

include/ftk/filters/mpas_ocean_tracker.hh

@@ -8,7 +8,7 @@
 namespace ftk {
 
 struct mpas_ocean_tracker : public virtual tracker {
-  mpas_ocean_tracker(diy::mpi::communicator comm, std::shared_ptr<mpas_mesh<>> m_) : 
+  mpas_ocean_tracker(diy::mpi::communicator comm, const mpas_mesh<> *m_) :
     tracker(comm), 
     m(m_) {}
   virtual ~mpas_ocean_tracker() {}
@@ -17,7 +17,7 @@ public:
   void initialize() {}
 
 protected:
-  std::shared_ptr<mpas_mesh<>> m;
+  const mpas_mesh<> *m;
 };
 
 }

include/ftk/filters/particle_tracer.hh

@@ -53,7 +53,7 @@ protected:
   virtual std::vector<std::string> scalar_names() const { return {}; }
 
 protected:
-  std::shared_ptr<ndarray<double>> V[2];
+  ndarray<double> *V[2];
 
 protected:
   std::vector<feature_point_lite_t> particles;

include/ftk/filters/particle_tracer_mpas_ocean.hh

@@ -19,7 +19,7 @@ namespace ftk {
 struct particle_tracer_mpas_ocean : public particle_tracer, public mpas_ocean_tracker
 {
   particle_tracer_mpas_ocean(diy::mpi::communicator comm, 
-      std::shared_ptr<mpas_mesh<>> m) : 
+      const mpas_mesh<>* m) : 
     particle_tracer(comm, 3), 
     mpas_ocean_tracker(comm, m), 
     tracker(comm) 
@@ -61,10 +61,10 @@ protected:
 
 protected:
   // std::shared_ptr<ndarray<double>> V[2]; // inherited from particle_tracer
-  std::shared_ptr<ndarray<double>> zTop[2];
-  std::shared_ptr<ndarray<double>> vertVelocityTop[2];
-  std::shared_ptr<ndarray<double>> salinity[2];
-  std::shared_ptr<ndarray<double>> temperature[2];
+  ndarray<double> *zTop[2];
+  ndarray<double> *vertVelocityTop[2];
+  ndarray<double> *salinity[2];
+  ndarray<double> *temperature[2];
   std::tm timestamp[2];
 
 #if FTK_HAVE_CUDA

include/ftk/io/mpas_stream.hh

@@ -21,7 +21,7 @@ struct mpas_stream : public object {
   void initialize();
   void set_callback(std::function<void(int, std::shared_ptr<ndarray_group>)> f) { callback = f; }
 
-  std::shared_ptr<mpas_mesh<>> mesh() { return m; }
+  mpas_mesh<>* mesh() { return m; }
 
   void set_ntimesteps(int n) { ntimesteps = n; }
   bool advance_timestep();
@@ -33,7 +33,7 @@ public:
   diy::mpi::communicator comm;
   std::string path, mesh_path;
 
-  std::shared_ptr<mpas_mesh<>> m;
+  mpas_mesh<> *m;
   std::function<void(int, std::shared_ptr<ndarray_group>)> callback;
 
   int ncid;
@@ -50,7 +50,7 @@ public:
 //////
 void mpas_stream::initialize()
 {
-  m.reset(new mpas_mesh<>);
+  m = new mpas_mesh<>();
   m->read_netcdf(mesh_path.empty() ? path : mesh_path);
   m->initialize();
 

include/ftk/io/xgc_stream_adios2.hpp

@@ -106,11 +106,17 @@ inline std::shared_ptr<ndarray_group> xgc_stream_adios2::request_step(int step)
   const auto f = filename_step(step);
   if (is_directory(f1d) && is_directory(f)) {
     try {
+      ndarray_base *psi_mks = new ndarray<double>,
+                   *e_gc_density_avg = new ndarray<double>, 
+                   *e_parallel_mean_en_avg = new ndarray<double>,
+                   *e_perp_temperature_avg = new ndarray<double>;
+#if 0
       std::shared_ptr<ndarray_base> // 1d profiles
         psi_mks( new ndarray<double> ),
         e_gc_density_avg( new ndarray<double> ), 
         e_parallel_mean_en_avg( new ndarray<double> ),
         e_perp_temperature_avg( new ndarray<double> );
+#endif
 
       psi_mks->read_bp(f1d, "psi_mks", istep);
       g->set("psi_mks", psi_mks);
@@ -151,11 +157,17 @@ inline std::shared_ptr<ndarray_group> xgc_stream_adios2::request_step(int step)
       }
       g->set("e_perp_temperature_avg", e_perp_temperature_avg);
 
+      ndarray_base *dpot = new ndarray<double>, 
+                   *pot0 = new ndarray<double>,
+                   *potm0 = new ndarray<double>,
+                   *eden = new ndarray<double>;
+#if 0
       std::shared_ptr<ndarray_base> // 3d
         dpot( new ndarray<double> ),
         pot0( new ndarray<double> ),
         potm0( new ndarray<double> ),
         eden( new ndarray<double> );
+#endif
 
       dpot->read_bp(f, "dpot");
       g->set("dpot", dpot);
@@ -202,7 +214,7 @@ inline bool xgc_stream_adios2::advance_timestep()
   fprintf(stderr, "advancing.., %d, %d, %d, filename=%s\n", start_timestep, current_timestep, ntimesteps, current_filename.c_str());
 
   if (is_directory( current_filename )) {
-    std::shared_ptr<ndarray_base> density( new ndarray<double> );
+    ndarray_base *density = new ndarray<double>;
     density->read_bp(current_filename, "dpot");
     g->set("density", density);
 

include/ftk/io/xgc_stream_h5.hpp

@@ -44,11 +44,11 @@ inline bool xgc_stream_h5::advance_timestep()
   const auto current_filename = filename( current_timestep );
 
   if (file_exists( current_filename )) {
-    std::shared_ptr<ndarray_base> density( new ndarray<double> );
+    ndarray_base *density = new ndarray<double>;
     density->read_h5(current_filename, "dneOverne0");
     g->set("density", density);
 
-    std::shared_ptr<ndarray_base> Er( new ndarray<double> );
+    ndarray_base *Er = new ndarray<double>;
     Er->read_h5(current_filename, "Er");
     g->set("Er", Er);
 

include/ftk/ndarray/ndarray_group.hh

@@ -6,16 +6,20 @@
 
 namespace ftk {
 
-struct ndarray_group : public std::unordered_map<std::string, std::shared_ptr<ndarray_base>> {
+struct ndarray_group : public std::unordered_map<std::string, ndarray_base*> {
   ndarray_group() {}
+  virtual ~ndarray_group();
+
+  void remove(const std::string key);
 
   bool has(const std::string key) const { return this->find(key) != this->end(); }
 
-  void set(const std::string key, std::shared_ptr<ndarray_base> ptr) { this->emplace(key, ptr); }
+  void set(const std::string key, ndarray_base *ptr) { this->emplace(key, ptr); }
   template <typename T> void set(const std::string key, const ndarray<T> &arr);
 
-  template <typename T> std::shared_ptr<ndarray<T>> get_ptr(const std::string key) {
-    if (has(key)) return std::dynamic_pointer_cast<ndarray<T>>(at(key)); 
+  template <typename T> ndarray<T>* get_ptr(const std::string key) {
+    // if (has(key)) return std::dynamic_pointer_cast<ndarray<T>>(at(key)); 
+    if (has(key)) return (ndarray<T>*)at(key);
     else return nullptr;
   }
 
@@ -28,10 +32,31 @@ template <typename T>
 void ndarray_group::set(const std::string key, const ndarray<T> &arr)
 {
   // std::cerr << arr << std::endl;
-  std::shared_ptr<ndarray_base> parr(new ndarray<T>);
-  *(std::dynamic_pointer_cast<ndarray<T>>(parr)) = arr;
+  
+  ndarray<T> *p = new ndarray<T>;
+  ndarray_base *pb = p;
+  *p = arr;
+
+  // *(std::dynamic_pointer_cast<ndarray<T>>(parr)) = arr;
   // std::cerr << *(std::dynamic_pointer_cast<ndarray<T>>(parr)) << std::endl;
-  this->set(key, parr);
+  this->set(key, pb);
+}
+
+inline void ndarray_group::remove(const std::string key)
+{
+  auto p = this->find(key);
+  if (p != this->end()) {
+    delete p->second;
+    this->erase(p);
+  }
+}
+
+inline ndarray_group::~ndarray_group()
+{
+  for (auto kv : *this) {
+    delete kv.second;
+    this->erase(kv.first);
+  }
 }
 
 }