Changeset 895

Timestamp:

07/11/16 17:36:01 (9 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

Files:

• config/extract_domain_to_axis_attribute.conf (added)
• config/node_type.conf (modified) (1 diff)
• config/reduce_domain_to_axis_attribute.conf (added)
• group_factory_decl.cpp (modified) (1 diff)
• group_template_decl.cpp (modified) (1 diff)
• node/axis.cpp (modified) (2 diffs)
• node/domain.cpp (modified) (3 diffs)
• node/extract_domain_to_axis.cpp (added)
• node/extract_domain_to_axis.hpp (added)
• node/grid.cpp (modified) (1 diff)
• node/node_enum.hpp (modified) (1 diff)
• node/node_type.hpp (modified) (1 diff)
• node/reduce_domain_to_axis.cpp (added)
• node/reduce_domain_to_axis.hpp (added)
• node/scalar.cpp (modified) (1 diff)
• node/transformation.hpp (modified) (1 diff)
• node/transformation_enum.hpp (modified) (1 diff)
• object_factory_decl.cpp (modified) (2 diffs)
• object_template_decl.cpp (modified) (2 diffs)
• test/test_new_features.f90 (modified) (6 diffs)
• transformation/Functions/extract.cpp (added)
• transformation/Functions/extract.hpp (added)
• transformation/Functions/reduction.cpp (modified) (2 diffs)
• transformation/Functions/reduction_types.hpp (modified) (1 diff)
• transformation/algo_types.hpp (added)
• transformation/axis_algorithm_extract_domain.cpp (added)
• transformation/axis_algorithm_extract_domain.hpp (added)
• transformation/axis_algorithm_reduce_domain.cpp (added)
• transformation/axis_algorithm_reduce_domain.hpp (added)
• transformation/axis_algorithm_transformation.cpp (modified) (2 diffs)
• transformation/axis_algorithm_transformation.hpp (modified) (3 diffs)
• transformation/grid_transformation.cpp (modified) (5 diffs)
• type/type_util.hpp (modified) (2 diffs)
• xml_parser_decl.cpp (modified) (1 diff)

XIOS/trunk/src/config/node_type.conf

@@ -63 +63 @@
 #endif //__XIOS_CReduceAxisToScalar__
 
+#ifdef __XIOS_CReduceDomainToAxis__
+   DECLARE_NODE(ReduceDomainToAxis, reduce_domain)
+#endif //__XIOS_CReduceDomainToAxis__
+
+#ifdef __XIOS_CExtractDomainToAxis__
+   DECLARE_NODE(ExtractDomainToAxis, extract_domain)
+#endif //__XIOS_CExtractDomainToAxis__
+
 #ifdef __XIOS_CContext__
    DECLARE_NODE_PAR(Context, context)

XIOS/trunk/src/group_factory_decl.cpp

@@ -33 +33 @@
   macro(CScalarGroup)
   macro(CReduceAxisToScalarGroup)
+  macro(CReduceDomainToAxisGroup)
+  macro(CExtractDomainToAxisGroup)
 }

XIOS/trunk/src/group_template_decl.cpp

@@ -22 +22 @@
   macro(Scalar)
   macro(ReduceAxisToScalar)
+  macro(ReduceDomainToAxis)
+  macro(ExtractDomainToAxis)
 
 }

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;
 

XIOS/trunk/src/object_factory_decl.cpp

@@ -34 +34 @@
   macro(CScalar)
   macro(CReduceAxisToScalar)
+  macro(CReduceDomainToAxis)
+  macro(CExtractDomainToAxis)
 
   macro(CFieldGroup)
@@ -50 +52 @@
   macro(CScalarGroup)
   macro(CReduceAxisToScalarGroup)
+  macro(CReduceDomainToAxisGroup)
+  macro(CExtractDomainToAxisGroup)
 }

XIOS/trunk/src/object_template_decl.cpp

@@ -21 +21 @@
   template class CObjectTemplate<CScalar>;
   template class CObjectTemplate<CReduceAxisToScalar>;
+  template class CObjectTemplate<CReduceDomainToAxis>;
+  template class CObjectTemplate<CExtractDomainToAxis>;
 
   template class CObjectTemplate<CContextGroup>;
