Changeset 650 for XIOS/trunk/src/node/grid.hpp

Timestamp:

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

Author:

rlacroix

Message:

Grid: Avoid some heap allocations and do various cleanups.

File:

• XIOS/trunk/src/node/grid.hpp (modified) (11 diffs)

XIOS/trunk/src/node/grid.hpp

@@ -59 +59 @@
          {
            EVENT_ID_INDEX, EVENT_ID_ADD_DOMAIN, EVENT_ID_ADD_AXIS
-         } ;
+         };
 
          enum EElementType
@@ -68 +68 @@
          /// Constructeurs ///
          CGrid(void);
-         explicit CGrid(const StdString & id);
-         CGrid(const CGrid & grid);       // Not implemented yet.
-         CGrid(const CGrid * const grid); // Not implemented yet.
+         explicit CGrid(const StdString& id);
+         CGrid(const CGrid& grid);       // Not implemented yet.
+         CGrid(const CGrid* const grid); // Not implemented yet.
 
          /// Traitements ///
@@ -79 +79 @@
          void checkMaskIndex(bool doCalculateIndex);
 
- //        virtual void toBinary  (StdOStream & os) const;
-//         virtual void fromBinary(StdIStream & is);
+ //        virtual void toBinary  (StdOStream& os) const;
+//         virtual void fromBinary(StdIStream& is);
 
          /// Tests ///
@@ -88 +88 @@
 
          /// Accesseurs ///
-         const std::deque< CArray<int, 1>* > & getStoreIndex(void) const;
-         const std::deque< CArray<int, 1>* > & getOutIIndex(void)  const;
-         const std::deque< CArray<int, 1>* > & getOutJIndex(void)  const;
-         const std::deque< CArray<int, 1>* > & getOutLIndex(void)  const;
-
-         const CAxis*   getRelAxis  (void) const;
-         const CDomain* getRelDomain(void) const;
-
          StdSize getDimension(void) const;
 
-//         StdSize getLocalSize(void) const;
-//         StdSize getGlobalSize(void) const;
          StdSize  getDataSize(void) const;
-//         std::vector<StdSize> getLocalShape(void) const;
-//         std::vector<StdSize> getGlobalShape(void) const;
 
          /// Entrées-sorties de champs ///
@@ -110 +98 @@
          void outputField(const CArray<double,1>& stored, CArray<double,n>& field) const;
 
-         void inputFieldServer(const std::deque< CArray<double, 1>* > storedClient,
-                               CArray<double, 1>&  storedServer) const;
-
          void outputField(int rank, const CArray<double,1>& stored, double* field);
          void inputField(int rank, const double* const field, CArray<double,1>& stored);
 
-         virtual void parse(xml::CXMLNode & node);
+         virtual void parse(xml::CXMLNode& node);
 
          /// Destructeur ///
@@ -137 +122 @@
 
          /// Entrées-sorties de champs (interne) ///
-         void storeField_arr(const double * const data, CArray<double,1>& stored) const;
-         void restoreField_arr(const CArray<double,1>& stored, double * const data) const;
+         void storeField_arr(const double* const data, CArray<double,1>& stored) const;
+         void restoreField_arr(const CArray<double,1>& stored, double* const data) const;
 
          /// Traitements protégés ///
@@ -155 +140 @@
          void sendAllAxis();
 
-         static void recvAddDomain(CEventServer& event) ;
-         void recvAddDomain(CBufferIn& buffer) ;
-         static void recvAddAxis(CEventServer& event) ;
-         void recvAddAxis(CBufferIn& buffer) ;
-
-         static bool dispatchEvent(CEventServer& event) ;
-         void outputFieldToServer(CArray<double,1>& fieldIn, int rank, CArray<double,1>& fieldOut) ;
-         static void recvIndex(CEventServer& event) ;
-         void recvIndex(vector<int> ranks, vector<CBufferIn*> buffers) ;
-         void sendIndex(void) ;
+         static void recvAddDomain(CEventServer& event);
+         void recvAddDomain(CBufferIn& buffer);
+         static void recvAddAxis(CEventServer& event);
+         void recvAddAxis(CBufferIn& buffer);
+
+         static bool dispatchEvent(CEventServer& event);
+         static void recvIndex(CEventServer& event);
+         void recvIndex(vector<int> ranks, vector<CBufferIn*> buffers);
+         void sendIndex(void);
          void sendIndexScalarGrid();
 
@@ -198 +182 @@
          bool isIndexSent;
 
-         std::deque< CArray<int, 1>* > storeIndex ;
-        CArray<int, 1>  storeIndex_client ;
-
-         map<int, CArray<int, 1>* >  storeIndex_toSrv ;
-         map<int,int> nbSenders ;
-
-         map<int, CArray<size_t, 1>* > outIndexFromClient;
-         void checkMask(void) ;
+         CArray<int, 1> storeIndex_client;
+
+         map<int, CArray<int, 1> > storeIndex_toSrv;
+         map<int,int> nbSenders;
+
+         map<int, CArray<size_t, 1> > outIndexFromClient;
+         void checkMask(void);
          void modifyMask(const CArray<int,1>& indexToModify);
 
@@ -254 +237 @@
         bool isDataDistributed_;
 
-
-//        std::vector<ETransformationType> transformations_;
         bool isTransformed_;
         std::vector<int> axisPositionInGrid_;
@@ -271 +252 @@
                 << "Received data size = "      << field.numElements() << " ] "
                 << "The array of data has not the good size !")
-      this->storeField_arr(field.dataFirst(), stored) ;
+      this->storeField_arr(field.dataFirst(), stored);
    }
 
@@ -293 +274 @@
      int idx = 0;
      int numElement = axisDomainOrder.numElements();
-     int dim = domainMasks.size()*2 + axisMasks.size();
+     int dim = domainMasks.size() * 2 + axisMasks.size();
 
      std::vector<int> idxLoop(dim,0), indexMap(numElement), eachDimSize(dim);