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

Timestamp:

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

Author:

mhnguyen

Message:

Implementing generic transformation algorithm (local commit)

+) Change a little bit to make sure everything work in order

Test
+) test_new_features passe with inverse

File:

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

XIOS/trunk/src/node/field.cpp

@@ -31 +31 @@
       , processed(false), domAxisIds_("", ""), areAllReferenceSolved(false), areAllExpressionBuilt(false), filter(0)
       , isReadDataRequestPending(false)
+      , filterSources_(), algorithms_()
       { setVirtualVariableGroup(); }
 
@@ -44 +45 @@
       , processed(false), domAxisIds_("", ""), areAllReferenceSolved(false), areAllExpressionBuilt(false), filter(0)
       , isReadDataRequestPending(false)
+      , filterSources_(), algorithms_()
    { setVirtualVariableGroup(); }
 
@@ -804 +806 @@
          gridRefOfFieldRef->transformGrid(relGridRef);
          filterSources_.push_back(fieldRef);
-//         transformations_ = relGridRef->getTransformations();
-//         switch (gridRefOfFieldRef->getGridElementType()) {
-//         case CGrid::GRID_ONLY_AXIS:
-////           filter = new CAxisFilter(gridRefOfFieldRef, relGridRef);
-////           break;
-//         default:
-//           filter = new CAxisFilter(gridRefOfFieldRef, relGridRef);
-//           break;
-//         }
-//         setAlgorithms();
        }
      }
    }
-
-
-//  void CField::setAlgorithms()
-//  {
-//    std::vector<ETransformationType>::iterator itTrans  = transformations_.begin(),
-//                                               iteTrans = transformations_.end();
-//    std::set<ETransformationType> tmp;
-//    for (; itTrans != iteTrans; ++itTrans)
-//    {
-//      if (tmp.end() == tmp.find(*itTrans))
-//      {
-//        switch (*itTrans) {
-//        case eInverse:
-//          algorithms_.push_back(new CInvertAlgorithm());
-//          break;
-//        default:
-//          break;
-//        }
-//      }
-//      tmp.insert(*itTrans);
-//    }
-//  }
 
    const std::vector<CField*>& CField::getFilterSources()
@@ -857 +827 @@
              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();
+
              sendAndReceiveTransformedData(localIndexToSend, dataToSend,
                                            localIndexToReceive, dataToReceive);
@@ -862 +833 @@
 
         }
-
-//        std::cout << "it data " << (*it)->data << std::endl;
-//        std::cout << "it filtered data " << (*it)->filteredData << std::endl;
      }
    }