Changeset 2001 for XIOS/dev/dev_ym

Timestamp:

01/05/21 10:03:56 (4 years ago)

Author:

ymipsl

Message:

Bug fix when introducing gridAlgorithm

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation

Files:

• algorithm_transformation_reduce.cpp (modified) (1 diff)
• algorithm_transformation_reduce.hpp (modified) (1 diff)
• algorithm_transformation_transfer.cpp (modified) (2 diffs)
• algorithm_transformation_transfer.hpp (modified) (1 diff)
• algorithm_transformation_weight.cpp (modified) (2 diffs)
• algorithm_transformation_weight.hpp (modified) (1 diff)
• grid_algorithm.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_reduce.cpp

@@ -15 +15 @@
   void CAlgorithmTransformationReduce::apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, CArray<double,1>& dataOut)
   {
-   // CArray<double,1> dataOutTmp ;
-   // transformConnector_->transfer(dimBefore, dimAfter, dataIn, dataOutTmp) ;
     reduceTransformConnector_ -> transfer(dimBefore, dimAfter, dataIn, dataOut) ;
   }

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_reduce.hpp

@@ -26 +26 @@
       EReduction operator_ ;
       TransformationIndexMap transformationMapping_;
-      CTransformConnector* transformConnector_ ;
       CReduceTransformConnector* reduceTransformConnector_ ;
       bool detectMissingValue_=true ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_transfer.cpp

@@ -8 +8 @@
 {
  
- void CAlgorithmTransformationTransfer::computeAlgorithm(CLocalView* srcView, CLocalView* dstView)
- {
-   set<size_t> srcIndex ;
-   for(auto& it : transformationMapping_) srcIndex.insert(it.second) ;
-
-    CArray<size_t,1> srcArrayIndex(srcIndex.size()) ;
-    int i=0 ;
-    for(size_t index : srcIndex) { srcArrayIndex(i) = index ; i++ ;}
-    CLocalElement recvElement(CContext::getCurrent()->getIntraCommRank(), srcView->getGlobalSize(), srcArrayIndex) ;
-    recvElement.addFullView() ;
-
-    transformConnector_ = new CTransformConnector(srcView, recvElement.getView(CElementView::FULL), CContext::getCurrent()->getIntraComm())  ;
-    transformConnector_->computeConnector() ;
-    transferTransformConnector_ = new  CTransferTransformConnector( recvElement.getView(CElementView::FULL), dstView, transformationMapping_) ; 
+  void CAlgorithmTransformationTransfer::computeAlgorithm(CLocalView* srcView, CLocalView* dstView)
+  {
+   this->computeRecvElement(srcView, dstView) ;
+   transferTransformConnector_ = new  CTransferTransformConnector( recvElement.getView(CElementView::FULL), dstView, transformationMapping_) ; 
   }
  
@@ -27 +17 @@
   void CAlgorithmTransformationTransfer::apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, CArray<double,1>& dataOut)
   {
-    CArray<double,1> dataOutTmp ;
-    transformConnector_->transfer(dimBefore, dimAfter, dataIn, dataOutTmp) ;  
-    transferTransformConnector_ -> transfer(dimBefore, dimAfter, dataOutTmp, dataOut) ; 
+    transferTransformConnector_ -> transfer(dimBefore, dimAfter, dataOutIn, dataOut) ; 
   }
   

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_transfer.hpp

@@ -23 +23 @@
       //! Map between global index of destination element and source element
       unordered_map<int,int> transformationMapping_;
-    
-      CTransformConnector* transformConnector_ ;
       CTransferTransformConnector* transferTransformConnector_ ;
   };

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_weight.cpp

@@ -7 +7 @@
 
   void CAlgorithmTransformationWeight::computeAlgorithm(CLocalView* srcView, CLocalView* dstView)
- {
+  {
     this->computeRecvElement(srcView, dstView) ;
     weightTransformConnector_ = new  CWeightTransformConnector( recvElement_->getView(CElementView::FULL), dstView, transformationMapping_, transformationWeight_) ; 
@@ -15 +15 @@
   void CAlgorithmTransformationWeight::apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, CArray<double,1>& dataOut)
   {
-    CArray<double,1> dataOutTmp ;
-    transformConnector_->transfer(dimBefore, dimAfter, dataIn, dataOutTmp) ;
-    weightTransformConnector_ -> transfer(dimBefore, dimAfter, dataOutTmp, dataOut) ;
+    weightTransformConnector_ -> transfer(dimBefore, dimAfter, dataIn, dataOut) ;
   }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_weight.hpp

@@ -26 +26 @@
       //! Weight corresponding of source to destination
       TransformationWeightMap transformationWeight_;
-      CTransformConnector* transformConnector_ ;
       CWeightTransformConnector* weightTransformConnector_ ;
       

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_algorithm.cpp

@@ -3 +3 @@
 #include "grid_local_view.hpp"
 #include "grid.hpp"
+#include "algo_types.hpp"
 #include "context.hpp"
 
@@ -11 +12 @@
   : gridSrc_(gridSrc), gridDst_(gridDst), pos_(pos), algorithm_(algo)
   {
+    //! Scalar
+    CScalarAlgorithmReduceAxis::registerTrans();
+    CScalarAlgorithmExtractAxis::registerTrans();
+    CScalarAlgorithmReduceDomain::registerTrans();
+    CScalarAlgorithmReduceScalar::registerTrans();
+
+    //! Axis
+    CAxisAlgorithmZoom::registerTrans();
+    CAxisAlgorithmExtractDomain::registerTrans();
+    CAxisAlgorithmInterpolate::registerTrans();
+    CAxisAlgorithmExtract::registerTrans();
+    CAxisAlgorithmInverse::registerTrans();
+    CAxisAlgorithmReduceDomain::registerTrans();
+    CAxisAlgorithmReduceAxis::registerTrans();
+    CAxisAlgorithmTemporalSplitting::registerTrans();
+    CAxisAlgorithmDuplicateScalar::registerTrans();
+
+    //! Domain
+    CDomainAlgorithmComputeConnectivity::registerTrans();
+    CDomainAlgorithmInterpolate::registerTrans();
+    CDomainAlgorithmZoom::registerTrans();
+    CDomainAlgorithmExpand::registerTrans();
+    CDomainAlgorithmReorder::registerTrans();
+    CDomainAlgorithmExtract::registerTrans();
+
     this->computeAlgorithm() ;
   }