@@ -37 +39 @@
   template class CObjectTemplate<CScalarGroup>;
   template class CObjectTemplate<CReduceAxisToScalarGroup>;
+  template class CObjectTemplate<CReduceDomainToAxisGroup>;
+  template class CObjectTemplate<CExtractDomainToAxisGroup>;
 }

XIOS/trunk/src/test/test_new_features.f90

@@ -19 +19 @@
   INTEGER,PARAMETER :: llm=10
   INTEGER,PARAMETER :: llmInterPolated=4
-  DOUBLE PRECISION  :: lval(llm)=1, tsTemp, lvalInterPolated(llmInterPolated)=1
+  DOUBLE PRECISION  :: lval(llm)=1, tsTemp, lvalInterPolated(llmInterPolated)=1, nlev(nj_glo)=10
   TYPE(xios_field) :: field_hdl
   TYPE(xios_fieldgroup) :: fieldgroup_hdl
@@ -29 +29 @@
   DOUBLE PRECISION,DIMENSION(4,ni_glo,nj_glo) :: bnds_lon_glo, bnds_lat_glo
   DOUBLE PRECISION :: field_A_glo(ni_glo,nj_glo,llm), lval_ni_glo(ni_glo), lval_nj_glo(nj_glo), field_Value_glo(ni_glo,nj_glo,llm)
-  DOUBLE PRECISION,ALLOCATABLE :: lon(:,:),lat(:,:),field_A(:,:,:), field_All_Axis(:,:,:), lonvalue(:) , &
+  DOUBLE PRECISION,ALLOCATABLE :: lon(:,:),lat(:,:),field_A(:,:,:), field_A_2D(:,:), field_All_Axis(:,:,:), lonvalue(:) , &
                                   field_Axis(:), lvaln(:), lval_ni(:), lval_nj(:), field_Two_Axis(:,:), lvalnInterp(:), &
                                   lontransformed(:,:), lattransformed(:,:), lon_glotransformed(:,:), lat_glotransformed(:,:), &
@@ -106 +106 @@
   CALL Distribute_index(jbeginDomInterp, jendDomInterp, njDomInterp, njDomGlo, rank, size)
 
