Changeset 976

Timestamp:

10/18/16 11:08:11 (8 years ago)

Author:

mhnguyen

Message:

Ticket 110: Implementing domain reduction to scalar

+) Add xml node for this new transformation
+) Add algorithm for this new transformation

Test
+) On Curie
+) Work

Location:

XIOS/trunk/src

Files:

• config/node_type.conf (modified) (1 diff)
• config/reduce_domain_to_scalar_attribute.conf (added)
• group_factory_decl.cpp (modified) (1 diff)
• group_template_decl.cpp (modified) (1 diff)
• node/grid.hpp (modified) (1 diff)
• node/node_enum.hpp (modified) (1 diff)
• node/node_type.hpp (modified) (1 diff)
• node/reduce_domain_to_scalar.cpp (added)
• node/reduce_domain_to_scalar.hpp (added)
• node/scalar.cpp (modified) (1 diff)
• node/transformation_enum.hpp (modified) (1 diff)
• object_factory_decl.cpp (modified) (2 diffs)
• object_template_decl.cpp (modified) (2 diffs)
• transformation/algo_types.hpp (modified) (1 diff)
• transformation/grid_transformation_selector.cpp (modified) (1 diff)
• transformation/scalar_algorithm_reduce_domain.cpp (added)
• transformation/scalar_algorithm_reduce_domain.hpp (added)
• transformation/scalar_algorithm_transformation.cpp (modified) (4 diffs)
• type/type_util.hpp (modified) (2 diffs)
• xml_parser_decl.cpp (modified) (1 diff)

XIOS/trunk/src/config/node_type.conf

@@ -83 +83 @@
 #endif //__XIOS_CExtractAxisToScalar__
 
+#ifdef __XIOS_CReduceDomainToScalar__
+   DECLARE_NODE(ReduceDomainToScalar, reduce_domain_to_scalar)
+#endif //__XIOS_CReduceDomainToScalar__
+
 #ifdef __XIOS_CContext__
    DECLARE_NODE_PAR(Context, context)

XIOS/trunk/src/group_factory_decl.cpp

@@ -38 +38 @@
   macro(CExpandDomainGroup)
   macro(CExtractAxisToScalarGroup)
+  macro(CReduceDomainToScalarGroup)
 }

XIOS/trunk/src/group_template_decl.cpp

@@ -27 +27 @@
   macro(ExpandDomain)
   macro(ExtractAxisToScalar)
+  macro(ReduceDomainToScalar)
 
 }

XIOS/trunk/src/node/grid.hpp

@@ -346 +346 @@
         ++idx; ++idxAxis;
       }
-      else ++idx;
+      else {};
     }
 

XIOS/trunk/src/node/node_enum.hpp

@@ -32 +32 @@
          eComputeConnectivityDomain,
          eExpandDomain,
-         eExtractAxisToScalar
+         eExtractAxisToScalar,
+         eReduceDomainToScalar
 
       } ENodeType;

XIOS/trunk/src/node/node_type.hpp

@@ -23 +23 @@
 #include "expand_domain.hpp"
 #include "extract_axis_to_scalar.hpp"
+#include "reduce_domain_to_scalar.hpp"
+
 
 

XIOS/trunk/src/node/scalar.cpp

@@ -31 +31 @@
    bool CScalar::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
    {
-     m["reduce_axis"] = TRANS_REDUCE_AXIS_TO_SCALAR;
-     m["extract_axis"] = TRANS_EXTRACT_AXIS_TO_SCALAR;
+     m["reduce_axis"]   = TRANS_REDUCE_AXIS_TO_SCALAR;
+     m["extract_axis"]  = TRANS_EXTRACT_AXIS_TO_SCALAR;
+     m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_SCALAR;
    }
 

XIOS/trunk/src/node/transformation_enum.hpp

@@ -19 +19 @@
         TRANS_EXPAND_DOMAIN = 10,
         TRANS_EXTRACT_AXIS_TO_SCALAR = 11,
+        TRANS_REDUCE_DOMAIN_TO_SCALAR = 12,
       } ETranformationType;
 

XIOS/trunk/src/object_factory_decl.cpp

@@ -39 +39 @@
   macro(CExpandDomain)
   macro(CExtractAxisToScalar)
+  macro(CReduceDomainToScalar)
 
   macro(CFieldGroup)
@@ -60 +61 @@
   macro(CExpandDomainGroup)
   macro(CExtractAxisToScalarGroup)
+  macro(CReduceDomainToScalarGroup)
 }

XIOS/trunk/src/object_template_decl.cpp

@@ -26 +26 @@
   template class CObjectTemplate<CExpandDomain>;
   template class CObjectTemplate<CExtractAxisToScalar>;
+  template class CObjectTemplate<CReduceDomainToScalar>;
 
   template class CObjectTemplate<CContextGroup>;
@@ -47 +48 @@
   template class CObjectTemplate<CExpandDomainGroup>;
   template class CObjectTemplate<CExtractAxisToScalarGroup>;
+  template class CObjectTemplate<CReduceDomainToScalarGroup>;
 }

XIOS/trunk/src/transformation/algo_types.hpp

@@ -10 +10 @@
 #define __XIOS_ALGORITHM_TRANSFORMATION_TYPES_HPP__
 
+#include "scalar_algorithm_reduce_axis.hpp"
+#include "scalar_algorithm_extract_axis.hpp"
+#include "scalar_algorithm_reduce_domain.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 "reduce_domain_to_axis.hpp"
 #include "axis_algorithm_reduce_domain.hpp"
 #include "axis_algorithm_transformation.hpp"
 #include "axis_algorithm_extract_domain.hpp"
