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

Timestamp:

06/22/15 13:36:37 (9 years ago)

Author:

mhnguyen

Message:

Final tests of zoom and inverse on axis

+) Modify test_client and test_complete to work with new grid definition
+) Correct some bugs causing memory leak
+) Clean abundant code
+) Add more comments to new files

Test
+) On Curie
+) test_client and test_complete pass with correct results

File:

• XIOS/trunk/src/node/field.cpp (modified) (10 diffs)

XIOS/trunk/src/node/field.cpp

@@ -13 +13 @@
 #include "context_server.hpp"
 #include <set>
-#include "axis_filter.hpp"
-#include "invert_algorithm.hpp"
 
 namespace xios{
@@ -29 +27 @@
       , foperation(), hasInstantData(false), hasExpression(false)
       , active(false) , hasOutputFile(false),hasFieldOut(false), slotUpdateDate(NULL)
-      , processed(false), domAxisIds_("", ""), areAllReferenceSolved(false), areAllExpressionBuilt(false), filter(0)
+      , processed(false), domAxisIds_("", ""), areAllReferenceSolved(false), areAllExpressionBuilt(false)
       , isReadDataRequestPending(false)
-      , filterSources_(), algorithms_()
+      , filterSources_()
       { setVirtualVariableGroup(); }
 
@@ -43 +41 @@
       , foperation(), hasInstantData(false), hasExpression(false)
       , active(false), hasOutputFile(false), hasFieldOut(false), slotUpdateDate(NULL)
-      , processed(false), domAxisIds_("", ""), areAllReferenceSolved(false), areAllExpressionBuilt(false), filter(0)
+      , processed(false), domAxisIds_("", ""), areAllReferenceSolved(false), areAllExpressionBuilt(false)
       , isReadDataRequestPending(false)
-      , filterSources_(), algorithms_()
+      , filterSources_()
    { setVirtualVariableGroup(); }
 
@@ -55 +53 @@
       if (hasExpression) delete expression;
       if (slotUpdateDate != NULL) delete slotUpdateDate;
-      if (0 != filter) delete filter;
 
    }
@@ -177 +174 @@
             int rank=(*it).first ;
             CArray<int,1>& index = *(it->second) ;
-                       std::cout << "rank " << index << std::endl;
-                       std::cout << "data " << data << std::endl;
             CArray<double,1> data_tmp(index.numElements()) ;
             for(int n=0;n<data_tmp.numElements();n++) data_tmp(n)=data(index(n)) ;
@@ -784 +779 @@
            fieldRef->addReference(this);
            fieldRef->solveGridDomainAxisRef(false);
-//           fieldRef->solveCheckMaskIndex(false);
            break;
          }
@@ -798 +792 @@
          fieldRef->addReference(this);
          fieldRef->solveGridDomainAxisRef(false);
-//         fieldRef->solveCheckMaskIndex(false);
        }
 
@@ -826 +819 @@
           {
              const std::map<int, CArray<int,1>* >& localIndexToSend = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToSendFromGridSource();
-             const std::map<int, std::vector<CArray<int,1>* > > localIndexToReceive = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToReceiveOnGridDest();
+             const std::map<int, std::vector<CArray<int,1>* > >& localIndexToReceive = (*itFilterSrc)->grid->getTransformations()->getLocalIndexToReceiveOnGridDest();
 
              sendAndReceiveTransformedData(localIndexToSend, dataToSend,
@@ -857 +850 @@
        CArray<int,1>* localIndex_p = itSend->second;
        int countSize = localIndex_p->numElements();
-       std::cout << "Data Source " <<  dataSrc <<  std::endl;
        for (int idx = 0; idx < countSize; ++idx)
        {
@@ -888 +880 @@
          }
        }
-       std::cout << "Data Destination " <<  dataDest <<  std::endl;
      }