Changeset 1984 for XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation

Timestamp:

12/06/20 22:14:56 (4 years ago)

Author:

ymipsl

Message:

intermediate commit for new tranformation engine?
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation

Files:

• axis_algorithm (added)
• axis_algorithm_duplicate_scalar.cpp (deleted)
• axis_algorithm_duplicate_scalar.hpp (deleted)
• axis_algorithm_extract.cpp (deleted)
• axis_algorithm_extract.hpp (deleted)
• axis_algorithm_extract_domain.cpp (deleted)
• axis_algorithm_extract_domain.hpp (deleted)
• axis_algorithm_interpolate.cpp (deleted)
• axis_algorithm_interpolate.hpp (deleted)
• axis_algorithm_inverse.cpp (deleted)
• axis_algorithm_inverse.hpp (deleted)
• axis_algorithm_reduce_axis.cpp (deleted)
• axis_algorithm_reduce_axis.hpp (deleted)
• axis_algorithm_reduce_domain.cpp (deleted)
• axis_algorithm_reduce_domain.hpp (deleted)
• axis_algorithm_temporal_splitting.cpp (deleted)
• axis_algorithm_temporal_splitting.hpp (deleted)
• axis_algorithm_transformation.cpp (deleted)
• axis_algorithm_transformation.hpp (deleted)
• axis_algorithm_zoom.cpp (deleted)
• axis_algorithm_zoom.hpp (deleted)
• domain_algorithm (added)
• domain_algorithm_compute_connectivity.cpp (deleted)
• domain_algorithm_compute_connectivity.hpp (deleted)
• domain_algorithm_expand.cpp (deleted)
• domain_algorithm_expand.hpp (deleted)
• domain_algorithm_extract.cpp (deleted)
• domain_algorithm_extract.hpp (deleted)
• domain_algorithm_generate_rectilinear.cpp (deleted)
• domain_algorithm_generate_rectilinear.hpp (deleted)
• domain_algorithm_interpolate.cpp (deleted)
• domain_algorithm_interpolate.hpp (deleted)
• domain_algorithm_reorder.cpp (deleted)
• domain_algorithm_reorder.hpp (deleted)
• domain_algorithm_transformation.cpp (deleted)
• domain_algorithm_transformation.hpp (deleted)
• domain_algorithm_zoom.cpp (deleted)
• domain_algorithm_zoom.hpp (deleted)
• generic_algorithm_transformation.cpp (modified) (2 diffs)
• generic_algorithm_transformation.hpp (modified) (2 diffs)
• generic_algorithm_transformation_new.cpp.xxx (added)
• generic_algorithm_transformation_new.hpp.xxx (added)
• scalar_algorithm (added)
• scalar_algorithm_extract_axis.cpp (deleted)
• scalar_algorithm_extract_axis.hpp (deleted)
• scalar_algorithm_reduce_axis.cpp (deleted)
• scalar_algorithm_reduce_axis.hpp (deleted)
• scalar_algorithm_reduce_domain.cpp (deleted)
• scalar_algorithm_reduce_domain.hpp (deleted)
• scalar_algorithm_reduce_scalar.cpp (deleted)
• scalar_algorithm_reduce_scalar.hpp (deleted)
• scalar_algorithm_transformation.cpp (deleted)
• scalar_algorithm_transformation.hpp (deleted)
• transformation.hpp (added)
• transformation_enum.hpp (added)
• transformation_path.cpp (added)
• transformation_path.hpp (added)

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

@@ -14 +14 @@
 #include "timer.hpp"
 #include "mpi.hpp"
-
-namespace xios {
+#include "transform_connector.hpp"
+#include "weight_transform_connector.hpp"
+
+namespace xios 
+{
 
 CGenericAlgorithmTransformation::CGenericAlgorithmTransformation()
@@ -1135 +1138 @@
 CATCH
 
-}
+
+///////////////////////////////////////////////////////////////
+////////// new algorithm for new method               /////////
+///////////////////////////////////////////////////////////////
+
+
+
+void CGenericAlgorithmTransformation::computeAlgorithm(CLocalView* srcView, CLocalView* dstView)
+{
+  auto& srcMap = transformationMapping_[0] ;
+  set<size_t> srcIndex ;
+  for(auto& it : srcMap)
+    for(size_t index : it.second) srcIndex.insert(index) ;
+
+  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() ;
+  weightTransformConnector_ = new  CWeightTransformConnector( recvElement.getView(CElementView::FULL), dstView, transformationMapping_[0], transformationWeight_[0]) ; 
+}
+ 
+
+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) ;
+}
+
+
+
+
+
+
+}

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

@@ -14 +14 @@
 #include "array_new.hpp"
 #include "client_client_dht_template.hpp"
+#include "local_view.hpp"
+#include "transform_connector.hpp"
+#include "weight_transform_connector.hpp"
 
-namespace xios {
+namespace xios
+{
   class CGrid;
   class CDomain;
@@ -169 +173 @@
   bool eliminateRedondantSrc_ ; // flag to indicate if the transformation must select only one global source point for all proc.
                                // In this case it will choose preferentially the current process 
+
+  
+// new methods for new algorithm
+
+  public : 
+  
+    void computeAlgorithm(CLocalView* srcView, CLocalView* dstView) ;
+    void apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, CArray<double,1>& dataOut);
+    
+    CTransformConnector* transformConnector_ ;
+    CWeightTransformConnector* weightTransformConnector_ ;
+
 };