Changeset 621 for XIOS/trunk/src/node

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

Location:

XIOS/trunk/src/node

Files:

• axis.cpp (modified) (4 diffs)
• axis.hpp (modified) (6 diffs)
• field.cpp (modified) (5 diffs)
• field.hpp (modified) (1 diff)
• field_impl.hpp (modified) (2 diffs)
• grid.cpp (modified) (1 diff)
• inverse_axis.cpp (added)
• inverse_axis.hpp (added)
• node_enum.hpp (modified) (1 diff)
• node_type.hpp (modified) (1 diff)
• transformation.cpp (deleted)
• transformation.hpp (modified) (1 diff)
• transformation_enum.hpp (modified) (1 diff)
• zoom_axis.cpp (added)
• zoom_axis.hpp (added)

XIOS/trunk/src/node/axis.cpp

@@ -18 +18 @@
       , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject(), areClientAttributesChecked_(false)
       , isDistributed_(false)
-   { /* Ne rien faire de plus */ }
+      , transformationMap_()
+   {
+   }
 
    CAxis::CAxis(const StdString & id)
@@ -24 +26 @@
       , CAxisAttributes(), isChecked(false), relFiles(), baseRefObject(), areClientAttributesChecked_(false)
       , isDistributed_(false)
-   { /* Ne rien faire de plus */ }
+      , transformationMap_()
+   {
+   }
 
    CAxis::~CAxis(void)
@@ -308 +312 @@
   bool CAxis::hasTransformation()
   {
-    return (!transformations_.empty());
-  }
-
-  void CAxis::setTransformations(const std::vector<CTransformation*>& transformations)
-  {
-    transformations_ = transformations;
-  }
-
-  std::vector<CTransformation*> CAxis::getAllTransformations(void)
-  {
-    if (!hasTransformation())
-      setTransformations(this->getVirtualTransformationGroup()->getAllChildren());
-
-    return transformations_;
+    return (!transformationMap_.empty());
+  }
+
+  void CAxis::setTransformations(const TransMapTypes& axisTrans)
+  {
+    transformationMap_ = axisTrans;
+  }
+
+  CAxis::TransMapTypes CAxis::getAllTransformations(void)
+  {
+    return transformationMap_;
+  }
+
+  /*!
+    Check the validity of all transformations applied on axis
+  This functions is called AFTER all inherited attributes are solved
+  */
+  void CAxis::checkTransformations()
+  {
+    TransMapTypes::const_iterator itb = transformationMap_.begin(), it,
+                                  ite = transformationMap_.end();
+    for (it = itb; it != ite; ++it)
+    {
+      (it->second)->checkValid(this);
+    }
   }
 
@@ -350 +365 @@
     if (node.goToChildElement())
     {
-      StdString tranformation("transformation");
+      StdString inverseAxisDefRoot("inverse_axis_definition");
+      StdString inverse("inverse_axis");
+      StdString zoomAxisDefRoot("zoom_axis_definition");
+      StdString zoom("zoom_axis");
       do
       {
-        if (node.getElementName() == tranformation) {
-           this->getVirtualTransformationGroup()->parseChild(node);
+        if (node.getElementName() == inverse) {
+          CInverseAxis* tmp = (CInverseAxisGroup::get(inverseAxisDefRoot))->createChild();
+          tmp->parse(node);
+          transformationMap_[TRANS_INVERSE_AXIS] = tmp;
+        } else if (node.getElementName() == zoom) {
+          CZoomAxis* tmp = (CZoomAxisGroup::get(zoomAxisDefRoot))->createChild();
+          tmp->parse(node);
+          transformationMap_[TRANS_ZOOM_AXIS] = tmp;
         }
       } while (node.goToNextElement()) ;
       node.goToParentElement();
     }
-    setTransformations(this->getVirtualTransformationGroup()->getAllChildren());
   }
 