-  ALLOCATE(field_A(0:ni+1,-1:nj+2,llm), field_Two_Axis(ni_glo,1:nj), field_Axis(nAxis), field_All_Axis(1:ni,1:nj,llm), &
+  ALLOCATE(field_A(0:ni+1,-1:nj+2,llm), field_A_2D(0:ni+1,-1:nj+2), field_Two_Axis(ni_glo,1:nj), field_Axis(nAxis), field_All_Axis(1:ni,1:nj,llm), &
           lon(ni,nj),lat(ni,nj), lonvalue(ni*nj), &
           lvaln(nAxis), lval_ni(ni), lval_nj(nj), lvalnInterp(nAxisinterp), &
@@ -127 +127 @@
   lattransformed(:,:) = lat_glotransformed(ibeginDomInterp+1:iendDomInterp+1,jbeginDomInterp+1:jendDomInterp+1)
   field_A(1:ni,1:nj,:) = field_A_glo(ibegin+1:iend+1,jbegin+1:jend+1,:)
+  field_A_2D(1:ni,1:nj) = field_A_glo(ibegin+1:iend+1,jbegin+1:jend+1,1)
   field_value(1:ni,1:nj,:) = field_Value_glo(ibegin+1:iend+1,jbegin+1:jend+1,:)
   field_Axis(1:nAxis)  = field_A_glo(1,1,axisBegin+1:axisEnd+1)
@@ -149 +150 @@
   CALL xios_set_axis_attr("axis_D", n_glo=llm, begin=axisBegin, n=nAxis, value=lvaln)
   CALL xios_set_axis_attr("axis_E", n_glo=llmInterPolated, value=lvalnInterp, begin=axisterpBegin, n=nAxisinterp)
+  CALL xios_set_axis_attr("axis_G", n_glo=nj_glo, value=nlev)
+
   CALL xios_set_domain_attr("domain_A",ni_glo=ni_glo, nj_glo=nj_glo, ibegin=ibegin, ni=ni,jbegin=jbegin,nj=nj)
   CALL xios_set_domain_attr("domain_A",data_dim=2, data_ibegin=-1, data_ni=ni+2, data_jbegin=-2, data_nj=nj+4)
@@ -206 +209 @@
     CALL xios_update_calendar(ts)
     CALL xios_send_field("field_A",field_A)
+    CALL xios_send_field("field_A_2D",field_A_2D)
     CALL xios_send_field("field_Value",field_value)
     CALL xios_send_field("field_Axis",field_Axis)

XIOS/trunk/src/transformation/Functions/reduction.cpp

@@ -3 +3 @@
 #include "min.hpp"
 #include "max.hpp"
+#include "extract.hpp"
 
 namespace xios {
@@ -19 +20 @@
   m["max"] = TRANS_REDUCE_MAX;
   CMaxReductionAlgorithm::registerTrans();
+
+  m["extract"] = TRANS_REDUCE_EXTRACT;
+  CExtractReductionAlgorithm::registerTrans();
 }
 

XIOS/trunk/src/transformation/Functions/reduction_types.hpp

@@ -16 +16 @@
     TRANS_REDUCE_SUM = 0,
     TRANS_REDUCE_MIN = 1,
-    TRANS_REDUCE_MAX = 2
+    TRANS_REDUCE_MAX = 2,
+    TRANS_REDUCE_EXTRACT = 3
   } EReductionType;
 

XIOS/trunk/src/transformation/axis_algorithm_transformation.cpp

@@ -19 +19 @@
 
 CAxisAlgorithmTransformation::CAxisAlgorithmTransformation(CAxis* axisDestination, CAxis* axisSource)
- : CGenericAlgorithmTransformation(), axisDest_(axisDestination), axisSrc_(axisSource)
+ : CGenericAlgorithmTransformation(), axisDest_(axisDestination), axisSrc_(axisSource), domainSrc_(0)
+{
+  axisDestGlobalSize_ = axisDestination->n_glo.getValue();
+  int niDest = axisDestination->n.getValue();
+  int ibeginDest = axisDestination->begin.getValue();
+
+  for (int idx = 0; idx < niDest; ++idx)
+    if ((axisDestination->mask)(idx)) axisDestGlobalIndex_.push_back(ibeginDest+idx);
+}
+
+CAxisAlgorithmTransformation::CAxisAlgorithmTransformation(CAxis* axisDestination, CDomain* domainSource)
+ : CGenericAlgorithmTransformation(), axisDest_(axisDestination), axisSrc_(0), domainSrc_(domainSource)
 {
   axisDestGlobalSize_ = axisDestination->n_glo.getValue();
@@ -51 +62 @@
   int clientSize = client->clientSize;
 
-
   size_t globalIndex;
-  int nIndexSize = axisSrc_->index.numElements();
+  int nIndexSize = 0;
+  if (2 == elementType) nIndexSize = domainSrc_->i_index.numElements();
+  else if (1 == elementType) nIndexSize = axisSrc_->index.numElements();
   CClientClientDHTInt::Index2VectorInfoTypeMap globalIndex2ProcRank;
   globalIndex2ProcRank.rehash(std::ceil(nIndexSize/globalIndex2ProcRank.max_load_factor()));
   for (int idx = 0; idx < nIndexSize; ++idx)
   {
-    globalIndex = axisSrc_->index(idx);
+    if (2 == elementType)
+    {
+      globalIndex = domainSrc_->i_index(idx) + domainSrc_->j_index(idx) * domainSrc_->ni_glo;
+    }
+    else if (1 == elementType)
+    {
+      globalIndex = axisSrc_->index(idx);
+    }
+
     globalIndex2ProcRank[globalIndex].resize(1);
     globalIndex2ProcRank[globalIndex][0] = clientRank;

XIOS/trunk/src/transformation/axis_algorithm_transformation.hpp

@@ -15 +15 @@
 
 class CAxis;
+class CDomain;
+
 /*!
   \class CAxisAlgorithmTransformation
@@ -23 +25 @@
 public:
   CAxisAlgorithmTransformation(CAxis* axisDestination, CAxis* axisSource);
+  CAxisAlgorithmTransformation(CAxis* axisDestination, CDomain* domainSource);
 
   virtual ~CAxisAlgorithmTransformation();
@@ -45 +48 @@
   //! Axis on grid source
   CAxis* axisSrc_;
+
+  //! Domain on grid source
+  CDomain* domainSrc_;
 };
 

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -8 +8 @@
  */
 #include "grid_transformation.hpp"
-#include "reduce_axis_to_scalar.hpp"
-#include "scalar_algorithm_reduce_axis.hpp"
-#include "axis_algorithm_inverse.hpp"
-#include "axis_algorithm_zoom.hpp"
-#include "axis_algorithm_interpolate.hpp"
-#include "domain_algorithm_zoom.hpp"
-#include "domain_algorithm_interpolate.hpp"
+#include "algo_types.hpp"
 #include "context.hpp"
 #include "context_client.hpp"
-#include "axis_algorithm_transformation.hpp"
 #include "distribution_client.hpp"
 #include "mpi_tag.hpp"
@@ -92 +85 @@
   CZoomAxis* zoomAxis = 0;
   CInterpolateAxis* interpAxis = 0;
+  CReduceDomainToAxis* reduceDomain = 0;
+  CExtractDomainToAxis* extractDomain = 0;
   CGenericAlgorithmTransformation* algo = 0;
   switch (transType)
@@ -109 +104 @@
       algo = new CAxisAlgorithmInverse(axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex]);
       break;
+    case TRANS_REDUCE_DOMAIN_TO_AXIS:
+      reduceDomain = dynamic_cast<CReduceDomainToAxis*> (it->second);
+      domainSrcIndex = elementPositionInGridSrc2DomainPosition_[elementPositionInGrid];
+      algo = new CAxisAlgorithmReduceDomain(axisListDestP[axisDstIndex], domainListSrcP[domainSrcIndex], reduceDomain);
+      break;
+    case TRANS_EXTRACT_DOMAIN_TO_AXIS:
+      extractDomain = dynamic_cast<CExtractDomainToAxis*> (it->second);
+      domainSrcIndex = elementPositionInGridSrc2DomainPosition_[elementPositionInGrid];
+      algo = new CAxisAlgorithmExtractDomain(axisListDestP[axisDstIndex], domainListSrcP[domainSrcIndex], extractDomain);
+      break;
     default:
       break;
@@ -189 +194 @@
     case TRANS_ZOOM_AXIS:
     case TRANS_INVERSE_AXIS:
+    case TRANS_REDUCE_DOMAIN_TO_AXIS:
+    case TRANS_EXTRACT_DOMAIN_TO_AXIS:
       axisIndex =  elementPositionInGridDst2AxisPosition_[elementPositionInGrid];
       break;
@@ -267 +274 @@
     case TRANS_ZOOM_AXIS:
     case TRANS_INVERSE_AXIS:
+    case TRANS_REDUCE_DOMAIN_TO_AXIS:
+    case TRANS_EXTRACT_DOMAIN_TO_AXIS:
       axisIndex =  elementPositionInGridDst2AxisPosition_[elementPositionInGrid];
       break;

XIOS/trunk/src/type/type_util.hpp

@@ -36 +36 @@
     class CReduceAxisToScalar;
     class CReduceAxisToScalarGroup;
+    class CReduceDomainToAxis;
+    class CReduceDomainToAxisGroup;
+    class CExtractDomainToAxis;
+    class CExtractDomainToAxisGroup;
 
   template <typename T> inline string getStrType(void);
@@ -88 +92 @@
   macro(CReduceAxisToScalar)
   macro(CReduceAxisToScalarGroup)
+  macro(CReduceDomainToAxis)
+  macro(CReduceDomainToAxisGroup)
+  macro(CExtractDomainToAxis)
+  macro(CExtractDomainToAxisGroup)
 #undef macro
 }

XIOS/trunk/src/xml_parser_decl.cpp

@@ -27 +27 @@
     macro( Scalar )
     macro( ReduceAxisToScalar )
+    macro( ReduceDomainToAxis )
+    macro( ExtractDomainToAxis )
   }
 }