Changeset 1990 for XIOS

Timestamp:

12/14/20 12:58:39 (3 years ago)

Author:

ymipsl

Message:

New tranformation :

• reuse generated grid which are common between fields

--> assign a unique id to each generated grid

• recursive call supressed if no remaining transformation in the grid.

YM

File:

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

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

@@ -1911 +1911 @@
     std::shared_ptr<CFilter> outputFilter = inputFilter ;
     
-    newGrid = CGrid::create() ; // give it an id later ??
+    string newId ;
+    if (gridSrc!=nullptr) newId = gridSrc->getId() + " --> " + this->getId()  ;
+    else newId = " --> " + this->getId()  ;
+    bool isNewGrid ;
+    if (CGrid::has(newId))
+    {
+      newGrid = CGrid::get(newId);
+      isNewGrid = false ;
+    }
+    else  
+    {
+      newGrid = CGrid::create(newId) ; // give it an id later ??
+      isNewGrid = true ;
+    }
+
     bool hadTransform=false ;
     bool hasTransform=false ;
+    bool hasRemainTransform=false ;
     CGenericAlgorithmTransformation* algo ;
     int dimBefore=1 ;
@@ -1941 +1956 @@
       hasTransform=transformationPath.hasTransform()  ;
       
+      if (hasTransform && hadTransform) hasRemainTransform=true ;
 
       if (hasTransform && !hadTransform)
@@ -1983 +1999 @@
             dstDomain->setTransformationPaths(transformationPath) ;
           }
-          newGrid->addDomain(dstDomain->getId()) ;
+          if (isNewGrid) newGrid->addDomain(dstDomain->getId()) ;
           algo = dstDomain->getTransformationAlgorithm() ;
         }
@@ -2010 +2026 @@
             dstAxis->setTransformationPaths(transformationPath) ;
           }
-          newGrid->addAxis(dstAxis->getId()) ;
+           if (isNewGrid) newGrid->addAxis(dstAxis->getId()) ;
           algo = dstAxis->getTransformationAlgorithm() ;
         }
@@ -2037 +2053 @@
             dstScalar->setTransformationPaths(transformationPath) ;
           }
-          newGrid->addScalar(dstScalar->getId()) ;
+           if (isNewGrid) newGrid->addScalar(dstScalar->getId()) ;
           algo = dstScalar->getTransformationAlgorithm() ;          
         }
@@ -2061 +2077 @@
           if (hadTransform) dimBefore*=domain->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
           else dimAfter*=domain->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
-          newGrid->addDomain(srcElementId) ;
+          if (isNewGrid) newGrid->addDomain(srcElementId) ;
         }
         else if (srcElement.type==TYPE_AXIS)
@@ -2076 +2092 @@
           if (hadTransform) dimBefore*=axis->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
           else dimAfter*=axis->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
-          newGrid->addAxis(srcElementId) ;
+          if (isNewGrid) newGrid->addAxis(srcElementId) ;
         }
         else if (srcElement.type==TYPE_SCALAR)
@@ -2091 +2107 @@
           if (hadTransform) dimBefore*=scalar->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
           else dimAfter*=scalar->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
-          newGrid->addScalar(srcElementId) ;
+          if (isNewGrid) newGrid->addScalar(srcElementId) ;
         }
       }
@@ -2105 +2121 @@
       }
 
-      gridSrc=newGrid ;
-      pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = gridSrc->buildTransformationGraph(gc, isSource, gridSrc, detectMissingValues, defaultValue, newGrid) ;
-      outputFilter->connectOutput(filters.first,0) ;
-      outputFilter=filters.second ;
+      if (hasRemainTransform)
+      {
+        gridSrc=newGrid ;
+        pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = gridSrc->buildTransformationGraph(gc, isSource, gridSrc, detectMissingValues, defaultValue, newGrid) ;
+        outputFilter->connectOutput(filters.first,0) ;
+        outputFilter=filters.second ;
+      }
     }