Changeset 895 for XIOS/trunk/src/node

Timestamp:

07/11/16 17:36:01 (8 years ago)

Author:

mhnguyen

Message:

Adding a new transformation: Reduce a domain to an axis

Test
+) On Curie
+) Tests pass and are correct

Location:

XIOS/trunk/src/node

Files:

• axis.cpp (modified) (2 diffs)
• domain.cpp (modified) (3 diffs)
• extract_domain_to_axis.cpp (added)
• extract_domain_to_axis.hpp (added)
• grid.cpp (modified) (1 diff)
• node_enum.hpp (modified) (1 diff)
• node_type.hpp (modified) (1 diff)
• reduce_domain_to_axis.cpp (added)
• reduce_domain_to_axis.hpp (added)
• scalar.cpp (modified) (1 diff)
• transformation.hpp (modified) (1 diff)
• transformation_enum.hpp (modified) (1 diff)

XIOS/trunk/src/node/axis.cpp

@@ -49 +49 @@
      m["interpolate_axis"] = TRANS_INTERPOLATE_AXIS;
      m["inverse_axis"] = TRANS_INVERSE_AXIS;
+     m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_AXIS;
+     m["extract_domain"] = TRANS_EXTRACT_DOMAIN_TO_AXIS;
    }
 
@@ -922 +924 @@
     TransMapTypes::const_iterator itb = transformationMap_.begin(), it,
                                   ite = transformationMap_.end();
-    for (it = itb; it != ite; ++it)
-    {
-      (it->second)->checkValid(this);
-    }
+//    for (it = itb; it != ite; ++it)
+//    {
+//      (it->second)->checkValid(this);
+//    }
   }
 

XIOS/trunk/src/node/domain.cpp

@@ -83 +83 @@
    }
 
-  
+
    const std::vector<int>& CDomain::getIndexesToWrite(void) const
    {
@@ -215 +215 @@
       this->relFiles.insert(filename);
    }
-  
+
    void CDomain::addRelFileCompressed(const StdString& filename)
    {
@@ -2006 +2006 @@
     TransMapTypes::const_iterator itb = transformationMap_.begin(), it,
                                   ite = transformationMap_.end();
-    for (it = itb; it != ite; ++it)
-    {
-      (it->second)->checkValid(this);
-    }
+//    for (it = itb; it != ite; ++it)
+//    {
+//      (it->second)->checkValid(this);
+//    }
   }
 

XIOS/trunk/src/node/grid.cpp

@@ -1688 +1688 @@
              << "Dimension of grid source " << transformGridSrc->getId() << " is " << transformGridSrc->axis_domain_order.numElements());
       }
-      else
-      {
-//        int ssize = axis_domain_order.numElements();
-//        for (int i = 0; i < ssize; ++i)
-//          if (axis_domain_order(i) != (transformGridSrc->axis_domain_order)(i))
-//            ERROR("CGrid::completeGrid(CGrid* transformGridSrc)",
-//                  << "Grids " << this->getId() << " and " << transformGridSrc->getId()
-//                  << " don't have elements in the same order");
-      }
     }
 

XIOS/trunk/src/node/node_enum.hpp

@@ -27 +27 @@
          eGenerateRectilinearDomain,
          eScalar,
-         eReduceAxisToScalar
+         eReduceAxisToScalar,
+         eReduceDomainToAxis,
+         eExtractDomainToAxis
 
       } ENodeType;

XIOS/trunk/src/node/node_type.hpp

@@ -18 +18 @@
 #include "scalar.hpp"
 #include "reduce_axis_to_scalar.hpp"
+#include "reduce_domain_to_axis.hpp"
+#include "extract_domain_to_axis.hpp"
 
 

XIOS/trunk/src/node/scalar.cpp

@@ -92 +92 @@
     TransMapTypes::const_iterator itb = transformationMap_.begin(), it,
                                   ite = transformationMap_.end();
-    for (it = itb; it != ite; ++it)
-    {
-      (it->second)->checkValid(this);
-    }
+//    for (it = itb; it != ite; ++it)
+//    {
+//      (it->second)->checkValid(this);
+//    }
   }
 

XIOS/trunk/src/node/transformation.hpp

@@ -22 +22 @@
       /// Constructeurs ///
       CTransformation(void) {}
-      virtual void checkValid(T* dest) = 0;
+      virtual void checkValid(T* dest) {}
 
       std::vector<StdString> checkAuxInputs() { return checkAuxInputs_(); }

XIOS/trunk/src/node/transformation_enum.hpp

@@ -13 +13 @@
         TRANS_INTERPOLATE_DOMAIN = 4,
         TRANS_GENERATE_RECTILINEAR_DOMAIN = 5,
-        TRANS_REDUCE_AXIS_TO_SCALAR = 6
+        TRANS_REDUCE_AXIS_TO_SCALAR = 6,
+        TRANS_REDUCE_DOMAIN_TO_AXIS = 7,
+        TRANS_EXTRACT_DOMAIN_TO_AXIS = 8
       } ETranformationType;