-#include "extract_domain_to_axis.hpp"
+
+#include "domain_algorithm_zoom.hpp"
+#include "domain_algorithm_interpolate.hpp"
 #include "domain_algorithm_compute_connectivity.hpp"
-#include "compute_connectivity_domain.hpp"
-#include "expand_domain.hpp"
 #include "domain_algorithm_expand.hpp"
-#include "extract_axis_to_scalar.hpp"
-#include "scalar_algorithm_extract_axis.hpp"
+
+
+
+
 
 #endif // __XIOS_ALGORITHM_TRANSFORMATION_TYPES_HPP__

XIOS/trunk/src/transformation/grid_transformation_selector.cpp

@@ -21 +21 @@
   CScalarAlgorithmReduceScalar::registerTrans();
   CScalarAlgorithmExtractScalar::registerTrans();
+  CScalarAlgorithmReduceDomain::registerTrans();
 
   //! Axis

XIOS/trunk/src/transformation/scalar_algorithm_transformation.cpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 23 June 2016
-   \date 23 June 2016
+   \date 23 Oct 2016
 
    \brief Interface for all scalar transformation algorithms.
@@ -48 +48 @@
 
 /*!
-  Compute global index of scalar on different processes
-  \param [in] globalScalarIndex global index of scalar source
-  \param [out] globalScalarIndexOnProc processes which contain the corresponding global index of scalar source
+  Compute global index of element source on different processes on knowing the global index source of transformation
+
+  \param [in] globalIndexElementSource global index source of transformation (represented in the transformation mapping)
+  \param [in] elementSourceType type of element source
+  \param [out] globalIndexElementSourceOnProc processes which contain the corresponding global index of scalar source
 */
-void CScalarAlgorithmTransformation::computeExchangeGlobalIndex(const CArray<size_t,1>& globalScalarIndex,
-                                                                int elementType,
-                                                                CClientClientDHTInt::Index2VectorInfoTypeMap& globalScalarIndexOnProc)
+void CScalarAlgorithmTransformation::computeExchangeGlobalIndex(const CArray<size_t,1>& globalIndexElementSource,
+                                                                int elementSourceType,
+                                                                CClientClientDHTInt::Index2VectorInfoTypeMap& globalIndexElementSourceOnProc)
 {
   CContext* context = CContext::getCurrent();
@@ -61 +63 @@
   int clientSize = client->clientSize;
 
-  if (1 == elementType)
+  if (2 == elementSourceType) // Source is a domain
+  {
+    size_t globalIndex;
+    int nIndexSize = domainSrc_->i_index.numElements();
+    CArray<int,1>& iIndex = domainSrc_->i_index;
+    CArray<int,1>& jIndex = domainSrc_->j_index;
+    int niGlo = domainSrc_->ni_glo;
+
+    CClientClientDHTInt::Index2VectorInfoTypeMap globalIndex2ProcRank;
+    globalIndex2ProcRank.rehash(std::ceil(nIndexSize/globalIndex2ProcRank.max_load_factor()));
+    for (int idx = 0; idx < nIndexSize; ++idx)
+    {
+      globalIndex = jIndex(idx) * niGlo + iIndex(idx);
+      globalIndex2ProcRank[globalIndex].resize(1);
+      globalIndex2ProcRank[globalIndex][0] = clientRank;
+    }
+
+    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+    dhtIndexProcRank.computeIndexInfoMapping(globalIndexElementSource);
+    globalIndexElementSourceOnProc = dhtIndexProcRank.getInfoIndexMap();
+  }
+  else if (1 == elementSourceType) // Source is an axis
   {
     size_t globalIndex;
@@ -75 +98 @@
 
     CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
-    dhtIndexProcRank.computeIndexInfoMapping(globalScalarIndex);
-    globalScalarIndexOnProc = dhtIndexProcRank.getInfoIndexMap();
+    dhtIndexProcRank.computeIndexInfoMapping(globalIndexElementSource);
+    globalIndexElementSourceOnProc = dhtIndexProcRank.getInfoIndexMap();
+  }
+  else // scalar
+  {
+    size_t globalIndex = 0;    
+    CClientClientDHTInt::Index2VectorInfoTypeMap globalIndex2ProcRank;
+    globalIndex2ProcRank[globalIndex].resize(1);
+    globalIndex2ProcRank[globalIndex][0] = clientRank;
+
+    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+    dhtIndexProcRank.computeIndexInfoMapping(globalIndexElementSource);
+    globalIndexElementSourceOnProc = dhtIndexProcRank.getInfoIndexMap();
   }
 }

XIOS/trunk/src/type/type_util.hpp

@@ -46 +46 @@
     class CExtractAxisToScalar;
     class CExtractAxisToScalarGroup;
+    class CReduceDomainToScalar;
+    class CReduceDomainToScalarGroup;
 
   template <typename T> inline string getStrType(void);
@@ -108 +110 @@
   macro(CExtractAxisToScalar)
   macro(CExtractAxisToScalarGroup)
-
+  macro(CReduceDomainToScalar)
+  macro(CReduceDomainToScalarGroup)
+  
 #undef macro
 }

XIOS/trunk/src/xml_parser_decl.cpp

@@ -32 +32 @@
     macro( ExpandDomain )
     macro( ExtractAxisToScalar )
+    macro( ReduceDomainToScalar )
   }
 }