Changeset 650 for XIOS/trunk/src/node/field.cpp

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/field.cpp (modified) (5 diffs)

XIOS/trunk/src/node/field.cpp

@@ -130 +130 @@
     CEventClient event(getType(), EVENT_ID_UPDATE_DATA);
 
-    map<int, CArray<int,1>* >::iterator it;
+    map<int, CArray<int,1> >::iterator it;
     list<CMessage> list_msg;
     list<CArray<double,1> > list_data;
@@ -140 +140 @@
           for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
           {
-            int rank = (*it).first;
-            CArray<int,1>& index = *(it->second);
+            int rank = it->first;
+            CArray<int,1>& index = it->second;
 
             list_msg.push_back(CMessage());
@@ -159 +159 @@
       for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
       {
-        int rank = (*it).first;
-        CArray<int,1>& index = *(it->second);
+        int rank = it->first;
+        CArray<int,1>& index = it->second;
 
         list_msg.push_back(CMessage());
@@ -200 +200 @@
     if (data_srv.empty())
     {
-      for (map<int, CArray<size_t, 1>* >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
+      for (map<int, CArray<size_t, 1> >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
       {
         int rank = it->first;
-        CArray<double,1> data_tmp(it->second->numElements());
-        data_srv.insert( pair<int, CArray<double,1>* >(rank, new CArray<double,1>(data_tmp)));
+        data_srv.insert( pair<int, CArray<double,1>* >(rank, new CArray<double,1>(it->second.numElements())));
         foperation_srv.insert(pair<int,boost::shared_ptr<func::CFunctor> >(rank,boost::shared_ptr<func::CFunctor>(new func::CInstant(*data_srv[rank]))));
       }
@@ -329 +328 @@
         if (data_srv.empty())
         {
-          for (map<int, CArray<size_t, 1>* >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
-            data_srv.insert(pair<int, CArray<double,1>*>(it->first, new CArray<double,1>(it->second->numElements())));
+          for (map<int, CArray<size_t, 1> >::iterator it = grid->outIndexFromClient.begin(); it != grid->outIndexFromClient.end(); ++it)
+            data_srv.insert(pair<int, CArray<double,1>*>(it->first, new CArray<double,1>(it->second.numElements())));
         }