Changeset 2011 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

Timestamp:

01/12/21 23:05:02 (3 years ago)

Author:

ymipsl

Message:

• bug fix when createing mask on server side when overlapping grid
• implement axis interpolation on pressure coordinate
• big cleaning in transformation

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp (modified) (12 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -16 +16 @@
 #include "client_server_mapping_distributed.hpp"
 #include "distribution_client.hpp"
-#include "grid_transformation.hpp"
 #include "server.hpp"
 #include "distribution_type.hpp"
@@ -46 +45 @@
       , connectedDataSize_(), connectedServerRank_(), connectedServerRankRead_(), connectedDataSizeRead_()
             , isCompressible_(false)
-      , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), hasDomainAxisBaseRef_(false)
-      , gridSrc_(), hasTransform_(false), order_()
+      , gridSrc_(), order_()
       , clients()
    {
@@ -65 +63 @@
       , connectedDataSize_(), connectedServerRank_(), connectedServerRankRead_(), connectedDataSizeRead_()
             , isCompressible_(false)
-      , transformations_(0), isTransformed_(false)
       , axisPositionInGrid_(), hasDomainAxisBaseRef_(false)
-      , gridSrc_(), hasTransform_(false), order_()
+      , gridSrc_(), order_()
       , clients()
    {
@@ -78 +75 @@
    {
     if (0 != clientDistribution_) delete clientDistribution_;
-    if (0 != transformations_) delete transformations_;
    }
 
@@ -1363 +1359 @@
 
     CArray<bool,1> maskOut ;
-    gridGathererConnector.transfer(event,maskOut,false) ;
+    gridGathererConnector.transfer_or(event,maskOut) ;
     gridMaskConnector.computeConnector(maskOut) ;
 
@@ -1688 +1684 @@
   CATCH_DUMP_ATTR
 
-  
-
-  vector<std::string> CGrid::getAuxInputTransformGrid(void)
-  TRY
-  {
-    if (transformations_ != nullptr) return transformations_->getAuxInputs() ;
-  }
-  CATCH_DUMP_ATTR
-
 
 
@@ -1710 +1697 @@
                                         // big mystery why it doesn't work witout that...
                                         // problem with the linker ?? 
-    
+
     std::shared_ptr<CFilter> inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc));
     std::shared_ptr<CFilter> outputFilter = inputFilter ;
@@ -1792 +1779 @@
             tmpGridDst->addDomain(dstDomain->getId()) ;
 
+            algo = transformation -> createAlgorithm(false, tmpGridDst, tmpGridSrc, 0, 
+                                                     posInGrid,posInGrid,posInGrid,
+                                                     posInGrid,posInGrid,posInGrid );
             //reuse existing algorithm interface for, now
-            algo = CGridTransformationFactory<CDomain>::createTransformation(transType, false, tmpGridDst, tmpGridSrc,
+         /*   algo = CGridTransformationFactory<CDomain>::createTransformation(transType, false, tmpGridDst, tmpGridSrc,
                                                                              transformation, 0, 
                                                                              posInGrid,posInGrid,posInGrid,
                                                                              posInGrid,posInGrid,posInGrid );
+           */
             dstDomain->setTransformationAlgorithm(algo) ;
             transformationPath.removeNextTransform() ;
@@ -1819 +1810 @@
             tmpGridDst->addAxis(dstAxis->getId()) ;
 
+             algo = transformation -> createAlgorithm(false, tmpGridDst, tmpGridSrc, 0, 
+                                                     posInGrid,posInGrid,posInGrid,
+                                                     posInGrid,posInGrid,posInGrid );
+
             //reuse existing algorithm interface for, now
-            algo = CGridTransformationFactory<CAxis>::createTransformation(transType, false, tmpGridDst, tmpGridSrc,
+           /* algo = CGridTransformationFactory<CAxis>::createTransformation(transType, false, tmpGridDst, tmpGridSrc,
                                                                            transformation, 0, 
                                                                            posInGrid,posInGrid,posInGrid,
-                                                                           posInGrid,posInGrid,posInGrid );
+                                                                           posInGrid,posInGrid,posInGrid );*/
             dstAxis->setTransformationAlgorithm(algo) ;
             transformationPath.removeNextTransform() ;
@@ -1846 +1841 @@
             tmpGridDst->addScalar(dstScalar->getId()) ;
 
+            algo = transformation -> createAlgorithm(false, tmpGridDst, tmpGridSrc, 0, 
+                                                     posInGrid,posInGrid,posInGrid,
+                                                     posInGrid,posInGrid,posInGrid );
             //reuse existing algorithm interface for, now
-            algo = CGridTransformationFactory<CScalar>::createTransformation(transType, false, tmpGridDst, tmpGridSrc,
+           /* algo = CGridTransformationFactory<CScalar>::createTransformation(transType, false, tmpGridDst, tmpGridSrc,
                                                                              transformation, 0, 
                                                                              posInGrid,posInGrid,posInGrid,
-                                                                             posInGrid,posInGrid,posInGrid );
+                                                                             posInGrid,posInGrid,posInGrid );*/
             dstScalar->setTransformationAlgorithm(algo) ;
             transformationPath.removeNextTransform() ;
@@ -1917 +1915 @@
     if (hadTransform)
     {
+      
       if (!isSource)
       {
@@ -1929 +1928 @@
         shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(gridAlgorithm->createTransformFilter(gc, detectMissingValues, defaultValue)) ;
         outputFilter->connectOutput(transformFilter,0) ;
+        vector<string> auxFieldId = algo->getAuxFieldId() ; // better to do that at transformation not algo ??
+        int i=1; 
+        for (auto& it : auxFieldId)
+        {
+          CField* auxField = CField::get(it) ;
+          auxField->buildWorkflowGraph(gc) ;
+          auxField->getInstantDataFilter()->connectOutput(transformFilter,i) ;
+          i++ ;
+        }
         outputFilter = transformFilter ;
       }