Changeset 653 for XIOS/trunk/src/transformation/grid_transformation.hpp

Timestamp:

07/24/15 16:40:06 (9 years ago)

Author:

rlacroix

Message:

Distributions and transformations: Avoid using heap allocations.

File:

• XIOS/trunk/src/transformation/grid_transformation.hpp (modified) (3 diffs)

XIOS/trunk/src/transformation/grid_transformation.hpp

@@ -40 +40 @@
   void computeAll();
 
-  const std::map<int, CArray<int,1>* >& getLocalIndexToSendFromGridSource() const;
+  const std::map<int, CArray<int,1> >& getLocalIndexToSendFromGridSource() const;
   const std::map<int, std::vector<std::vector<std::pair<int,double> > > >& getLocalIndexToReceiveOnGridDest() const;
   CGrid* getGridSource() {return gridSource_; }
@@ -90 +90 @@
 
   //! Local index of data to send from grid source
-  std::map<int, CArray<int,1>* > localIndexToSendFromGridSource_;
+  std::map<int, CArray<int,1> > localIndexToSendFromGridSource_;
 
   //! Local index of data to receive on grid destination
@@ -99 +99 @@
 
   //! (Grid) Global index of grid source
-  CArray<size_t,1>* globalIndexOfCurrentGridSource_;
-  CArray<size_t,1>* globalIndexOfOriginalGridSource_;
-  CArray<double,1>* weightOfGlobalIndexOfOriginalGridSource_;
+  CArray<size_t,1> globalIndexOfCurrentGridSource_;
+  CArray<size_t,1> globalIndexOfOriginalGridSource_;
+  CArray<double,1> weightOfGlobalIndexOfOriginalGridSource_;
 };