XIOS/trunk/src/node/axis.hpp

@@ -16 +16 @@
 #include "transformation.hpp"
 #include "transformation_enum.hpp"
+#include "inverse_axis.hpp"
+#include "zoom_axis.hpp"
 
 namespace xios {
@@ -23 +25 @@
    class CAxisAttributes;
    class CAxis;
-   class CTransformationGroup;
-   class CVirtualTransformationGroup;
 
-   DECLARE_VIRTUAL_NODE(TransformationGroup);
    ///--------------------------------------------------------------
 
@@ -39 +38 @@
       : public CObjectTemplate<CAxis>
       , public CAxisAttributes
-      , public CVirtualTransformationGroup
    {
          enum EEventId
@@ -54 +52 @@
          typedef CAxisAttributes RelAttributes;
          typedef CAxisGroup      RelGroup;
+         typedef CTransformation<CAxis>::TransformationMapTypes TransMapTypes;
 
+      public:
          /// Constructeurs ///
          CAxis(void);
@@ -96 +96 @@
          bool hasTransformation();
          void solveInheritanceTransformation();
-         std::vector<CTransformation*> getAllTransformations();
+         TransMapTypes getAllTransformations();
 
       public:
@@ -106 +106 @@
          void checkMask();
          void checkZoom();
+         void checkTransformations();
+         void computeServerIndex(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                 CServerDistributionDescription::ServerDistributionType disType);
 
 
-
-         void setTransformations(const std::vector<CTransformation*>&);
+         void setTransformations(const TransMapTypes&);
       private:
          bool isChecked;
          bool areClientAttributesChecked_;
          std::set<StdString> relFiles;
-         std::vector<CTransformation*> transformations_;
+         TransMapTypes transformationMap_;
          bool isDistributed_;
 

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;
      }
    }

XIOS/trunk/src/node/field.hpp

@@ -232 +232 @@
          std::vector<CField*> filterSources_;
          std::vector<CGenericAlgorithm*> algorithms_;
-         std::vector<ETransformationType> transformations_;
          DECLARE_REF_FUNC(Field,field)
 

XIOS/trunk/src/node/field_impl.hpp

@@ -38 +38 @@
           {
             (*itFilterSrc)->updateDataWithoutOperation(_data, (*itFilterSrc)->data);
-            (*it)->updateDataWithoutOperation(_data, (*it)->filteredData);
+            if ((*it)->filteredData.numElements() != (*it)->grid->storeIndex_client.numElements())
+            {
+               (*it)->filteredData.resize((*it)->grid->storeIndex_client.numElements());
+            }
             (*it)->applyFilter((*itFilterSrc)->data, (*it)->filteredData);
           }
           if ((*it)->hasOutputFile || (*it)->hasFieldOut) (*it)->updateFilteredData((*it)->filteredData);
-//          itFilterSrc = fieldFilterSources.begin(); iteFilterSrc = fieldFilterSources.end();
-//          for (; itFilterSrc != iteFilterSrc; ++itFilterSrc) (*itFilterSrc)->updateDataWithoutOperation(_data);
-//          (*it)->applyFilter();
-//          std::cout << "it data " << (*it)->data << std::endl;
-//          std::cout << "it filtered data " << (*it)->filteredData << std::endl;
-//          if ((*it)->hasOutputFile || (*it)->hasFieldOut) (*it)->updateFilteredData((*it)->filteredData);
         }
         else
@@ -54 +51 @@
           if (hasOutputFile || hasFieldOut) updateData(_data);
         }
-
       }
 

XIOS/trunk/src/node/grid.cpp

@@ -1152 +1152 @@
     transformations_ = new CGridTransformation(transformedGrid, this);
     transformations_->computeTransformationMapping();
-    std::cout << "send index " << *(transformations_->getLocalIndexToSendFromGridSource()[0]) << std::endl;
-    std::cout << "receive index " << *(transformations_->getLocalIndexToReceiveOnGridDest()[0][0]) << std::endl;
   }
 

