Changeset 933 for XIOS/trunk/src/transformation/domain_algorithm_zoom.cpp

Timestamp:

09/22/16 10:58:32 (8 years ago)

Author:

mhnguyen

Message:

Improving transformation selection. Instead of modifying directly grid_transformation
we only need to register a new transformation with the framework

+) Update all transformations with this new method

Test
+) On Curie
+) Basic tests pass

File:

• XIOS/trunk/src/transformation/domain_algorithm_zoom.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/domain_algorithm_zoom.cpp

@@ -8 +8 @@
  */
 #include "domain_algorithm_zoom.hpp"
+#include "zoom_domain.hpp"
+#include "domain.hpp"
+#include "grid.hpp"
+#include "grid_transformation_factory_impl.hpp"
 
 namespace xios {
+CGenericAlgorithmTransformation* CDomainAlgorithmZoom::create(CGrid* gridDst, CGrid* gridSrc,
+                                                             CTransformation<CDomain>* transformation,
+                                                             int elementPositionInGrid,
+                                                             std::map<int, int>& elementPositionInGridSrc2ScalarPosition,
+                                                             std::map<int, int>& elementPositionInGridSrc2AxisPosition,
+                                                             std::map<int, int>& elementPositionInGridSrc2DomainPosition,
+                                                             std::map<int, int>& elementPositionInGridDst2ScalarPosition,
+                                                             std::map<int, int>& elementPositionInGridDst2AxisPosition,
+                                                             std::map<int, int>& elementPositionInGridDst2DomainPosition)
+{
+  std::vector<CDomain*> domainListDestP = gridDst->getDomains();
+  std::vector<CDomain*> domainListSrcP  = gridSrc->getDomains();
+
+  CZoomDomain* zoomDomain = dynamic_cast<CZoomDomain*> (transformation);
+  int domainDstIndex = elementPositionInGridDst2DomainPosition[elementPositionInGrid];
+  int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid];
+
+  return (new CDomainAlgorithmZoom(domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], zoomDomain));
+}
+
+bool CDomainAlgorithmZoom::registerTrans()
+{
+  CGridTransformationFactory<CDomain>::registerTransformation(TRANS_ZOOM_DOMAIN, create);
+}
 
 CDomainAlgorithmZoom::CDomainAlgorithmZoom(CDomain* domainDestination, CDomain* domainSource, CZoomDomain* zoomDomain)
@@ -39 +67 @@
            << "Zoom size is " << zoomNj_ );
   }
-
-//  computeIndexSourceMapping();
 }
 
@@ -75 +101 @@
   TransformationWeightMap& transWeight = this->transformationWeight_[0];
 
-//  std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
-//  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_;
   int domainGlobalIndex;
   for (int j = 0; j < nj; ++j)