Cleaning

src/tests/functionspace/GatherScatter.cc

@@ -67,7 +67,7 @@ ATLAS_TRACE_SCOPE ("GatherScatter::GatherScatter")
 }
 }
 
-void GatherScatter::gather (std::vector<ioFieldDesc> & floc, std::vector<ioFieldDesc> & fglo) const
+void GatherScatter::gather (ioFieldDesc_v & floc, ioFieldDesc_v & fglo) const
 {
 ATLAS_TRACE_SCOPE ("GatherScatter::gather")
 {
@@ -79,12 +79,6 @@ ATLAS_TRACE_SCOPE ("GatherScatter::gather")
   atlas::idx_t nprc = comm.size ();
   atlas::idx_t lprc = comm.rank ();
 
-  class offlen_t
-  {
-  public:
-    atlas::gidx_t off = 0, len = 0;
-  };
-
   atlas::idx_t ldim = dist.nb_pts ()[lprc];
 
   // Sort fields by owner
@@ -101,8 +95,8 @@ ATLAS_TRACE_SCOPE ("GatherScatter::gather")
 
   // SEND
 
-  std::vector<offlen_t> fld_loc (nfld + 1);
-  std::vector<offlen_t> prc_loc (nprc + 1);
+  offlen_v fld_loc (nfld + 1);
+  offlen_v prc_loc (nprc + 1);
 
   for (atlas::idx_t jfld = 0; jfld < nfld; jfld++)
     {
@@ -116,8 +110,8 @@ ATLAS_TRACE_SCOPE ("GatherScatter::gather")
 
   // RECV
 
-  std::vector<offlen_t> prc_glo (nprc + 1);
-  std::vector<offlen_t> fld_glo (nfld + 1);
+  offlen_v prc_glo (nprc + 1);
+  offlen_v fld_glo (nfld + 1);
 
   for (atlas::idx_t jfld = 0; jfld < nfld; jfld++)
     if (lprc == fglo[jfld].owner ())

src/tests/functionspace/GatherScatter.h

@@ -15,6 +15,15 @@ class GatherScatter
     atlas::idx_t prc = std::numeric_limits<atlas::idx_t>::min ();
   };
 
+  class offlen_t
+  {
+  public:
+    atlas::gidx_t off = 0, len = 0;
+  };
+
+  using offlen_v = std::vector<offlen_t>;
+  using ioFieldDesc_v = std::vector<ioFieldDesc>;
+
   atlas::idx_t max, nprc;
 
   std::vector<atlas::gidx_t> _prcloc2glo;
@@ -26,6 +35,9 @@ class GatherScatter
 public:
   GatherScatter (const atlas::StructuredGrid & _grid, const atlas::grid::Distribution & _dist);
 
+  void gather (ioFieldDesc_v & floc, ioFieldDesc_v & fglo) const;
+
+private:
   atlas::gidx_t prcloc2glo (atlas::idx_t iprc, atlas::idx_t jloc) const
   {
     return _prcloc2glo[iprc * max + jloc];
@@ -36,7 +48,6 @@ class GatherScatter
     return _glo2prcloc[jglo];
   }
 
-  void gather (std::vector<ioFieldDesc> & floc, std::vector<ioFieldDesc> & fglo) const;
 
 
 };