Changeset 1999 for XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/generic_algorithm_transformation.cpp

Timestamp:

01/03/21 18:00:43 (3 years ago)

Author:

ymipsl

Message:

Adapt transformation algorithm to new infrastructure (on going...)

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/generic_algorithm_transformation.cpp (modified) (2 diffs)

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

@@ -1143 +1143 @@
 ///////////////////////////////////////////////////////////////
 
+CGridAlgorithm* CGenericAlgorithmTransformation::createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos)
+{
+  return new CGridAlgorithm(gridSrc, gridDst, pos, this) ;
+}
 
 
 void CGenericAlgorithmTransformation::computeAlgorithm(CLocalView* srcView, CLocalView* dstView)
+{
+ 
+  this->computeRecvElement(srcView, dstView) ;
+/*
+  transformConnector_ = new CTransformConnector(srcView, recvElement.getView(CElementView::FULL), CContext::getCurrent()->getIntraComm())  ;
+  transformConnector_->computeConnector() ; 
+*/
+  weightTransformConnector_ = new  CWeightTransformConnector(recvElement_->getView(CElementView::FULL), dstView, transformationMapping_[0], transformationWeight_[0]) ; 
+}
+ 
+void CGenericAlgorithmTransformation::computeRecvElement(CLocalView* srcView, CLocalView* dstView)
 {
   auto& srcMap = transformationMapping_[0] ;
@@ -1155 +1170 @@
   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() ;
-  weightTransformConnector_ = new  CWeightTransformConnector( recvElement.getView(CElementView::FULL), dstView, transformationMapping_[0], transformationWeight_[0]) ; 
-}
- 
+  recvElement_ = new CLocalElement(CContext::getCurrent()->getIntraCommRank(), srcView->getGlobalSize(), srcArrayIndex) ;
+  recvElement_->addFullView() ;
+}
 
 void CGenericAlgorithmTransformation::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) ;
-}
-
-
-
-
-
-
-}
+  //CArray<double,1> dataOutTmp ;
+  //transformConnector_->transfer(dimBefore, dimAfter, dataIn, dataOutTmp) ;
+  weightTransformConnector_ -> transfer(dimBefore, dimAfter, dataIn, dataOut) ;
+}
+
+}