XIOS/trunk/src/node/node_enum.hpp

@@ -19 +19 @@
          eContext,gContext,
          eCalendarWrapper,
-         eTransformation
-
+         eTransformation,
+         eInverseAxis,
+         eZoomAxis
 //#include "node_type.conf"
 

XIOS/trunk/src/node/node_type.hpp

@@ -10 +10 @@
 #include "context.hpp"
 #include "transformation.hpp"
+#include "inverse_axis.hpp"
+#include "zoom_axis.hpp"
 
 #endif // __XIOS_NODE_TYPE__

XIOS/trunk/src/node/transformation.hpp

@@ -2 +2 @@
 #define __XMLIO_CTransformation__
 
-/// xios headers ///
 #include "xmlioserver_spl.hpp"
-#include "attribute_enum.hpp"
-#include "attribute_enum_impl.hpp"
-#include "attribute_array.hpp"
-#include "declare_attribute.hpp"
-#include "object_template.hpp"
-#include "group_factory.hpp"
-#include "declare_group.hpp"
+#include "transformation_enum.hpp"
 
 namespace xios {
-
-  /// ////////////////////// Déclarations ////////////////////// ///
-  class CTransformationGroup;
-  class CTransformationAttributes;
-  class CTransformation;
-  ///--------------------------------------------------------------
-
-  // Declare/Define CFileAttribute
-  BEGIN_DECLARE_ATTRIBUTE_MAP(CTransformation)
-#include "transformation_attribute.conf"
-  END_DECLARE_ATTRIBUTE_MAP(CTransformation)
 
   ///--------------------------------------------------------------
   /*!
     \class CTransformation
-    This class describes transformation in xml file.
+    This class describes inverse_axis in xml file.
   */
+  template<typename T>
   class CTransformation
-    : public CObjectTemplate<CTransformation>
-    , public CTransformationAttributes
   {
-    public :
-      enum TransformationId
-      {
-        TRANS_ID_ZOOM, TRANS_ID_INVERSE
-      };
-      typedef CObjectTemplate<CTransformation> SuperClass;
-      typedef CTransformationAttributes SuperClassAttribute;
+  public:
+    typedef typename boost::unordered_map<ETranformationType, CTransformation<T>*, boost::hash<int> > TransformationMapTypes;
+    typedef TransformationMapTypes TransMapTypes;
 
     public :
       /// Constructeurs ///
-      CTransformation(void);
-      explicit CTransformation(const StdString& id);
+      CTransformation(void) {}
+      virtual void checkValid(T* dest) = 0;
 
       /// Destructeur ///
-      virtual ~CTransformation(void);
-
-      /// Accesseurs statiques ///
-      static StdString GetName(void);
-      static StdString GetDefName(void);
-      static ENodeType GetType(void);
-    private:
-      static std::vector<StdString> TransformationTypes;
-      static std::vector<TransformationId> TransformationTypeIds;
-
-    public :
-      void checkAttributes();
-
-    private:
-      void checkAttributesType(TransformationId& transType);
-      void checkAttributesZoomType();
-      void checkAttributesInverseType();
-
-    private:
+      virtual ~CTransformation(void) {}
   }; // class CTransformation
 
-  DECLARE_GROUP(CTransformation);
 } // namespace xios
 

XIOS/trunk/src/node/transformation_enum.hpp

@@ -8 +8 @@
 {
       /// ////////////////////// Définitions ////////////////////// ///
-      typedef enum transformationType
+      typedef enum transformation_type
       {
-         UnknownTransformation = 0,
-         eInverse,
-         eZoom
-
-//#include "node_type.conf"
-
-      } ETransformationType;
+        TRANS_ZOOM_AXIS,
+        TRANS_INVERSE_AXIS
+      } ETranformationType;
 
 } // namespace xios